Changeset 40433 for trunk

Timestamp:

May 15, 2018, 11:11:37 AM (8 years ago)

Author:

eugene

Message:

test for ipp_filename failure modes and report a meaningful error; remove PSCONFIG, PSCONFDIR (not not used in ippMonitor); NEB_SERVER supplied from config.dat

File:

• trunk/ippMonitor/raw/ipp.php (modified) (2 diffs)

trunk/ippMonitor/raw/ipp.php

@@ -826 +826 @@
     // these are defined by site.php
     global $PERLLIB;
+    global $NEB_SERVER;
     global $BINDIR;
     global $SITE;
-    global $PSCONFDIR;
-    global $PSCONFIG;
-
-    putenv("PSCONFDIR=$PSCONFDIR");
-    putenv("PSCONFIG=$PSCONFIG");
     putenv("PERL5LIB=$PERLLIB:");
+
     $PATH = getenv("PATH");
     putenv("PATH=$BINDIR:$PATH");
-    putenv("NEB_SERVER=http://ippc74/nebulous");
-
-    // be careful of the definition of PATH in SITE: cannot contain HOME
-    // echo "<br>ipp_filename.pl --site=$SITE --basename $basename --filerule $filerule --camera $camera --class_id $class_id<br>\n";
+    putenv("NEB_SERVER=$NEB_SERVER");
+
     exec ("ipp_filename.pl --site=$SITE --basename $basename --filerule $filerule --camera $camera --class_id $class_id", $output, $status);
 
     if (0) {
-      echo "PSCONFDIR: $PSCONFDIR<br>";
-      echo "PSCONFIG: $PSCONFIG<br>";
       echo "PERLLIB: $PERLLIB<br>";
+      echo "NEB_SERVER: $NEB_SERVER<br>";
       echo "basename: $basename<br>";
       for ($i = 0; $i < count($output); $i++) {
@@ -859 +853 @@
     $filename = $output[0];
     if ($status) {
-      echo "log file ($filerule, $basename) not found<br>\n";
-      return;
+      if ($status == 1) {       
+        echo "<b>log file ($filerule, $basename) not found<br></b>\n";
+        echo "ipp_filename.pl --site=$SITE --basename $basename --filerule $filerule --camera $camera --class_id $class_id<br>";
+        return;
+      } else {
+        echo "<b>ipp_filename.pl failure, check configuration<br></b>\n";
+        echo "ipp_filename.pl --site=$SITE --basename $basename --filerule $filerule --camera $camera --class_id $class_id<br>";
+        echo "NEB_SERVER: $NEB_SERVER<br>";
+        return; 
+      }
     }
     echo "<b>log filename: $filename</b><br>\n";