Changeset 31484

Timestamp:

May 6, 2011, 6:07:42 PM (15 years ago)

Author:

watersc1

Message:

bug fix for the case where a job exits with non-zero state, but the book retains the page.

File:

• tags/ipp-20110505/ippTasks/lap.pro (modified) (6 diffs)

tags/ipp-20110505/ippTasks/lap.pro

@@ -27 +27 @@
 end
 
+macro lap.clear.books
+    book init lapNewRuns
+    book init lapRunRuns
+    book init lapFullRuns
+    book init lapDoneRuns
+end
+
 macro lap.on
     task lap.initial.load
@@ -214 +221 @@
 
     option $LAP_ID
-
+    book delpage lapNewRuns $LAP_ID
     $run = lap_science.pl --chip_mode --dbname $DBNAME --lap_id $LAP_ID
     
@@ -223 +230 @@
   # success
   task.exit  0
-     book delpage lapNewRuns $options:0
+
 #    ipptool2book stdout lapNewRuns -uniq -key lap_id
 
@@ -335 +342 @@
 
     option $LAP_ID
+    book delpage lapRunRuns $LAP_ID
     $run = lap_science.pl --monitor_mode --dbname $DBNAME --lap_id $LAP_ID
 
@@ -343 +351 @@
   # success
   task.exit  0
-    book delpage lapRunRuns $options:0
 #    ipptool2book stdout lapRunRuns -uniq -key lap_id
 
@@ -449 +456 @@
     book getword lapDoneRuns $lapDonePageName dbname -var DBNAME
 
+    book delpage lapDoneRuns $options:0
+
     $run = lap_science.pl --cleanup_mode --dbname $DBNAME --lap_id $LAP_ID