Changeset 26862

Timestamp:

Feb 10, 2010, 4:00:56 PM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/eam_branches/20091201/ippMonitor

Files:

• def/autocode.php (modified) (1 diff)
• def/magicProcessedMasks.d (modified) (1 diff)
• def/warpStageSkyfileInputs.d (modified) (1 diff)
• raw/ipp.php (modified) (1 diff)
• scripts/generate (modified) (2 diffs)

branches/eam_branches/20091201/ippMonitor/def/autocode.php

@@ -23 +23 @@
 echo "<form action=\"$FILE\" method=\"POST\">\n";
 
+$restricted = 0;
+
 // define restrictiosn to the queries
 // ** TABLE RESTRICTIONS **
+
+if ($restricted == 0) {
+  if ("$UNRESTRICTED" != "none") {
+    $WHERE = "$WHERE $UNRESTRICTED";
+  }
+}
 
 // get the result table count

branches/eam_branches/20091201/ippMonitor/def/magicProcessedMasks.d

@@ -13 +13 @@
 FIELD    magicRun.inverse,       5,   %s,     Inverse
 FIELD    magicRun.state,         5,   %s,     State
-FIELD    magicMask.streaks,      5,   %d,     Fault
+FIELD    magicMask.streaks,      5,   %d,     Streaks
 FIELD    magicMask.fault,        5,   %s,     Fault

branches/eam_branches/20091201/ippMonitor/def/warpStageSkyfileInputs.d

@@ -11 +11 @@
 WHERE chipProcessedImfile.chip_id = chipRun.chip_id
 WHERE chipProcessedImfile.class_id = warpSkyCellMap.class_id
+
+# if no query restrictions are supplied, we want to limit the query or it is extremely long running:
+UNRESTRICTED AND warpRun.warp_id = 0
 
 ARGS  ARG1  rawImfile.exp_id=$rawExp.exp_id

branches/eam_branches/20091201/ippMonitor/raw/ipp.php

@@ -430 +430 @@
   }
   if ($value == "") { return $where; }
+
+  global $restricted;
+  $restricted = 1;
+
   if ($where) { 
     $where = $where . " AND"; 

branches/eam_branches/20091201/ippMonitor/scripts/generate

@@ -28 +28 @@
     &init_key ("STYLE");
     &init_key ("MODE");
+    &init_key ("UNRESTRICTED");
     &init_key ("TABLE");
     &init_key ("TITLE");
@@ -121 +122 @@
     &check_key ("STYLE", "ipp.css");
     &check_key ("MODE", "basic");
+    &check_key ("UNRESTRICTED", "none");
     &check_key ("TABLE", "");
     &check_key ("TITLE", "");