Index: trunk/ippTasks/dqstats.pro
===================================================================
--- trunk/ippTasks/dqstats.pro	(revision 27301)
+++ trunk/ippTasks/dqstats.pro	(revision 27304)
@@ -1,17 +1,17 @@
 ## dqstats.pro : globals and support macros : -*- sh -*-
 ## this file contains the tasks for running the dqstats analysis stage
-## these tasks use the book dqstatsPendingExp
+## these tasks use the book dqstatsPendingBundle
 
 # test for required global variables
 check.globals
 
-book init dqstatsPendingExp
+book init dqstatsPendingBundle
 
 macro dqstats.status
-  book listbook dqstatsPendingExp
+  book listbook dqstatsPendingBundle
 end
 
 macro dqstats.reset
-  book init dqstatsPendingExp
+  book init dqstatsPendingBundle
 end
 
@@ -45,5 +45,5 @@
 
 # select images ready for dqstats analysis
-# new entries are added to dqstatsPendingExp
+# new entries are added to dqstatsPendingBundle
 # skip already-present entries
 task	       dqstats.load
@@ -70,6 +70,6 @@
       if ($dqstats_DB >= $DB:n) set dqstats_DB = 0
     end
-    add_poll_args run
-    add_poll_labels run
+#    add_poll_args run
+#    add_poll_labels run
     command $run
   end
@@ -78,11 +78,11 @@
   task.exit    0
     # convert 'stdout' to book format
-    ipptool2book stdout dqstatsPendingExp -key dqstats_id -uniq -setword dbname $options:0 -setword pantaskState INIT
+    ipptool2book stdout dqstatsPendingBundle -key dqstats_id -uniq -setword dbname $options:0 -setword pantaskState INIT
     if ($VERBOSE > 2)
-      book listbook dqstatsPendingExp
+      book listbook dqstatsPendingBundle
     end
 
     # delete existing entries in the appropriate pantaskStates
-    process_cleanup dqstatsPendingExp
+    process_cleanup dqstatsPendingBundle
   end
 
@@ -106,5 +106,5 @@
   periods      -poll $RUNPOLL
   periods      -exec $RUNEXEC
-  periods      -timeout 10
+  periods      -timeout 600
 
   ## we want only a single outstanding dqstats job.  
@@ -113,22 +113,16 @@
 
   task.exec
-    book npages dqstatsPendingExp -var N
+    book npages dqstatsPendingBundle -var N
     if ($N == 0) break
     if ($NETWORK == 0) break
     
-    # look for new images in dqstatsPendingExp (pantaskState == INIT)
-    book getpage dqstatsPendingExp 0 -var pageName -key pantaskState INIT
+    # look for new images in dqstatsPendingBundle (pantaskState == INIT)
+    book getpage dqstatsPendingBundle 0 -var pageName -key pantaskState INIT
     if ("$pageName" == "NULL") break
 
-    book setword dqstatsPendingExp $pageName pantaskState RUN
-    book getword dqstatsPendingExp $pageName camera -var CAMERA
-    book getword dqstatsPendingExp $pageName exp_tag -var EXP_TAG
-    book getword dqstatsPendingExp $pageName dqstats_id -var DQSTATS_ID
-#    book getword dqstatsPendingExp $pageName camroot -var CAMROOT
-#    book getword dqstatsPendingExp $pageName workdir -var WORKDIR_TEMPLATE
-#    book getword dqstatsPendingExp $pageName reduction -var REDUCTION
-#    book getword dqstatsPendingExp $pageName dvodb  -var DVODB
-#    book getword dqstatsPendingExp $pageName image_only -var IMAGE_ONLY
-    book getword dqstatsPendingExp $pageName dbname -var DBNAME
+    book setword dqstatsPendingBundle $pageName pantaskState RUN
+    book getword dqstatsPendingBundle $pageName camera -var CAMERA
+    book getword dqstatsPendingBundle $pageName dqstats_id -var DQSTATS_ID
+    book getword dqstatsPendingBundle $pageName dbname -var DBNAME
 
     # specify choice of remote host based on camera and chip (class_id)
@@ -153,12 +147,5 @@
     stderr $LOGDIR/dqstats.log
 
-    $run = dqstats_bundle.pl --exp_tag $EXP_TAG --dqstats_id $DQSTATS_ID --camera GPC1 --redirect-output
-#     if ("$REDUCTION" != "NULL")
-#       $run = $run --reduction $REDUCTION
-#     end
-#     if ("$IMAGE_ONLY" == "T")
-#       $run = $run --image-only
-#     end
-
+    $run = dqstats_bundle.pl --dqstats_id $DQSTATS_ID --camera $CAMERA --redirect-output
         
     add_standard_args run
@@ -176,5 +163,5 @@
   # success
   task.exit default
-    process_exit dqstatsPendingExp $options:0 $JOB_STATUS
+    process_exit dqstatsPendingBundle $options:0 $JOB_STATUS
   end
 
@@ -183,5 +170,5 @@
     showcommand crash
     echo "hostname: $JOB_HOSTNAME"
-    book setword dqstatsPendingExp $options:0 pantaskState CRASH
+    book setword dqstatsPendingBundle $options:0 pantaskState CRASH
   end
 
@@ -189,5 +176,5 @@
   task.exit    timeout
     showcommand timeout
-    book setword dqstatsPendingExp $options:0 pantaskState TIMEOUT
+    book setword dqstatsPendingBundle $options:0 pantaskState TIMEOUT
   end
 end