Changeset 31487

Timestamp:

May 6, 2011, 6:14:16 PM (15 years ago)

Author:

watersc1

Message:

typo fix, and cleanup

File:

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

tags/ipp-20110505/ippTasks/lap.pro

@@ -170 +170 @@
   # success
   task.exit  0
-#    book delpage lapNewRuns $options:0
     ipptool2book stdout lapNewRuns -uniq -key lap_id -setword dbname $options:0 -setword pantaskState INIT
 
@@ -222 +221 @@
     option $LAP_ID
     book delpage lapNewRuns $LAP_ID
+
     $run = lap_science.pl --chip_mode --dbname $DBNAME --lap_id $LAP_ID
     
@@ -230 +230 @@
   # success
   task.exit  0
-
-#    ipptool2book stdout lapNewRuns -uniq -key lap_id
-
     if ($VERBOSE > 2)
       book listbook lapNewRuns
@@ -284 +281 @@
 
     add_poll_labels run
-#    echo $run
-    command $run
-  end
-  # success
-  task.exit  0
-#    book delpage lapRunRuns $options:0
+    command $run
+  end
+  # success
+  task.exit  0
     ipptool2book stdout lapRunRuns -uniq -key lap_id -setword dbname $options:0 -setword pantaskState INIT
 
@@ -324 +319 @@
     book npages lapRunRuns -var N
 
-#    echo $N $NETWORK
     if ($N == 0) break
     if ($NETWORK == 0) break
@@ -334 +328 @@
     if ($lap_RunPage >= $N) set lap_RunPage = 0
 
-#    echo $lapRunPageName
     if ("$lapRunPageName" == "NULL") break
 
@@ -343 +336 @@
     option $LAP_ID
     book delpage lapRunRuns $LAP_ID
+
     $run = lap_science.pl --monitor_mode --dbname $DBNAME --lap_id $LAP_ID
 
@@ -351 +345 @@
   # success
   task.exit  0
-#    ipptool2book stdout lapRunRuns -uniq -key lap_id
-
     if ($VERBOSE > 2)
       book listbook lapRunRuns
@@ -456 +448 @@
     book getword lapDoneRuns $lapDonePageName dbname -var DBNAME
 
-    book delpage lapDoneRuns $options:0
+    book delpage lapDoneRuns $LAP_ID
 
     $run = lap_science.pl --cleanup_mode --dbname $DBNAME --lap_id $LAP_ID
@@ -466 +458 @@
   # success
   task.exit  0
-#    ipptool2book stdout lapDoneRuns -uniq -key lap_id
 
     if ($VERBOSE > 2)