Changeset 25402 for branches/eam_branches/20090715/ippTasks/pstamp.pro

Timestamp:

Sep 15, 2009, 3:59:02 PM (17 years ago)

Author:

eugene

Message:

updates from trunk

File:

• branches/eam_branches/20090715/ippTasks/pstamp.pro (modified) (7 diffs)

branches/eam_branches/20090715/ippTasks/pstamp.pro

@@ -10 +10 @@
 
 # set PS_DBSERVER if postage stamp database host is not the same as the value for DBSERVER in site.config
-# warning: no quotes around the two words. it cause it to get passed to pstamptool as one word
-# tricky to debug problem ensues
+# warning: no quotes around the two words. That causes the variable to get passed to pstamptool as one word
+# and a tricky to debug problem ensues
 # example:
-# $PSDBSERVER = -dbserver hostname
-if ($?PSDBSERVER == 0)
+# $PS_DBSERVER = -dbserver hostname
+
+if ($?PS_DBSERVER == 0)
     $PS_DBSERVER = ""
 end
@@ -134 +135 @@
         end
         add_poll_args run
+        # add_poll_labels run
         command $run
     end
@@ -178 +180 @@
         book getword pstampRequest $pageName ds_outProduct -var PRODUCT
 
+        host anyhost
+
         $run = pstamp_parser_run.pl --req_id $REQ_ID --uri $URI --product $PRODUCT --redirect-output
 
@@ -219 +223 @@
 
     task.exec
+        $run = pstamptool  -completedreq
         if ($DB:n == 0)
             option DEFAULT
-            command pstamptool  -completedreq
         else 
             option $DB:$pstampFin_DB
-            command pstamptool  -completedreq -dbname $DB:$pstampFin_DB $PS_DBSERVER
+            $run = $run -dbname $DB:$pstampFin_DB $PS_DBSERVER
             $pstampFin_DB ++
             if ($pstampFin_DB >= $DB:n) set pstampFin_DB = 0
         end
+        add_poll_args run
+        # add_poll_labels run
+        command $run
     end
 
@@ -313 +320 @@
 
     task.exec
+        $run = pstamptool -pendingjob
         if ($DB:n == 0)
             option DEFAULT
-            command pstamptool -pendingjob -limit 10
         else
             option $DB:$pstampJob_DB
-            command pstamptool -pendingjob -limit 10 -dbname $DB:$pstampJob_DB $PS_DBSERVER
+            $run = $run -dbname $DB:$pstampJob_DB $PS_DBSERVER
             $pstampJob_DB ++
             if ($pstampJob_DB >= $DB:n) set pstampJob_DB = 0
         end
+        add_poll_args run
+        # add_poll_labels run 
+        command $run
     end
 
@@ -356 +366 @@
     task.exec
         book npages pstampJob -var N
-        if ($N == 0) break
+        if ($N == 0) 
+            periods -exec $RUNEXEC
+            break
+        end
+        periods -exec 0.05
         
         book getpage pstampJob 0 -var pageName -key pantaskState INIT
@@ -374 +388 @@
         end
 
+        host anyhost
 
         $run = pstamp_job_run.pl --job_id $JOB_ID --job_type $JOB_TYPE --rownum $ROWNUM --output_base $OUTPUT_BASE --redirect-output