Changeset 43007

Timestamp:

May 3, 2026, 2:50:02 PM (4 days ago)

Author:

eugene

Message:

clearer names for global database variables

File:

• branches/eam_branches/ipp-pstamp-20260421/pstamp/web/request.php (modified) (4 diffs)

branches/eam_branches/ipp-pstamp-20260421/pstamp/web/request.php

@@ -309 +309 @@
 //    echo "$cmd<br>\n";
 
-    if ($dbname) {
+    global $PS_DATABASE, $PS_HOSTNAME;
+    if ($PS_DATABASE && $PS_HOSTNAME) {
         $cmd .= " --dbname $PS_DATABASE --dbserver $PS_HOSTNAME";
     }
@@ -337 +338 @@
         $wholefile = 0;
         if ($sky_checked) {
-            if ($rvar_RA == NULL || $rvar_DEC == NULL) {
+            if ($rvar_RA === NULL || $rvar_DEC === NULL) {
                 throw new Exception("RA and DEC must be specified. Got: ($rvar_RA, $rvar_DEC)");
             }
@@ -452 +453 @@
 
     // EAM : testing:
-    echo "<br>running $command_line\n<br>";
+    # echo "<br>running $command_line\n<br>";
 
     // EAM : testing:
-    // exec ("$command_line", $output_array, $command_status);
+    exec ("$command_line", $output_array, $command_status);
     http_response_code(400);
-    echo "<b> run command $command_line</b><br>";
-    die ("run command $command_line");
+    # echo "<b> run command $command_line</b><br>";
+    # die ("run command $command_line");
 
     $size = sizeof($output_array);
@@ -502 +503 @@
             $fileName = basename($path);
             if ($state == "stop") {
-                global $dsroot;
-                $dirName  = "$dsroot/$product/$req_name";
+                global $DS_ROOT;
+                $dirName  = "$DS_ROOT/$product/$req_name";
                 $filesetURL = "$DS_URL/$product/$req_name";