Changeset 29485

Timestamp:

Oct 19, 2010, 3:12:12 PM (16 years ago)

Author:

Serge CHASTEL

Message:

Script slightly modified so now both UNRESTRICTED and GROUP are supported

Location:

trunk/ippMonitor

Files:

• def/autocode.php (modified) (2 diffs)
• scripts/generate (modified) (2 diffs)

trunk/ippMonitor/def/autocode.php

@@ -25 +25 @@
 $restricted = 0;
 
-// define restrictiosn to the queries
+// define restrictions to the queries
 // ** TABLE RESTRICTIONS **
 
@@ -33 +33 @@
   }
 }
+
+// Add GROUP BY statements if any
+// ** GROUP RESTRICTIONS **
 
 // get the result table count

trunk/ippMonitor/scripts/generate

@@ -227 +227 @@
         }
 
+        # fill in GROUP BY
+        if ($line =~ m|// \*\* GROUP RESTRICTIONS \*\*|) {
+            &write_group_by;
+        }
+
         # fill in table restricts
         if ($line =~ m|// \*\* BUTTON RESTRICTIONS \*\*|) {
@@ -331 +336 @@
         print FILE "\$WHERE = check_restrict ('$value', \$WHERE, 'max', 1.0);\n";
     }
+    # print FILE "\$WHERE = check_ordering ('$GROUPS', \$WHERE);\n";
+}
+
+# Generate GROUP BY statement if any 
+sub write_group_by {
     print FILE "\$WHERE = check_ordering ('$GROUPS', \$WHERE);\n";
 }