Changeset 24140

Timestamp:

May 11, 2009, 5:34:32 PM (17 years ago)

Author:

eugene

Message:

add label test to flatcorr pendingprocess; fix code on addprocess

Location:

trunk/ippTools/src

Files:

• flatcorr.c (modified) (2 diffs)
• flatcorrConfig.c (modified) (2 diffs)

trunk/ippTools/src/flatcorr.c

@@ -535 +535 @@
     PXOPT_LOOKUP_BOOL(limit,   config->args, "-limit",   false);
 
+    psMetadata *where = psMetadataAlloc();
+    pxAddLabelSearchArgs (config, where, "-label", "label", "==");
+
     psString query = pxDataGet("flatcorr_pendingprocess.sql");
     if (!query) {
@@ -540 +543 @@
         return false;
     }
+
+    if (where && psListLength(where->list)) {
+        psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
+        psStringAppend(&query, " AND %s", whereClause);
+        psFree(whereClause);
+    }
+    psFree(where);
 
     // treat limit == 0 as "no limit"

trunk/ippTools/src/flatcorrConfig.c

@@ -101 +101 @@
     psMetadataAddU64 (pendingprocessArgs, PS_LIST_TAIL, "-limit",  0, "limit result set to N items", 0);
     psMetadataAddBool(pendingprocessArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false);
+    psMetadataAddStr(pendingprocessArgs,  PS_LIST_TAIL, "-label",  PS_META_DUPLICATE_OK, "search by label", NULL);
 
     // -addprocess (XXX need to add fault and stats)
@@ -106 +107 @@
     psMetadataAddS64 (addprocessArgs, PS_LIST_TAIL, "-corr_id",  0, "add complete run for specified corr_id (required)", 0);
     psMetadataAddStr (addprocessArgs, PS_LIST_TAIL, "-hostname", 0, "set hostname", NULL);
-    psMetadataAddS16 (addprocessArgs, PS_LIST_TAIL, "-fault",     0, "set fault code", 0);
+    psMetadataAddS16 (addprocessArgs, PS_LIST_TAIL, "-code",     0, "set fault code", 0);
 
     // -updaterun