Changeset 25418 for trunk/ippScripts/scripts

Timestamp:

Sep 16, 2009, 9:44:29 AM (17 years ago)

Author:

bills

Message:

Store the size in bytes and md5sum of the Compressed raw image files
in pzDownloadImfile. Propagate the values to rawImfile so that they are
available for checking.
(summitImfile has the parameters of the files before they are compressed)

Location:

trunk/ippScripts/scripts

Files:

• register_imfile.pl (modified) (3 diffs)
• summit_copy.pl (modified) (3 diffs)

trunk/ippScripts/scripts/register_imfile.pl

@@ -34 +34 @@
 my $ppStatsFromMetadata = can_run( 'ppStatsFromMetadata' ) or (warn "Can't find ppStatsFromMetadata" and $missing_tools = 1);
 
-my ($cache, $exp_id, $tmp_class_id, $tmp_exp_name, $uri, $dbname, $verbose, $no_update, $no_op, $logfile);
+my ($cache, $exp_id, $tmp_class_id, $tmp_exp_name, $uri, $bytes, $md5sum, $dbname, $verbose, $no_update, $no_op, $logfile);
 GetOptions(
     'caches'           => \$cache,
@@ -41 +41 @@
     'tmp_exp_name|n=s' => \$tmp_exp_name,
     'uri|u=s'          => \$uri,
+    'bytes=s'          => \$bytes,
+    'md5sum=s'         => \$md5sum,
     'dbname|d=s'       => \$dbname,    # Database name
     'verbose'          => \$verbose,   # Print to stdout
@@ -123 +125 @@
 $command .= " -tmp_class_id $tmp_class_id"; # the original class_id supplied by the user, replace by ppStats CLASS.ID
 $command .= " -uri $uri ";
+$command .= " -bytes $bytes" if $bytes;
+$command .= " -md5sum $md5sum" if $md5sum and ($md5sum ne 'NULL');
 $command .= " -hostname $host" if defined $host;
 $command .= " -dbname $dbname" if defined $dbname;

trunk/ippScripts/scripts/summit_copy.pl

@@ -105 +105 @@
 # if so pass the results to pztool to the results in pzDownloadImfile.
 # uncomment this to turn on
-# my ($new_bytes, $new_md5) = check_instances($filename, $nebulous, $compress);
+my ($new_bytes, $new_md5) = check_instances($filename, $nebulous, $compress);
 
 # command to update database
@@ -121 +121 @@
 # XXX: TODO: see above. Don't do this until pztool and the DB have
 # been updated
-# $command .= " -md5sum $new_md5 -bytes $new_bytes";
+$command .= " -md5sum $new_md5 -bytes $new_bytes";
 
 # update the database
@@ -198 +198 @@
         if ($b ne $new_bytes) {
             $error = "size of $instances[$i] does not match $instances[0]";
-        } elsif ($m != $new_md5) {
+        } elsif ($m ne $new_md5) {
             $error = "md5sum of $instances[$i] does not match $instances[0]";
         }