Changeset 18273

Timestamp:

Jun 22, 2008, 9:04:15 AM (18 years ago)

Author:

eugene

Message:

update cleanup code for current interface with chiptool

Files:

• branches/eam_branch_20080618/ippScripts/scripts/ipp_cleanup.pl (modified) (2 diffs)
• trunk/ippTasks/chip.pro (modified) (6 diffs)

branches/eam_branch_20080618/ippScripts/scripts/ipp_cleanup.pl

@@ -63 +63 @@
     # dettool -pendingcleanupimfile -chip_id $stage_id 
 
-    # Get list of component files
+    # Get list of component imfiles
+    # XXX may need a different my_die for each stage
     my $imfiles;                      # Array of component files
     my $command = "$dettool -pendingcleanupimfile -chip_id $stage_id"; # Command to run
@@ -70 +71 @@
     unless ($success) {
         $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-        &my_die("Unable to perform camtool: $error_code", $cam_id, $error_code);
+        &my_die("Unable to perform camtool: $error_code", "chip", $stage_id, $error_code);
     }
     my $metadata = $mdcParser->parse(join "", @$stdout_buf) or
-        &my_die("Unable to parse metadata config doc", $cam_id, $PS_EXIT_PROG_ERROR);
+        &my_die("Unable to parse metadata config doc", "chip", $stage_id, $PS_EXIT_PROG_ERROR);
 
     # extract the metadata for the files into a hash list
     $imfiles = parse_md_list($metadata) or
-        &my_die("Unable to parse metadata list", $cam_id, $PS_EXIT_PROG_ERROR);
+        &my_die("Unable to parse metadata list", "chip", $cam_id, $PS_EXIT_PROG_ERROR);
 
     # loop over all of the imfiles, determine the path_base and class_id for each

trunk/ippTasks/chip.pro

@@ -8 +8 @@
 # test for required global variables
 check.globals
-
-$LOGSUBDIR = $LOGDIR/chip
-exec mkdir -p $LOGSUBDIR
 
 book init chipPendingImfile
@@ -70 +67 @@
 
   stdout NULL
-  stderr $LOGSUBDIR/chip.imfile.log
+  stderr $LOGDIR/chip.imfile.log
 
   task.exec
@@ -151 +148 @@
     sprintf outroot "%s/%s/%s.ch.%s" $WORKDIR $EXP_TAG $EXP_TAG $CHIP_ID
 
-    ## generate output log based on filerule (convert the URI to a PATH)
-    $logfile = `ipp_filename.pl --filerule LOG.IMFILE --camera $CAMERA --class_id $CLASS_ID --basename $outroot`
-    if ("$logfile" == "") 
-      echo "WARNING: logfile not defined in chip.pro:152"
-      break
-    end
-
-    stdout $logfile
-    stderr $logfile
-    dirname $logfile -var outpath
-    mkdir $outpath
+    stdout $logdir/chip.imfile.log
+    stderr $logdir/chip.imfile.log
 
     $run = chip_imfile.pl --exp_id $EXP_ID --chip_id $CHIP_ID --class_id $CLASS_ID --uri $URI --camera $CAMERA --outroot $outroot
@@ -207 +195 @@
 
   stdout NULL
-  stderr $LOGSUBDIR/chip.cleanup.log
+  stderr $LOGDIR/chip.cleanup.log
 
   task.exec
     if ($DB:n == 0)
       option DEFAULT
-      command chiptool -pendingcleanup -limit 20
+      command chiptool -pendingcleanuprun -limit 20
     else
       # save the DB name for the exit tasks
       option $DB:$chip_cleanup_DB
-      command chiptool -pendingcleanup -limit 20 -dbname $DB:$chip_cleanup_DB
+      command chiptool -pendingcleanuprun -limit 20 -dbname $DB:$chip_cleanup_DB
       $chip_cleanup_DB ++
       if ($chip_cleanup_DB >= $DB:n) set chip_cleanup_DB = 0
@@ -263 +251 @@
     book setword chipPendingCleanup $pageName pantaskState RUN
     book getword chipPendingCleanup $pageName camera -var CAMERA
-    book getword chipPendingCleanup $pageName class_id -var CLASS_ID
     book getword chipPendingCleanup $pageName cleanup_mode -var CLEANUP_MODE
-    book getword chipPendingCleanup $pageName path_base -var PATH_BASE
+    book getword chipPendingCleanup $pageName chip_id -var CHIP_ID
     book getword chipPendingCleanup $pageName dbname -var DBNAME
 
@@ -271 +258 @@
     set.host.for.camera $CAMERA $CLASS_ID
 
-    ## generate output log based on filerule (convert the URI to a PATH)
-    $logfile = `ipp_filename.pl --filerule LOG.IMFILE --camera $CAMERA --class_id $CLASS_ID --basename $PATH_BASE`
-    if ("$logfile" == "") 
-      echo "WARNING: logfile not defined in chip.pro:152"
-      break
-    end
-
-    stdout $logfile
-    stderr $logfile
-    dirname $logfile -var outpath
-    mkdir $outpath
+    stdout $LOGDIR/chip.cleanup.log
+    stderr $LOGDIR/chip.cleanup.log
 
     # XXX is everything listed here needed?
-    $run = ipp_cleanup.pl --stage chip --camera $CAMERA --class_id $CLASS_ID --mode $CLEANUP_MODE --path_base $PATH_BASE
+    $run = ipp_cleanup.pl --stage chip --stage_id $CHIP_ID --camera $CAMERA --mode $CLEANUP_MODE
     add_standard_args run