Index: /trunk/Nebulous-Server/bin/neb-voladm
===================================================================
--- /trunk/Nebulous-Server/bin/neb-voladm	(revision 20142)
+++ /trunk/Nebulous-Server/bin/neb-voladm	(revision 20143)
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 
-# Copyright (C) 2005-2008  Joshua Hoblitt
+# Copyright (C) 2008  Joshua Hoblitt
 #
-# $Id: neb-voladm,v 1.1 2008-10-13 20:06:22 jhoblitt Exp $
+# $Id: neb-voladm,v 1.2 2008-10-14 20:13:17 jhoblitt Exp $
 
 use strict;
@@ -9,9 +9,10 @@
 
 use vars qw( $VERSION );
-$VERSION = '0.02';
+$VERSION = '0.01';
 
 use DBI;
 use Nebulous::Server::SQL;
 use URI::file;
+use SQL::Interp qw( sql_interp );
 use URI;
 
@@ -19,5 +20,5 @@
 use Pod::Usage qw( pod2usage );
 
-my ($db, $dbhost, $dbuser, $dbpass, $vname, $vhost, $uri);
+my ($db, $dbhost, $dbuser, $dbpass, $vname, $vhost);
 
 $db     = $ENV{'NEB_DB'} unless $db;
@@ -31,12 +32,11 @@
     'user|u=s'          => \$dbuser,
     'pass|p=s'          => \$dbpass,
-#    'vname|n=s'         => \$vname,
-#    'vhost=s'           => \$vhost,
-#    'uri|u=s'           => \$uri,
+    'vname|n=s'         => \$vname,
+    'vhost=s'           => \$vhost,
 ) || pod2usage( 2 );
 
 pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV;
-pod2usage( -msg => "Required options: --db --user --pass --vname --vhost --uri", -exitval => 2 )
-    unless $db && $dbuser && $dbpass && $vname && $vhost && $uri;
+pod2usage( -msg => "Required options: --db --user --pass", -exitval => 2 )
+    unless $db && $dbuser && $dbpass;
 
 my $dbh = DBI->connect(
@@ -53,19 +53,12 @@
 my $sql = Nebulous::Server::SQL->new();
 
-print "Checking URI...";
+my %constraint;
+$constraint{host} = $vhost if defined $vhost;
+$constraint{name} = $vname if defined $vname;
 
-my $path = URI->new($uri)->path;
-unless (-d $path) {
-    die "path: $path dirived from URI: $uri does not exist";
-}
+my $select = sql_inerp($sql->get_volumes . " WHERE", \%constraint);
 
-print " OK\n";
-
-print "Adding volume...";
-
-my $query = $dbh->prepare( $sql->new_volume );
-$query->execute( $vname, $vhost, $path );
-
-print " OK\n";
+my $query = $dbh->prepare($select);
+$query->execute();
 
 __END__