Index: /tags/ipp-20110505/ippTasks/lap.pro
===================================================================
--- /tags/ipp-20110505/ippTasks/lap.pro	(revision 31486)
+++ /tags/ipp-20110505/ippTasks/lap.pro	(revision 31487)
@@ -170,5 +170,4 @@
   # success
   task.exit  0
-#    book delpage lapNewRuns $options:0
     ipptool2book stdout lapNewRuns -uniq -key lap_id -setword dbname $options:0 -setword pantaskState INIT
 
@@ -222,4 +221,5 @@
     option $LAP_ID
     book delpage lapNewRuns $LAP_ID
+
     $run = lap_science.pl --chip_mode --dbname $DBNAME --lap_id $LAP_ID
     
@@ -230,7 +230,4 @@
   # success
   task.exit  0
-
-#    ipptool2book stdout lapNewRuns -uniq -key lap_id
-
     if ($VERBOSE > 2)
       book listbook lapNewRuns
@@ -284,10 +281,8 @@
 
     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,5 +319,4 @@
     book npages lapRunRuns -var N
 
-#    echo $N $NETWORK
     if ($N == 0) break
     if ($NETWORK == 0) break
@@ -334,5 +328,4 @@
     if ($lap_RunPage >= $N) set lap_RunPage = 0
 
-#    echo $lapRunPageName
     if ("$lapRunPageName" == "NULL") break
 
@@ -343,4 +336,5 @@
     option $LAP_ID
     book delpage lapRunRuns $LAP_ID
+
     $run = lap_science.pl --monitor_mode --dbname $DBNAME --lap_id $LAP_ID
 
@@ -351,6 +345,4 @@
   # success
   task.exit  0
-#    ipptool2book stdout lapRunRuns -uniq -key lap_id
-
     if ($VERBOSE > 2)
       book listbook lapRunRuns
@@ -456,5 +448,5 @@
     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,5 +458,4 @@
   # success
   task.exit  0
-#    ipptool2book stdout lapDoneRuns -uniq -key lap_id
 
     if ($VERBOSE > 2)