Changeset 40478 for branches/czw_branch/20170908/ippMonitor/raw/skyplot.php

Timestamp:

Jun 27, 2018, 3:22:45 PM (8 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/czw_branch/20170908/ippMonitor

Files:

• . (modified) (1 prop)
• raw/skyplot.php (modified) (3 diffs)

branches/czw_branch/20170908/ippMonitor/raw/skyplot.php

@@ -12 +12 @@
 $MISSING = "missing.png";
 
-### we must have been past arguments with GET:
+### XXX TEST
+# $outfile = $MISSING;
+# $file = fopen ($outfile, "r");
+# if ($file && !$debug) {
+#   header ('Content-Type: image/png');
+#   fpassthru ($file);
+# }
+# exit();
+
+
+### we must have been passed arguments with GET:
 if ($_SERVER[REQUEST_METHOD] != 'GET') { 
   exit ();
@@ -47 +57 @@
 $outfile = $_GET[output];
 
-$output = shell_exec("skyplot.dvo $infile $outfile");//, $output, $status);
+// $output = shell_exec("skyplot.dvo $infile $outfile");//, $output, $status);
+exec("skyplot.dvo $infile $outfile", $output, $status);
 
 if ($debug) {
+  echo "output from skyplot.dvo<br>\n";
   for ($i = 0; $i < count($output); $i++) {
     echo "output $i: $output[$i]<br>";
@@ -57 +69 @@
 }
 
-# use these to check the environment
-# passthru ("env");
+// use these to check the environment
+// passthru ("env");
+
 
 $file = fopen ($outfile, "r");