Changeset 26456

Timestamp:

Dec 17, 2009, 9:58:17 AM (16 years ago)

Author:

eugene

Message:

add ability to set default limits for pages

Location:

trunk/ippMonitor

Files:

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

trunk/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

trunk/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

trunk/ippMonitor/raw/ipp.php

@@ -17 +17 @@
     echo "Username: <input type=\"text\" name=\"username\"><br>\n";
   }
-  echo 'Password: <input type="text" name="password"><br>', "\n";
+  echo 'Password: <input type="password" name="password"><br>', "\n";
   echo '<input type="submit" name="login" value="login">', "\n";
   echo '</form>', "\n\n";
@@ -430 +430 @@
   }
   if ($value == "") { return $where; }
+
+  global $restricted;
+  $restricted = 1;
+
   if ($where) { 
     $where = $where . " AND"; 

trunk/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", "");