Changeset 19560

Timestamp:

Sep 15, 2008, 2:24:12 PM (18 years ago)

Author:

bills

Message:

require --run-state and some other minor changes

File:

• trunk/ippScripts/scripts/chip_imfile.pl (modified) (5 diffs)

trunk/ippScripts/scripts/chip_imfile.pl

@@ -45 +45 @@
 
 pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV;
-pod2usage( -msg => "Required options: --exp_id --chip_id --class_id --uri --camera --outroot",
+pod2usage( -msg => "Required options: --exp_id --chip_id --class_id --uri --camera --outroot --run-state",
            -exitval => 3) unless
     defined $exp_id and
@@ -52 +52 @@
     defined $uri and
     defined $camera and
-    defined $outroot;
-
-if (not defined $run_state) { $run_state = 'new'; }
+    defined $outroot and
+    defined $run_state;
 
 $ipprc->define_camera($camera);
 
 my $logDest = $ipprc->filename("LOG.IMFILE", $outroot, $class_id) or &my_die("Missing entry from camera config", $exp_id, $chip_id, $class_id, $PS_EXIT_CONFIG_ERROR);
-$logDest .= "_update" if $run_state eq "update";
+$logDest .= ".update" if $run_state eq "update";
 
 $ipprc->redirect_output($logDest) if $redirect;
@@ -137 +136 @@
 my $configuration = $ipprc->filename("PPIMAGE.CONFIG",      $outroot, $class_id) or &my_die("Missing entry from camera config", $exp_id, $chip_id, $class_id, $PS_EXIT_CONFIG_ERROR);
 
+if ($run_state eq 'update') {
+    $outputStats .= '.update';
+    $traceDest .= '.update';
+}
+
 # Run ppImage
 unless ($no_op) {
@@ -142 +146 @@
     ## XXX also stats: output should be implied by $outroot
     my $command;
-    my $do_stats = 1;
+    my $do_stats;
 
     if ($run_state eq "new") {
@@ -151 +155 @@
         $command .= " -dumpconfig $configuration";
         $command .= " -tracedest $traceDest -log $logDest";
+        $do_stats = 1;
     } else {
-
-        $do_stats = 0; # XXX write stats to an alternate file and compare?
-
         $command  = "$ppImage -file $uri $outroot";
         $command .= " -ipprc $configuration";
         $command .= " -threads $threads" if defined $threads;
         $command .= " -dbname $dbname" if defined $dbname;
-        $command .= " -tracedest ${traceDest}_update -log $logDest";
+        $command .= " -tracedest $traceDest -log $logDest";
         $command .= " -Db PPIMAGE:PHOTOM FALSE";
     }