Changeset 27838 for branches/tap_branches/DataStore/scripts/dsgetfileset

Timestamp:

May 3, 2010, 8:41:49 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/tap_branches

Files:

• . (modified) (1 prop)
• DataStore/scripts/dsgetfileset (modified) (5 diffs)

branches/tap_branches/DataStore/scripts/dsgetfileset

@@ -17 +17 @@
 use File::Basename qw( basename );
 
-my ($uri, $outdir, $timeout, $verbose);
+my ($uri, $outdir, $timeout, $skip_checks, $no_proxy, $verbose);
 
 GetOptions(
@@ -23 +23 @@
     'outdir|o=s'        => \$outdir,
     'timeout|t=s'       => \$timeout,
+    'skip-checks'       => \$skip_checks,
+    'no-proxy'          => \$no_proxy,
     'verbose|v'         => \$verbose,
 ) or pod2usage( 2 );
@@ -34 +36 @@
 # default http request timeout is 30s
 $timeout ||= 30;
+$no_proxy = 0 if !defined $no_proxy;
+
+if (!($uri =~ /\/index\.txt$/)) {
+    $uri .= '/index.txt'
+} 
 
 my $response = DataStore::FileSet->new( uri => $uri )->request(
         ua_args  => { timeout => $timeout },
+        no_proxy => $no_proxy,
     );
 
@@ -72 +80 @@
     my $bytes = $fs->bytes;
 
-    my $command = "dsget --uri $uri --filename $outfile --md5 $md5 --bytes $bytes --timeout $timeout";
+    my $command = "dsget --uri $uri --filename $outfile --timeout $timeout";
+    $command .= " --md5 $md5 --bytes $bytes" if !$skip_checks;
     print "$command\n" if $verbose;
     my $rc = system $command;
@@ -117 +126 @@
 Optional.
 
+=item * --no-proxy
+
+Do not load proxy environment variables.
+
+Optional.
+
 =back