Changeset 23777 for trunk/ippTasks/dist.pro

Timestamp:

Apr 9, 2009, 1:56:50 PM (17 years ago)

Author:

bills

Message:

change disttool -pendingcomponent to output "$outroot.$dist_id" as outdir to help make it unique
allow 'clean' raw stage distributions. (Database information only.) This is required to
support mirrors with chip stage and beyond images but not raw data

File:

• trunk/ippTasks/dist.pro (modified) (3 diffs)

trunk/ippTasks/dist.pro

@@ -131 +131 @@
     book getword distToProcess $pageName state -var STATE
     book getword distToProcess $pageName data_state -var DATA_STATE
+    book getword distToProcess $pageName quality -var QUALITY
     book getword distToProcess $pageName no_magic -var NO_MAGIC
     book getword distToProcess $pageName magicked -var MAGICKED
-    book getword distToProcess $pageName outroot -var OUTROOT
+    book getword distToProcess $pageName outdir -var OUTDIR
     book getword distToProcess $pageName dbname -var DBNAME
 
-    $EXTRA_FLAGS = ""
+    $EXTRA_ARGS = ""
     if ("$CLEAN" == "T")
-        $EXTRA_FLAGS = --clean
+        $EXTRA_ARGS = --clean
     end
     # magicked is output as integer due to the union in the sql
     if ($MAGICKED)
-        $EXTRA_FLAGS = $EXTRA_FLAGS --magicked
+        $EXTRA_ARGS = $EXTRA_ARGS --magicked
     end
     # no_magic is output as integer due to the union in the sql
     if ($NO_MAGIC)
-        $EXTRA_FLAGS = $EXTRA_FLAGS --no_magic
+        $EXTRA_ARGS = $EXTRA_ARGS --no_magic
+    end
+    if ($QUALITY)
+        $EXTRA_ARGS = $EXTRA_ARGS --poor_quality
     end
 
@@ -153 +157 @@
     host anyhost
 
-    sprintf logfile "%s/dist.%s.%s.log" $OUTROOT $DIST_ID $COMPONENT
+    sprintf logfile "%s.%s/dist.%s.%s.log" $OUTDIR $DIST_ID $COMPONENT
     stdout $logfile
     stderr $logfile
 
-    $run = dist_component.pl --dist_id $DIST_ID --camera $CAMERA --stage $STAGE --stage_id $STAGE_ID --component $COMPONENT --path_base $PATH_BASE --chip_path_base $CHIP_PATH_BASE --state $STATE --data_state $DATA_STATE $EXTRA_FLAGS --outroot $OUTROOT --logfile $logfile
+    $run = dist_component.pl --dist_id $DIST_ID --camera $CAMERA --stage $STAGE --stage_id $STAGE_ID --component $COMPONENT --path_base $PATH_BASE --chip_path_base $CHIP_PATH_BASE --state $STATE --data_state $DATA_STATE $EXTRA_ARGS --outdir $OUTDIR --logfile $logfile
 
     add_standard_args run
@@ -251 +255 @@
     book getword distToAdvance $pageName stage   -var STAGE
     book getword distToAdvance $pageName stage_id -var STAGE_ID
-    book getword distToAdvance $pageName outroot -var OUTROOT
+    book getword distToAdvance $pageName outdir -var OUTDIR
 
     host anyhost
 
-    sprintf logfile "%s/dist.advance.%s.log" $OUTROOT $DIST_ID
+    sprintf logfile "%s/dist.advance.%s.log" $OUTDIR $DIST_ID
     stdout $logfile
     stderr $logfile
 
-    $run = dist_advancerun.pl --dist_id $DIST_ID --stage $STAGE --stage_id $STAGE_ID --outroot $OUTROOT --logfile $logfile
+    $run = dist_advancerun.pl --dist_id $DIST_ID --stage $STAGE --stage_id $STAGE_ID --outdir $OUTDIR --logfile $logfile
     add_standard_args run