Changeset 36431 for trunk/ippTools

Timestamp:

Jan 8, 2014, 12:21:52 PM (13 years ago)

Author:

bills

Message:

order results of chiptool -pendingcleanuprun by Label.priority.

Location:

trunk/ippTools

Files:

• share/chiptool_pendingcleanuprun.sql (modified) (1 diff)
• src/chiptool.c (modified) (2 diffs)

trunk/ippTools/share/chiptool_pendingcleanuprun.sql

@@ -4 +4 @@
     rawExp.exp_tag,
     chipRun.state,
-    chipRun.workdir
+    chipRun.workdir,
+    chipRun.label,
+    IFNULL(Label.priority, 10000) AS priority
 FROM chipRun
 JOIN rawExp 
 USING (exp_id)
+LEFT JOIN Label ON chipRun.label = Label.label
 WHERE
     (chipRun.state = 'goto_cleaned' OR chipRun.state = 'goto_scrubbed' OR chipRun.state = 'goto_purged')

trunk/ippTools/src/chiptool.c

@@ -1255 +1255 @@
 
     psMetadata *where = psMetadataAlloc();
-    pxAddLabelSearchArgs (config, where, "-label", "label", "==");
+    pxAddLabelSearchArgs (config, where, "-label", "chipRun.label", "==");
 
     psString query = pxDataGet("chiptool_pendingcleanuprun.sql");
@@ -1269 +1269 @@
     }
     psFree(where);
+
+    psStringAppend(&query, "\nORDER BY priority DESC, chip_id");
 
     // treat limit == 0 as "no limit"