Changeset 17526

Timestamp:

May 5, 2008, 10:26:46 AM (18 years ago)

Author:

jhoblitt

Message:

remove use of parse_neb_key() from dsget
dsget doc updates

Location:

trunk/DataStore

Files:

• Changes (modified) (1 diff)
• scripts/dsget (modified) (8 diffs)

trunk/DataStore/Changes

@@ -2 +2 @@
 
 0.07
+    - remove use of parse_neb_key() from dsget
+    - dsget doc updates
     - fix error reporting bug is dsfilesetls
     - change dsget to overwrite existing Nebulous keys

trunk/DataStore/scripts/dsget

@@ -3 +3 @@
 # Copyright (C) 2006-2008  Joshua Hoblitt
 #
-# $Id: dsget,v 1.16 2008-04-18 00:50:26 jhoblitt Exp $
+# $Id: dsget,v 1.17 2008-05-05 20:26:46 jhoblitt Exp $
 
 use strict;
@@ -15 +15 @@
 use File::Temp ();
 use File::Basename qw( basename dirname );
-use Nebulous::Keys qw( parse_neb_key );
 
 use Getopt::Long qw( GetOptions :config auto_help auto_version gnu_getopt );
@@ -32 +31 @@
     'md5|m=s'       => \$md5,
     'filename|f=s'  => \$filename,
-    'compress'      => \$compress,
+    'compress|c'    => \$compress,
 ) or pod2usage( 2 );
 
@@ -41 +40 @@
 ) unless defined $uri and defined $filename;
 
-# if --nebulous is specified, parse the nebulous name
-my ($uriVolume, $uriFilename);
-if ($nebulous) {
-    ($uriVolume, $uriFilename) = parse_neb_key ($filename);
-}    
+# XXX EAM : should not need parse_neb_key, but how to handle case
+# where we supply --volume and neb://volume/path ? 
+# 1) parse anyway and check for conflict
+# 2) drop --volume option
+# JH: the Nebulous server contains the policy to handle this conflict.
+# At present --volume will overide the volume in neb://volume/...
 
 # --volume implies --nebulous
@@ -51 +51 @@
     $nebulous ||=1;
 } 
-
-if ($volume and $uriVolume and ($volume ne $uriVolume)) {
-    die "conflicting volume names specified";
-}
-
-if ($uriVolume) { $volume = $uriVolume; }
-if ($uriFilename) { $filename = $uriFilename; }
-
-# XXX EAM : should not need parse_neb_key, but how to handle case
-# where we supply --volume and neb://volume/path ? 
-# 1) parse anyway and check for conflict
-# 2) drop --volume option
 
 if ($compress) {
@@ -144 +132 @@
         unless defined $neb;
 
-    # XXX see comment above and not blindly stomping
-    # if the key doesn't already exist then create it
-    # if it does, delete it so that we end up on the right storage volume
+    # XXX see comment above about not blindly stomping the file
+    # - if the key doesn't already exist then create it
+    # - if it does, delete it so that we end up on the right storage volume
     if ($neb->stat($filename)) {
         $neb->delete($filename)
@@ -180 +168 @@
 =head1 SYNOPSIS
 
-    dsget --uri <uri> --filename <filename> [--bytes <nbytes>] [--md5 <hex>] [--compress]
-        [--nebulous] [--volume <volume name>]
+    dsget --uri <uri> --filename <filename> [--bytes <nbytes>] [--md5 <hex>]
+        [--compress] [--nebulous] [--volume <volume name>]
 
 =head1 DESCRIPTION
@@ -213 +201 @@
 Flag to enable C<nebulous> support.  When set C<--filename> is used as the
 Nebulous key.
+
+Optional.
+
+=item * --compress|-c
+
+When set C<dsget> will request a compressed version of the file.
 
 Optional.