Changeset 16591

Timestamp:

Feb 21, 2008, 6:38:46 PM (18 years ago)

Author:

bills

Message:

Updates to the postage stamp server scripts

Location:

trunk/pstamp/scripts

Files:

• ppstamp_run.pl (modified) (5 diffs)
• pstamp_dorequest.pl (modified) (1 diff)
• pstamp_parser_run.pl (added)
• pstamp_runcommand.sh (modified) (4 diffs)
• pstampparser_run.pl (deleted)

trunk/pstamp/scripts/ppstamp_run.pl

@@ -15 +15 @@
 my $job_id = $ARGV[0];
 
-my $verbosity = 0;
+my $verbosity = 1;
 
 use Sys::Hostname;
 my $host = hostname();
+
 print "\n\n";
 print "Starting script $0 on $host\n\n";
+
 use IPC::Cmd 0.36 qw( can_run run );
 
@@ -58 +60 @@
         run(command => $command, verbose => $verbosity);
     unless ($success) {
-        die("Unable to perform pstamptool -pendingreq: $error_code");
+        die("Unable to perform pstamptool -pendingjob: $error_code");
     }
 
     if (@$stdout_buf == 0) {
         print STDERR "pending pstamp job id $job_id not found\n";
-        exit 1;
+        # exit 1;
+        exit 0;
     }
     my $metadata = $mdcParser->parse(join "", @$stdout_buf) or
@@ -82 +85 @@
 my $outputBase = $psjob->{outputBase};
 my $argString = $psjob->{args};
-#my $request_id = $psjob->{req_id};
-
-#
-# update the state of this job from 'new' to 'run'
-#
-{
-    my $command = "$pstamptool -processedjob -job_id $job_id -state run";
-    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-        run(command => $command, verbose => $verbosity);
-    unless ($success) {
-        die("Unable to perform $command: $error_code");
-    }
-}
 
 my $jobStatus;
@@ -103 +93 @@
 
     if ($success) {
-        $jobStatus = "ok";
+        $jobStatus = $PS_EXIT_SUCCESS;
     } else {
-        $jobStatus = $error_code;
-        print STDERR "ppstamp failed with error code $error_code\n";
+        # run shifts the unix exit status up by 8 bits for some reason
+        $jobStatus = $error_code >> 8;
+        print STDERR "ppstamp failed with error code: $jobStatus\n";
     }
-#    unless ($success) {
-#        die("Unable to perform $command: $error_code");
-#    }
 }
 
 
-# stop the job and set the error status
+# stop the job and set the result value
 {
-    my $command = "$pstamptool -processedjob -job_id $job_id -state stop -status $jobStatus";
+    my $command = "$pstamptool -processedjob -job_id $job_id -state stop -result $jobStatus";
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
         run(command => $command, verbose => $verbosity);
@@ -124 +112 @@
 }
 
-
-if ($jobStatus eq "ok") {
-    exit 0;
-} else {
-    exit $jobStatus;
-}
+exit $jobStatus;

trunk/pstamp/scripts/pstamp_dorequest.pl

@@ -4 +4 @@
 ###
 ###     Excecute the jobs for a given request.
-###     Note: This is intended for testing outside of pantasks environment
+###
+###     Note: This program is not part of the postage stamp server
+###     It is intended for testing outside of pantasks environment
 ###
 

trunk/pstamp/scripts/pstamp_runcommand.sh

@@ -2 +2 @@
 ###
 #
-# pstampwrapper.sh: 
-# Set up the ipp environment to run a ipp commands on behalf of hte postage stamp
+# pstamp_runcommand.sh: 
+#
+# Set up the ipp environment to run a ipp commands on behalf of the postage stamp
 # server and execute the command given by the argument list 
+# This script is used by cgi or php scripts.
 
 if [[ $# == 0 ]] ;then
@@ -15 +17 @@
 
 # These variables need to be customized for a particular installation
+# XXX: why not pass these on on the command line ?
 export PSCONFDIR=/export/data0/bills/psconfig
-
-# TODO shouldn't need to do this but there seems to be a psconfig problem.
-# Gene fixed this recently
-#export LD_LIBRARY_PATH=/usr/local/lib
 
 WORK_DIR=/export/data1/bills/pstamp/work
@@ -30 +29 @@
 cd $WORK_DIR
 status=$?
-if [[ ! $status ]] ; then
+if [[ $status != 0 ]] ; then
     echo $0 cannot cd to WORK_DIR: $WORK_DIR status: $status >&2
     exit $status
 fi
 
-# TODO: I do this so that I have permissions to modify the files created by 
-# the web server user apache.
-#umask 0
-
 ###
-### configure IPP
+### configure the IPP
 ###
-#export MANPATH=""
 
 source $PSCONFDIR/psconfig.bash default
 status=$?
-if [[ ! $status ]] ; then
+if [[ $status != 0 ]] ; then
     echo error setting up IPP environment >&2
     exit $status
@@ -53 +47 @@
 ###
 ### Add our command directory to the path. 
-### TODO: This won't be necessary once the scripts get installed as part of the IPP
+### XXX: This won't be necessary once the scripts get installed as part of the IPP
 ###
 PATH=${CMD_DIR}:${PATH}
 
-## This test is sort of redundant. 
-## We'll get a more useful error by just going ahead and trying the command
-## or by not suppressing the output from which
+## make sure we are able to run the desired command
+## XXX: This test is sort of redundant. 
+## We'd get a more useful error by just going ahead and trying the command
+## or by not suppressing the error output of which
 if [[ ! -x `which $1 2> /dev/null` ]] ;then
     status=$?