Changeset 18986

Timestamp:

Aug 8, 2008, 3:48:28 PM (18 years ago)

Author:

bills

Message:

pass along verbose if provided

Location:

trunk/pstamp/scripts

Files:

• pstamp_results_file.pl (modified) (1 diff)
• pstamp_runcommand.sh (modified) (2 diffs)
• pstamp_webrequest.pl (modified) (2 diffs)

trunk/pstamp/scripts/pstamp_results_file.pl

@@ -90 +90 @@
         { name => 'CLASS_ID',   type => '16A', writetype => TSTRING },    
 
-
         # output parameters
-        { name => 'STAMP_NAME', type => '16A', writetype => TSTRING },  
+#        { name => 'STAMP_NAME', type => '16A', writetype => TSTRING },  
         { name => 'OPTION_MASK',type => 'J', writetype   => TULONG },     
 

trunk/pstamp/scripts/pstamp_runcommand.sh

@@ -8 +8 @@
 # This script is used by cgi or php scripts.
 
-if [[ $# == 0 ]] ;then
-    echo "usage $0 command" >&2
+# echo $# args are: $*
+
+if [[ $# -lt 4 ]] ;then
+    echo "usage $0 PSCONFDIR PSCONFIG WORKDIR command" >&2
     #  EINVAL = 22
     exit 22
 fi
 
-#### BEGIN LOCAL_CONFIGURATION
+export PSCONFDIR=$1
+shift
 
-# These variables need to be customized for a particular installation
-# XXX: why not pass these on on the command line or in the environment?
-export PSCONFDIR=/home/panstarrs/bills/psconfig
+PSCONFIG=$1
+shift
 
-WORK_DIR=/data/ipp004.0/pstamp-work
+WORKDIR=$1
+shift
+export HOME=$WORKDIR
 
-#### END LOCAL_CONFIGURATION
-
-export HOME=$WORK_DIR
 
 cd $WORK_DIR
@@ -37 +38 @@
 ###
 
-source $PSCONFDIR/psconfig.bash debug
+source $PSCONFDIR/psconfig.bash $PSCONFIG
 status=$?
 if [[ $status != 0 ]] ; then

trunk/pstamp/scripts/pstamp_webrequest.pl

@@ -83 +83 @@
 {
     my $command = "$pstamprequest -req_name $request_name -project $project $request_file @ARGV";
-    $command .= " -$job_type" if $job_type;     # default job_type is stamp
+    $command .= " -$job_type" if $job_type;     # default job_type is pstamp
 
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
@@ -98 +98 @@
     ### In list mode just parse the file print the output and we're done
     ###
-    my $command = "$pstampparse --mode list_uri --file $request_file --dbname $dbname";
+    my $command = "$pstampparse --mode list_uri --file $request_file";
+    $command .= " --dbname $dbname" if $dbname;
+    $command .= " --verbose" if $verbose;
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
         run(command => $command, verbose => $verbose);