Changeset 12970

Timestamp:

Apr 23, 2007, 2:56:30 PM (19 years ago)

Author:

jhoblitt

Message:

change neb-addvol to properly mangle URIs into paths

Location:

trunk

Files:

• Nebulous-Server/Changes (modified) (1 diff)
• Nebulous-Server/bin/neb-addvol (modified) (3 diffs)
• Nebulous/Changes (modified) (1 diff)
• Nebulous/bin/neb-addvol (modified) (3 diffs)

trunk/Nebulous-Server/Changes

@@ -1 +1 @@
 Revision history for Perl module Poi::PixelData
+
+    - change neb-addvol to properly mangle URIs into paths
 
 0.04 Mon Apr 23 13:33:16 HST 2007

trunk/Nebulous-Server/bin/neb-addvol

@@ -3 +3 @@
 # Copyright (C) 2005  Joshua Hoblitt
 #
-# $Id: neb-addvol,v 1.1 2005-08-31 00:30:20 jhoblitt Exp $
+# $Id: neb-addvol,v 1.2 2007-04-24 00:56:30 jhoblitt Exp $
 
 use strict;
@@ -13 +13 @@
 use DBI;
 use Nebulous::Server::SQL;
+use URI;
 
 use Getopt::Long qw( GetOptions :config auto_help auto_version );
@@ -48 +49 @@
 my $sql = Nebulous::Server::SQL->new();
 
+print "Checking URI...";
+
+my $path = URI::file->new($uri)->file;
+unless (-d $path) {
+    die "path: $path dirived from URI: $uri does not exist";
+}
+
+print " OK\n";
+
 print "Adding volume...";
 
 my $query = $dbh->prepare( $sql->new_volume );
-$query->execute( $name, $uri );
+$query->execute( $name, $path );
 
 print " OK\n";

trunk/Nebulous/Changes

@@ -1 +1 @@
 Revision history for Perl module Poi::PixelData
+
+    - change neb-addvol to properly mangle URIs into paths
 
 0.04 Mon Apr 23 13:33:16 HST 2007

trunk/Nebulous/bin/neb-addvol

@@ -3 +3 @@
 # Copyright (C) 2005  Joshua Hoblitt
 #
-# $Id: neb-addvol,v 1.1 2005-08-31 00:30:20 jhoblitt Exp $
+# $Id: neb-addvol,v 1.2 2007-04-24 00:56:30 jhoblitt Exp $
 
 use strict;
@@ -13 +13 @@
 use DBI;
 use Nebulous::Server::SQL;
+use URI;
 
 use Getopt::Long qw( GetOptions :config auto_help auto_version );
@@ -48 +49 @@
 my $sql = Nebulous::Server::SQL->new();
 
+print "Checking URI...";
+
+my $path = URI::file->new($uri)->file;
+unless (-d $path) {
+    die "path: $path dirived from URI: $uri does not exist";
+}
+
+print " OK\n";
+
 print "Adding volume...";
 
 my $query = $dbh->prepare( $sql->new_volume );
-$query->execute( $name, $uri );
+$query->execute( $name, $path );
 
 print " OK\n";