Changeset 40534

Timestamp:

Sep 26, 2018, 12:19:35 PM (8 years ago)

Author:

eugene

Message:

add -limit and -random to -definebyquery

Location:

trunk/ippTools/src

Files:

• chiptool.c (modified) (3 diffs)
• chiptoolConfig.c (modified) (1 diff)

trunk/ippTools/src/chiptool.c

@@ -279 +279 @@
     PXOPT_LOOKUP_STR(note, config->args, "-set_note", false, false);
 
+    PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
+
     // default
     PXOPT_LOOKUP_BOOL(unique, config->args, "-unique", false);
@@ -284 +286 @@
     PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
     
+    PXOPT_LOOKUP_BOOL(randomOrder, config->args, "-random", false);
+
     // find the exp_id of all the exposures that we want to queue up.
     psString query = pxDataGet("chiptool_find_rawexp.sql");
@@ -304 +308 @@
     }
     
+    // treat limit == 0 as "no limit"
+    if (randomOrder) {
+        psStringAppend(&query, " %s", "ORDER BY RAND()");
+    }
+
+    // treat limit == 0 as "no limit"
+    if (limit) {
+        psString limitString = psDBGenerateLimitSQL(limit);
+        psStringAppend(&query, " %s", limitString);
+        psFree(limitString);
+    }
+
     if (!p_psDBRunQueryF(config->dbh, query, labelHook ? labelHook : "")) {
         psError(PS_ERR_UNKNOWN, false, "database error");

trunk/ippTools/src/chiptoolConfig.c

@@ -64 +64 @@
     psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-pretend",  0,            "do not actually modify the database", false);
     psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
+    psMetadataAddU64(definebyqueryArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
+    psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-random",  0,            "randomly sort the output", false);
 
     // -definecopy