Changeset 40478 for branches/czw_branch/20170908/ippMonitor/raw/ipp.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/ipp.php (modified) (1 diff)

branches/czw_branch/20170908/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");
-
-    // 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 "PERLLIB: $PERLLIB<br>";
+      echo "NEB_SERVER: $NEB_SERVER<br>";
       echo "basename: $basename<br>";
       for ($i = 0; $i < count($output); $i++) {
         echo "output $i: $output[$i]<br>";
       }
+      echo "path:     $PATH<br>";
       echo "output:   $output[0]<br>";
       echo "status:   $status<br>";
       echo "filename: $filename<br>";
-      exit ();
+      // exit ();
     }
 
     $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";