Index: /trunk/Nebulous-Server/lib/Nebulous/Server.pm
===================================================================
--- /trunk/Nebulous-Server/lib/Nebulous/Server.pm	(revision 2901)
+++ /trunk/Nebulous-Server/lib/Nebulous/Server.pm	(revision 2902)
@@ -1,5 +1,5 @@
 # Copyright (c) 2004  Joshua Hoblitt
 #
-# $Id: Server.pm,v 1.4 2005-01-05 03:10:08 jhoblitt Exp $
+# $Id: Server.pm,v 1.5 2005-01-05 03:19:12 jhoblitt Exp $
 
 package PS::IPP::IData::Server;
@@ -631,8 +631,8 @@
             my $rows;
             if ( $name ) {
-                $query = $db->prepare( qq{ SELECT uri FROM volume WHERE name = ? ORDER BY rand() LIMIT 1 } );
+                $query = $db->prepare( $sql->get_storage_volume_byname );
                 $rows = $query->execute( $name );
             } else {
-                $query = $db->prepare( qq{ SELECT uri FROM volume ORDER BY rand() LIMIT 1 } );
+                $query = $db->prepare( $sql->get_storage_volume );
                 $rows = $query->execute;
             }
Index: /trunk/Nebulous-Server/lib/Nebulous/Server/SQL.pm
===================================================================
--- /trunk/Nebulous-Server/lib/Nebulous/Server/SQL.pm	(revision 2901)
+++ /trunk/Nebulous-Server/lib/Nebulous/Server/SQL.pm	(revision 2902)
@@ -1,5 +1,5 @@
 # Copyright (c) 2004  Joshua Hoblitt
 #
-# $Id: SQL.pm,v 1.2 2005-01-05 02:44:54 jhoblitt Exp $
+# $Id: SQL.pm,v 1.3 2005-01-05 03:19:12 jhoblitt Exp $
 
 package PS::IPP::IData::Server::SQL;
@@ -83,5 +83,5 @@
         WHERE so_id = ?
     },
-    get_object_instances    => qq{
+    get_object_instances        => qq{
         SELECT storage_object.so_id, uri, assigned_location
         FROM storage_object
@@ -89,4 +89,10 @@
         USING (so_id)
         WHERE storage_object.ext_id = ?
+    },
+    get_storage_volume_byname   => qq{
+        SELECT uri FROM volume WHERE name = ? ORDER BY rand() LIMIT 1 
+    },
+    get_storage_volume          => qq{
+        SELECT uri FROM volume ORDER BY rand() LIMIT 1
     },
 );
Index: /trunk/Nebulous/lib/Nebulous/Server.pm
===================================================================
--- /trunk/Nebulous/lib/Nebulous/Server.pm	(revision 2901)
+++ /trunk/Nebulous/lib/Nebulous/Server.pm	(revision 2902)
@@ -1,5 +1,5 @@
 # Copyright (c) 2004  Joshua Hoblitt
 #
-# $Id: Server.pm,v 1.4 2005-01-05 03:10:08 jhoblitt Exp $
+# $Id: Server.pm,v 1.5 2005-01-05 03:19:12 jhoblitt Exp $
 
 package PS::IPP::IData::Server;
@@ -631,8 +631,8 @@
             my $rows;
             if ( $name ) {
-                $query = $db->prepare( qq{ SELECT uri FROM volume WHERE name = ? ORDER BY rand() LIMIT 1 } );
+                $query = $db->prepare( $sql->get_storage_volume_byname );
                 $rows = $query->execute( $name );
             } else {
-                $query = $db->prepare( qq{ SELECT uri FROM volume ORDER BY rand() LIMIT 1 } );
+                $query = $db->prepare( $sql->get_storage_volume );
                 $rows = $query->execute;
             }
Index: /trunk/Nebulous/lib/Nebulous/Server/SQL.pm
===================================================================
--- /trunk/Nebulous/lib/Nebulous/Server/SQL.pm	(revision 2901)
+++ /trunk/Nebulous/lib/Nebulous/Server/SQL.pm	(revision 2902)
@@ -1,5 +1,5 @@
 # Copyright (c) 2004  Joshua Hoblitt
 #
-# $Id: SQL.pm,v 1.2 2005-01-05 02:44:54 jhoblitt Exp $
+# $Id: SQL.pm,v 1.3 2005-01-05 03:19:12 jhoblitt Exp $
 
 package PS::IPP::IData::Server::SQL;
@@ -83,5 +83,5 @@
         WHERE so_id = ?
     },
-    get_object_instances    => qq{
+    get_object_instances        => qq{
         SELECT storage_object.so_id, uri, assigned_location
         FROM storage_object
@@ -89,4 +89,10 @@
         USING (so_id)
         WHERE storage_object.ext_id = ?
+    },
+    get_storage_volume_byname   => qq{
+        SELECT uri FROM volume WHERE name = ? ORDER BY rand() LIMIT 1 
+    },
+    get_storage_volume          => qq{
+        SELECT uri FROM volume ORDER BY rand() LIMIT 1
     },
 );