Changeset 34014 for trunk/ippMonitor/def/autocode.php

Timestamp:

Jun 14, 2012, 11:31:25 AM (14 years ago)

Author:

Serge CHASTEL

Message:

Added the RESTRICTED_COUNT keyword so that we can restrict even on count when it takes too much time querying (e.g. rawBurntoolState)

File:

• trunk/ippMonitor/def/autocode.php (modified) (2 diffs)

trunk/ippMonitor/def/autocode.php

@@ -29 +29 @@
 
 // Note: the restriction is now moved AFTER the count query
+// unless the RESTRICT_COUNT keyword is used
+if ($restricted == 0) {
+  if ("$RESTRICT_COUNT" != "none") {
+    $WHERE = "$WHERE $RESTRICT_COUNT";
+  }
+}
 
 // Add GROUP BY statements if any
@@ -55 +61 @@
 // Restrict the query if it is necessary
 if ($restricted == 0) {
-  if ("$UNRESTRICTED" != "none") {
+  if ( ("$UNRESTRICTED" != "none") && ("$RESTRICT_COUNT" == "none") ) {
     $WHERE = "$WHERE $UNRESTRICTED";
   }