Changeset 30674

Timestamp:

Feb 17, 2011, 1:38:26 PM (15 years ago)

Author:

bills

Message:

Allow the user of the distribution client to set the system to *not* extract
the files into the destination directories. This is controlled with two
pantasks macros set.no.extract and clear.no.extract

Location:

trunk

Files:

• ippScripts/scripts/receive_file.pl (modified) (6 diffs)
• ippTasks/receive.pro (modified) (2 diffs)

trunk/ippScripts/scripts/receive_file.pl

@@ -41 +41 @@
 
 # Parse the command-line arguments
-my ( $file_id, $source, $product, $fileset, $fileset_id, $file, $component, $bytes, $md5sum, $workdir, $dirinfo_uri, $dbname, $verbose, $no_update, $save_temps );
+my ( $file_id, $source, $product, $fileset, $fileset_id, $file, $component, $bytes, $md5sum, $workdir, $dirinfo_uri, $no_extract, $dbname, $verbose, $no_update, $save_temps );
 
 GetOptions(
@@ -54 +54 @@
            'md5sum=s'          => \$md5sum, # md5sum for file from data store
            'workdir=s'         => \$workdir, # Working directory for output
+           'no-extract'        => \$no_extract, # Do not extract the tarfiles
            'dirinfo=s'    => \$dirinfo_uri, # file containing the destination directories for this component
            'dbname=s'          => \$dbname,    # Database name
@@ -85 +86 @@
 my $mdcParser = PS::IPP::Metadata::Config->new;
 
-
+# select a directory for the dirinfo and dbinfo files
+# XXX: perhaps this directory should be set by the script and passed in
+# rather than computed here.
+
+my ($day, $month, $year) = (localtime)[3,4,5];
+my $datestr = sprintf "%04d%02d%02d", $year+1900, $month + 1, $day;
+my $dir_for_info_files = caturi($workdir, $datestr, $fileset);
+
+
+my $is_tarfile = 0;
+if ($file =~ m|.*\.tgz$|) {        # XXX: perhaps get this off of file type ?
+    $is_tarfile = 1;
+}
+
+my $filename;
+if ($is_tarfile and $no_extract) {
+    $filename = "$dir_for_info_files/$file"; 
+} else {
+    $filename = "$tempdir/$file";
+}
 
 # Retrieve file
-my $filename = "$tempdir/$file";  # Target filename
 {
     my $uri = "$source/$product/$fileset/$file"; # URI for datastore file
@@ -107 +126 @@
 my ($destdir, $components, $dirinfo_lines) = read_dirinfo_file($dirinfo_file_to_read, $file_id);
 
-# select a directory for the dirinfo and dbinfo files
-# XXX: perhaps this directory should be set by the script and passed in
-# rather than computed here.
-
-my ($day, $month, $year) = (localtime)[3,4,5];
-my $datestr = sprintf "%04d%02d%02d", $year+1900, $month + 1, $day;
-my $dir_for_info_files = caturi($workdir, $datestr, $fileset);
 
 # Deal with file
@@ -279 +291 @@
 
 
-} elsif ($file =~ m|.*\.tgz$|) {        # XXX: perhaps get this off of file type ?
+} elsif ($is_tarfile and !$no_extract) {
     # Get contents of tarball
     my @files = ();
@@ -339 +351 @@
         }
     }
+} elsif ($is_tarfile and $no_extract) {
+    print "skipping extraction of tarfile $filename\n";
 } else {
     &my_die( "Unrecognised file: $file\n", $file_id, $PS_EXIT_UNKNOWN_ERROR);

trunk/ippTasks/receive.pro

@@ -105 +105 @@
 $receive_Advance_DB = 0
 
+# set this to skip extraction of tarfiles into their destination directories
+$NO_EXTRACT = ""
+macro set.no.extract
+    $NO_EXTRACT = "--no-extract"
+end
+macro clear.no.extract
+    $NO_EXTRACT = ""
+end
+macro show.no.extract
+    echo $NO_EXTRACT
+end
+
 task           receive.source.load
   host         local
@@ -416 +428 @@
     host anyhost
 
-    $run = receive_file.pl --file_id $FILE_ID --source $SOURCE --product $PRODUCT --fileset $FILESET --fileset_id $FILESET_ID --file $FILE --component $COMPONENT --bytes $BYTES --md5 $MD5SUM --workdir $WORKDIR --dirinfo $DIRINFO
+    $run = receive_file.pl --file_id $FILE_ID --source $SOURCE --product $PRODUCT --fileset $FILESET --fileset_id $FILESET_ID --file $FILE --component $COMPONENT --bytes $BYTES --md5 $MD5SUM --workdir $WORKDIR --dirinfo $DIRINFO $NO_EXTRACT
     add_standard_args run