Changeset 14128

Timestamp:

Jul 10, 2007, 4:47:46 PM (19 years ago)

Author:

eugene

Message:

fixes for complete site.php support; updates to schema

Location:

trunk/ippMonitor

Files:

• def/detProcessedExp.d (modified) (1 diff)
• def/detProcessedImfile.d (modified) (1 diff)
• raw/getimage.php (modified) (1 diff)
• raw/ipp.php (modified) (2 diffs)

trunk/ippMonitor/def/detProcessedExp.d

@@ -11 +11 @@
 IMAGE JPEG2 $detProcessedExp.path_base PPIMAGE.JPEG2 $rawExp.camera NONE
 
-ARGS  ARG1 det_id=$detProcessedExp.det_id
-ARGS  ARG1 exp_id=$detProcessedExp.exp_id
+ARGS  ARG1 detProcessedImfile.det_id=$detProcessedExp.det_id
+ARGS  ARG1 detProcessedImfile.exp_id=$detProcessedExp.exp_id
 ARGS  ARG1 camera=$rawExp.camera
 ARGS  ARG1 basename=$detProcessedExp.path_base

trunk/ippMonitor/def/detProcessedImfile.d

@@ -5 +5 @@
 
 # the following WHERE clauses are added to all queries joined by AND
-WHERE detResidExp.exp_id = rawExp.exp_id
+WHERE detProcessedImfile.exp_id = rawExp.exp_id
 
 #     field                             size   name      show   link to     extras

trunk/ippMonitor/raw/getimage.php

@@ -2 +2 @@
 
 $debug = 0;
+include 'site.php';
+
+// these are defined by site.php
+// global $PERLLIB;
+// global $BINDIR;
+// global $SITE;
 
 ### these need to be set to the correct locations!!
-$PERLLIB = "/home/kiawe/eugene/psconfig/dev.linux/lib";
-$BINDIR = "/home/kiawe/eugene/psconfig/dev.linux/bin";
-$SITE = "/home/kiawe/eugene/.ipprc";
 $MISSING = "missing.png";
 

trunk/ippMonitor/raw/ipp.php

@@ -486 +486 @@
 
     // 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";
+    echo "<br>ipp_filename.pl --site=$SITE --basename $basename --filerule $filerule --camera $camera --class_id $class_id<br>\n";
     exec ("ipp_filename.pl --site=$SITE --basename $basename --filerule $filerule --camera $camera --class_id $class_id", $output, $status);
 
@@ -502 +502 @@
     $filename = $output[0];
     if ($status) {
-      echo "log file not found<br>\n";
+      echo "log file ($filerule, $basename) not found<br>\n";
       return;
     }