Changeset 25027 for branches/pap/ippTasks/pstamp.pro

Timestamp:

Aug 7, 2009, 4:08:25 PM (17 years ago)

Author:

Paul Price

Message:

Merging trunk (r25026) to get up-to-date on old branch.

Location:

branches/pap

Files:

• . (modified) (1 prop)
• ippTasks/pstamp.pro (modified) (6 diffs)

branches/pap/ippTasks/pstamp.pro

@@ -8 +8 @@
 $pstampJob_DB = 0
 $pstampFin_DB = 0
+
+# 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
+# example:
+# $PSDBSERVER = -dbserver hostname
+if ($?PSDBSERVER == 0)
+    $PS_DBSERVER = ""
+end
 
 macro pstamp.reset
@@ -115 +124 @@
 
     task.exec
+        $run = pstamptool -pendingreq
         if ($DB:n == 0)
             option DEFAULT
-            command pstamptool  -pendingreq
         else 
             option $DB:$pstampReq_DB
-            command pstamptool  -pendingreq -dbname $DB:$pstampReq_DB
+            $run = $run $PS_DBSERVER -dbname $DB:$pstampReq_DB
             $pstampReq_DB ++
             if ($pstampReq_DB >= $DB:n) set pstampReq_DB = 0
         end
+        add_poll_args run
+        command $run
     end
 
@@ -213 +224 @@
         else 
             option $DB:$pstampFin_DB
-            command pstamptool  -completedreq -dbname $DB:$pstampFin_DB
+            command pstamptool  -completedreq -dbname $DB:$pstampFin_DB $PS_DBSERVER
             $pstampFin_DB ++
             if ($pstampFin_DB >= $DB:n) set pstampFin_DB = 0
@@ -307 +318 @@
         else
             option $DB:$pstampJob_DB
-            command pstamptool -pendingjob -limit 10 -dbname $DB:$pstampJob_DB
+            command pstamptool -pendingjob -limit 10 -dbname $DB:$pstampJob_DB $PS_DBSERVER
             $pstampJob_DB ++
             if ($pstampJob_DB >= $DB:n) set pstampJob_DB = 0
@@ -354 +365 @@
         book setword pstampJob $pageName pantaskState RUN
         book getword pstampJob $pageName job_id -var JOB_ID
+        book getword pstampJob $pageName jobType -var JOB_TYPE
+        book getword pstampJob $pageName rownum -var ROWNUM
         book getword pstampJob $pageName dbname -var DBNAME
         book getword pstampJob $pageName outputBase -var OUTPUT_BASE
@@ -362 +375 @@
 
 
-        $run = pstamp_job_run.pl --job_id $JOB_ID --redirect-output --output_base $OUTPUT_BASE
+        $run = pstamp_job_run.pl --job_id $JOB_ID --job_type $JOB_TYPE --rownum $ROWNUM --output_base $OUTPUT_BASE --redirect-output 
         add_standard_args run