Changeset 39719 for branches/czw_branch/20160809/DataStoreServer/web/php/getsmf.php

Timestamp:

Sep 24, 2016, 3:29:05 PM (10 years ago)

Author:

eugene

Message:

merging changes from trunk

Location:

branches/czw_branch/20160809

Files:

• . (modified) (1 prop)
• DataStoreServer/web/php/getsmf.php (modified) (5 diffs)

branches/czw_branch/20160809/DataStoreServer/web/php/getsmf.php

@@ -5 +5 @@
 // To just list use wget 'http://ippc17/ipp-misc/getsmf.php?exp_name=o5732g0036o&list=1'
 
-// Only configuration variable here, the location of the cgi script to find smf files
-$command = "/data/ippc17.0/datastore/ds-cgi/findsmf.pl";
-
-$rvar_exp_name = "";
-$rvar_cam_id = "";
-$rvar_data_group = "";
-$rvar_list = 0;
 
 $error_string = "";
 $debug = 0;
-
-# import_request_variables("g", "rvar_");
 
 $rvar_exp_name = getVar('exp_name');
@@ -24 +15 @@
 $rvar_data_group = getVar('data_group');
 $rvar_list = getVar('list');
+
+$command = "/data/ippc17.0/datastore/ds-cgi/findsmf.pl";
 
 # cam_id takes priority
@@ -38 +31 @@
 if ($command) {
     if ($rvar_release) {
-        $command .= " --release $release";
+        if ($rvar_release == "3PI.GR1") {
+            $rvar_release = "3PI.PV1";
+        }
+        $command .= " --release $rvar_release";
     } 
     if ($rvar_data_group) {
@@ -69 +65 @@
             }
         } else {
-            echo "unexpected output from $command: $output[0] $output[1]\n";
+            echo "<br>unexpected output from $command: $output[0] $output[1]\n";
         }
     } else {
         if ($debug) {
-            echo "command failed $command_status\n";
+            echo "<br>command failed $command_status\n";
         }
     }
@@ -92 +88 @@
         readfile($pathname);
     } else {
-        echo "smf file name is $filename<br>\nfile is $pathname\n";
+        echo "smf : $filename\n";
+        # echo "path: $pathname\n";
     }
-
 } else {
     // XXX: Figure out how to stop wget from redirecting these error