Changeset 24244 for branches/cnb_branches/cnb_branch_20090301/ippTasks/diff.pro

Timestamp:

May 26, 2009, 1:59:32 PM (17 years ago)

Author:

beaumont

Message:

merged with trunk

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• ippTasks/diff.pro (modified) (7 diffs)

branches/cnb_branches/cnb_branch_20090301/ippTasks/diff.pro

@@ -81 +81 @@
 
   task.exec
+    if ($LABEL:n == 0) break
     $run = difftool -todiffskyfile
     if ($DB:n == 0)
@@ -92 +93 @@
     end
     add_poll_args run
+    add_poll_labels run
     command $run
   end
@@ -144 +146 @@
     book getword diffSkyfile $pageName skycell_id -var SKYCELL_ID
     book getword diffSkyfile $pageName camera -var CAMERA
+    book getword diffSkyfile $pageName bothways -var BOTHWAYS
     book getword diffSkyfile $pageName workdir -var WORKDIR_TEMPLATE
     book getword diffSkyfile $pageName dbname -var DBNAME
@@ -162 +165 @@
 
     $run = diff_skycell.pl --threads @MAX_THREADS@ --diff_id $DIFF_ID --skycell_id $SKYCELL_ID --diff_skyfile_id $DIFF_SKYFILE_ID --outroot $outroot --redirect-output
+    if ("$BOTHWAYS" == "T")
+       $run = $run --inverse
+    end
     add_standard_args run
 
@@ -209 +215 @@
 
   task.exec
+    if ($LABEL:n == 0) break
     $run = difftool -pendingcleanuprun
     if ($DB:n == 0)
@@ -220 +227 @@
     end
     add_poll_args run
+    add_poll_labels run
     command $run
   end
@@ -226 +234 @@
   task.exit    0
     # convert 'stdout' to book format
-    ipptool2book stdout diffCleanup -key diff_id:skycell_id -uniq -setword dbname $options:0 -setword pantaskState INIT
+    ipptool2book stdout diffCleanup -key diff_id -uniq -setword dbname $options:0 -setword pantaskState INIT
     if ($VERBOSE > 2)
       book listbook diffCleanup