Changeset 18987

Timestamp:

Aug 8, 2008, 3:49:25 PM (18 years ago)

Author:

bills

Message:

put all local configuration for the cgi scripts here.

File:

• trunk/pstamp/web/request.php (modified) (5 diffs)

trunk/pstamp/web/request.php

@@ -19 +19 @@
 // BEGIN Local configuration
 
-$COMMAND_DIR = "XXX";
-$WORKDIR = "XXX";
-$dsroot = "XXX";
-$dbname = "XXX";
+$WORKDIR = "/export/data1/bills/pstamp/work";
+
+$PSCONFDIR = "/export/data0/bills/psconfig";
+$PSCONFIG  = "debug";
+$PSBINDIR  = "$PSCONFDIR/$PSCONFIG.linrh64/bin";
+
+$dsroot = "/export/data1/datastore/dsroot";
+$dbname = "gpc1";
 
 // END Local configuration 
-//      (actually there is a little bit more in $COMMAND_DIR/pstamp_runcommand.sh )
+
+# this script sets up the environment to run IPP commands with current directory
+# $WORKDIR
+$SCRIPT    = "$PSBINDIR/pstamp_runcommand.sh $PSCONFDIR $PSCONFIG $WORKDIR";
 
 // Initialize variables
@@ -245 +252 @@
     global $command_line;
     global $dbname;
+    global $require_class_id;
+    global $PSCONFDIR, $PSCONFIG, $WORKDIR;
+    global $SCRIPT;
 
     $making_stamps = 1;
-    $cmd = "pstamp_runcommand.sh pstamp_webrequest.pl";
+    $cmd = "$SCRIPT pstamp_webrequest.pl";
 
     if ($list_checked) {
@@ -344 +354 @@
     global $error_line;
     global $command_status;
-    global $COMMAND_DIR;
 
     //    echo "running $command_line\n";
 
-    exec ("$COMMAND_DIR/$command_line", $output_array, $command_status);
+    exec ("$command_line", $output_array, $command_status);
 
     $size = sizeof($output_array);
@@ -435 +444 @@
 function listJobs($request_id, $jobFinished)
 {
-
-    $command_line = "pstamp_runcommand.sh pstamp_listjobs.pl $request_id";
+    global $WORKDIR;
+    global $SCRIPT;
+
+    $command_line = "$SCRIPT pstamp_listjobs.pl $request_id";
     global $dbname;
     if ($dbname) {
@@ -470 +481 @@
     global $outFileset;
     global $dbname;
-
-    $command_line = "pstamp_runcommand.sh pstamptool -listreq -req_id $request_id -simple";
+    global $SCRIPT;
+
+    $command_line = "$SCRIPT pstamptool -listreq -req_id $request_id -simple";
     if ($dbname) {
         $command_line .= " -dbname $dbname";