Changeset 31480

Timestamp:

May 6, 2011, 4:18:53 PM (15 years ago)

Author:

watersc1

Message:

Fix to properly delete a page once we've run it. If it still needs work, it'll show up again the next time we run the load command.

File:

• trunk/ippTasks/lap.pro (modified) (8 diffs)

trunk/ippTasks/lap.pro

@@ -17 +17 @@
 
 macro lap.show.books
+    echo "lapNewRuns"
     book listbook lapNewRuns
+    echo "lapRunRuns"
     book listbook lapRunRuns
+    echo "lapDoneRuns"
     book listbook lapDoneRuns
+    echo "lapFullRuns"
     book listbook lapFullRuns
 end
@@ -36 +40 @@
       active true
     end
-    task lap.cleanup.load
-      active true
-    end
-    task lap.cleanup.run
-      active true
-    end
 end
 
@@ -57 +55 @@
       active false
     end
-    task lap.cleanup.load
-      active false
-    end
-    task lap.cleanup.run
+end
+
+macro lap.debug.mode
+    task lap.initial.load
+      active true
+    end
+    task lap.initial.run
+      active false
+    end
+    task lap.monitor.load
+      active true
+    end
+    task lap.monitor.run
       active false
     end
@@ -181 +188 @@
   periods      -exec $LOADEXEC
   periods      -timeout 600
+  active       false
 # This can probably be increased and spread over hosts in the future.
   npending     1            
@@ -205 +213 @@
     book getword lapNewRuns $lapNewPageName dbname -var DBNAME
 
+    option $LAP_ID
+
     $run = lap_science.pl --chip_mode --dbname $DBNAME --lap_id $LAP_ID
-
-    command $run
-
-  end
-
-  # success
-  task.exit  0
-#    book delpage lapNewRuns $options:0
+    
+    command $run
+
+  end
+
+  # success
+  task.exit  0
+     book delpage lapNewRuns $options:0
 #    ipptool2book stdout lapNewRuns -uniq -key lap_id
 
@@ -297 +307 @@
   periods      -exec $LOADEXEC
   periods      -timeout 600
+  active       false
 # This can probably be increased and spread over hosts in the future.
   npending     1            
@@ -323 +334 @@
     book getword lapRunRuns $lapRunPageName dbname -var DBNAME
 
+    option $LAP_ID
     $run = lap_science.pl --monitor_mode --dbname $DBNAME --lap_id $LAP_ID
 
@@ -331 +343 @@
   # success
   task.exit  0
-#    book delpage lapRunRuns $options:0
+    book delpage lapRunRuns $options:0
 #    ipptool2book stdout lapRunRuns -uniq -key lap_id