Changeset 16283 for trunk/pstamp/web/request.php

Timestamp:

Feb 1, 2008, 5:42:05 PM (18 years ago)

Author:

bills

Message:

get web page working again with job sequencing through the database

File:

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

trunk/pstamp/web/request.php

@@ -14 +14 @@
 <pre>
 <?php 
+
+$COMMAND_DIR = "/export/data0/bills/src/ipp/pstamp/scripts";
+$STAMPS_DIR = "stamps";
 
 // Initialize variables
@@ -416 +419 @@
     global $rvar_id, $rvar_class_id;
     global $command_line;
+    global $STAMPS_DIR;
 
     $cmd = "pstampwebrequest.sh";
@@ -430 +434 @@
         throw new Exception('Stamp Name must be specified.');
     }
-    $cmd .= " -user_tag $rvar_user_tag";
+    $cmd .= " -user_tag $STAMPS_DIR/$rvar_user_tag";
 
     // Set up the ROI parameters
@@ -493 +497 @@
     global $error_line;
     global $command_status;
-
-    $HOME = "/export/data1/bills/pstamp";
-    $cmd_dir  = "$HOME/bin";
-    $work_dir = "$HOME/work";
-
-
-    exec ("$cmd_dir/$command_line", $output_array, $command_status);
+    global $COMMAND_DIR;
+
+
+    exec ("$COMMAND_DIR/$command_line", $output_array, $command_status);
 
     $size = sizeof($output_array);
@@ -520 +521 @@
 function printURL($path)
 {
-    $fileName = basename($path);
     echo "<tr><td>";
-    echo "<a href=\"http:$path\" target=\"_blank\" type=\"image/fits\">";
-    echo $fileName;
-    echo "</a>";
+    $doURL = 1;
+    if ($doURL) {
+        $fileName = basename($path);
+        echo "<a href=\"http:$path\" target=\"_blank\" type=\"image/fits\">";
+        echo $fileName;
+        echo "</a>";
+    } else {
+        print "$path";
+    }
     echo "</td></tr>";
 }