Changeset 30454

Timestamp:

Feb 1, 2011, 3:02:23 PM (15 years ago)

Author:

eugene

Message:

add burntool state table; set limit on unrestricted diff query; change magic paths to workdir (nebulous)

Location:

trunk/ippMonitor

Files:

• Makefile.in (modified) (1 diff)
• def/diffProcessedSkyfile_Images.d (modified) (1 diff)
• def/magicProcessedMasks_Images.d (modified) (2 diffs)
• def/rawBurntoolState.d (added)
• raw/ipp.load.dat (modified) (1 diff)
• raw/ipp.php (modified) (2 diffs)
• scripts/generate (modified) (1 diff)

trunk/ippMonitor/Makefile.in

@@ -61 +61 @@
 $(DESTWWW)/show_and_delete_image.php \
 $(DESTWWW)/scatterPlot.php \
+$(DESTWWW)/rawBurntoolState.php \
 $(DESTWWW)/plotHistogram.php \
 $(DESTWWW)/columns_in_db.php \

trunk/ippMonitor/def/diffProcessedSkyfile_Images.d

@@ -11 +11 @@
 # IMAGE VAR basename filerule camera class_id
 IMAGE JPEG2 $diffSkyfile.path_base PPSUB.OUTPUT.JPEG2 GPC1 NONE
+
+# if no query restrictions are supplied, we want to limit the query or it is extremely long running:
+UNRESTRICTED AND diffRun.diff_id = 0
 
 # XXX need to get camera from lookup

trunk/ippMonitor/def/magicProcessedMasks_Images.d

@@ -11 +11 @@
 ARGS  ARG7 magicRun.magic_id=$magicRun.magic_id
 ARGS  ARG7 camera=GPC1
-ARGS  ARG7 basename=$magicRun.workdir/$magicRun.exp_id/$magicRun.exp_id.mgc.$magicRun.magic_id.verify/$magicRun.exp_id
+#ARGS  ARG7 basename=$magicRun.workdir/$magicRun.exp_id/$magicRun.exp_id.mgc.$magicRun.magic_id.verify/$magicRun.exp_id
+ARGS  ARG7 basename=$magicMask.path_base
 
 #        field                   size  format  name           show     link to         extras
@@ -25 +26 @@
 FIELD    magicMask.fault,        5,   %d,     Fault
 FIELD    magicRun.workdir,       5,   %s,     Label, none
+FIELD    magicMask.path_base,    5,   %s,     Label, none
 
 TAIL PHP insert_image ('MAGIC.ORIGINAL.PNG', 'width=49%');

trunk/ippMonitor/raw/ipp.load.dat

@@ -23 +23 @@
 menulink  | menuselect   | link    | New Imfile                   | newImfile.php                    
 menulink  | menuselect   | link    | Raw Imfile                   | rawImfile.php                    
+menutop   | menutop      | plain   |                         | 
+menulink  | menuselect   | link    | Burntool State               | rawBurntoolState.php                         

trunk/ippMonitor/raw/ipp.php

@@ -390 +390 @@
   if ($sortKey == "") {
     if ($_SERVER[REQUEST_METHOD] == 'GET') { 
-      $sortKey = $_GET['rsort']; 
+      $sortVal = $_GET['rsort']; 
     } else {
-      $sortKey = $_POST['rsort'];
+      $sortVal = $_POST['rsort'];
     }
     if ($sortVal != "") {
@@ -529 +529 @@
     $value = $_POST[$htmlkey];
   }
+  # a search restriction may include an SQL wild-card.  we have to mangle these so that the http 
+  # does not get converted to a special character
+  $value = preg_replace ('|%|', '%25', $value);
   if ($value != "") {
     if ($line) {

trunk/ippMonitor/scripts/generate

@@ -58 +58 @@
         if ($key eq "FIELD") {
             ($field, $width, $format, $name, $show, $link, $extras) = split (/,\s+/, $value, 7);
-            if (! $name) { die "table $ARGV[0] missing required elements\n"; }
+            if (! $name) { die "table $ARGV[0] missing required elements: $value\n"; }
             if ($field =~ m|\S+\s+as\s+\S+|) {
                 ($fieldreal) = $field =~ m|\S+\s+as\s+(\S+)|;