Changeset 16764 for trunk/pstamp/scripts

Timestamp:

Feb 29, 2008, 2:42:19 PM (18 years ago)

Author:

bills

Message:

various bug fixes

Location:

trunk/pstamp/scripts

Files:

• pstamp_dorequest.pl (modified) (1 diff)
• pstamp_parser_run.pl (modified) (2 diffs)
• pstamp_runcommand.sh (modified) (2 diffs)
• pstamp_webrequest.pl (modified) (4 diffs)

trunk/pstamp/scripts/pstamp_dorequest.pl

@@ -98 +98 @@
         die("Unable to perform $command: $error_code");
     }
-    ### print "@$stdout_buf\n";
+    ### print @$stdout_buf;
 }
 

trunk/pstamp/scripts/pstamp_parser_run.pl

@@ -42 +42 @@
 #my $outputDataStoreRoot = "/var/www/html/ds/dsroot";
 
-my $outputDataStoreRoot = metadataLookupStr($ipprc->{_ipprc}, 'PSTAMP_DATA_STORE_ROOT');
+my $outputDataStoreRoot = metadataLookupStr($ipprc->{_siteConfig}, 'PSTAMP_DATA_STORE_ROOT');
 exit ($PS_EXIT_CONFIG_ERROR) unless defined $outputDataStoreRoot;
 my $defaultOutputRoot = $outputDataStoreRoot;
@@ -49 +49 @@
 #my $inputWorkdir = "/export/data1/bills/pstamp/work/$request_id";
 
-my $inputWorkdir = metadataLookupStr($ipprc->{_ipprc}, 'PSTAMP_WORKDIR');
+my $inputWorkdir = metadataLookupStr($ipprc->{_siteConfig}, 'PSTAMP_WORKDIR');
 exit ($PS_EXIT_CONFIG_ERROR) unless defined $inputWorkdir;
 $inputWorkdir .= "/$request_id";

trunk/pstamp/scripts/pstamp_runcommand.sh

@@ -17 +17 @@
 
 # These variables need to be customized for a particular installation
-# XXX: why not pass these on on the command line ?
+# XXX: why not pass these on on the command line or in the environment?
 export PSCONFDIR=/export/data0/bills/psconfig
 
 WORK_DIR=/export/data1/bills/pstamp/work
-CMD_DIR=/export/data0/bills/src/ipp/pstamp/scripts
+CMD_DIR=/export/data0/bills/src/ipp/pstamp/scripts:/export/data0/bills/src/ipp/DataStoreServer/web/cgi
 
 #### END LOCAL_CONFIGURATION
@@ -50 +50 @@
 ###
 PATH=${CMD_DIR}:${PATH}
+#echo path: $PATH >&2
+#echo command: $* >&2
 
 ## make sure we are able to run the desired command

trunk/pstamp/scripts/pstamp_webrequest.pl

@@ -69 +69 @@
         run(command => $command, verbose => $verbosity);
     unless ($success) {
-        print STDERR "@$stderr_buf\n";
+        print STDERR @$stderr_buf;
         die("Unable to perform pstamprequest: $error_code");
     }
@@ -87 +87 @@
     }
     ### print "Matching Images:\n";
-    print "@$stdout_buf";
+    print @$stdout_buf;
     exit 0;
 }
@@ -99 +99 @@
         run(command => $command, verbose => $verbosity);
     unless ($success) {
-        print STDERR "@$stderr_buf\n";
+        print STDERR @$stderr_buf;
         die("Unable to perform pstamptool -addreq: $error_code");
     }
@@ -111 +111 @@
         run(command => $command, verbose => $verbosity);
     unless ($success) {
-        print STDERR "@$stderr_buf\n";
+        print STDERR @$stderr_buf;
         die("Unable to perform pstamparser_run -addreq: $error_code");
     }