Changeset 26956

Timestamp:

Feb 15, 2010, 3:49:50 PM (16 years ago)

Author:

eugene

Message:

update pubtool -definerun to accept multiple labels

Location:

trunk/ippTools

Files:

• share/pubtool_definerun.sql (modified) (2 diffs)
• src/pubtool.c (modified) (2 diffs)
• src/pubtoolConfig.c (modified) (1 diff)

trunk/ippTools/share/pubtool_definerun.sql

@@ -2 +2 @@
 SELECT
     client_id,
-    stage_id
+    stage_id,
+    src_label
 FROM (
     -- Get diffs to publish
     SELECT
         client_id,
-        diff_id AS stage_id
+        diff_id AS stage_id,
+        label AS src_label
     FROM publishClient
     JOIN diffRun
@@ -18 +20 @@
     SELECT
         client_id,
-        cam_id AS stage_id
+        cam_id AS stage_id,
+        label AS src_label
     FROM publishClient
     JOIN camRun

trunk/ippTools/src/pubtool.c

@@ -156 +156 @@
     // optional
     PXOPT_COPY_S64(config->args, where, "-client_id", "client_id", "==");
-    PXOPT_COPY_STR(config->args, where, "-label", "label", "==");
-
-    PXOPT_LOOKUP_STR(label, config->args, "-label", false, false);
+    pxAddLabelSearchArgs (config, where, "-label", "label", "=="); // define using newExp label
 
     psString query = pxDataGet("pubtool_definerun.sql"); // Query to run
@@ -211 +209 @@
         psS64 client = psMetadataLookupS64(NULL, row, "client_id"); // Client identifier
         psS64 stage = psMetadataLookupS64(NULL, row, "stage_id");   // Stage identifier
+        char *label = psMetadataLookupStr(NULL, row, "src_label");   // label from correct source
 
         if (!publishRunInsert(config->dbh, 0, client, stage, label, "new")) {

trunk/ippTools/src/pubtoolConfig.c

@@ -62 +62 @@
     psMetadata *definerunArgs = psMetadataAlloc();
     psMetadataAddS64(definerunArgs, PS_LIST_TAIL, "-client_id", 0, "search by client_id", 0);
-    psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-label", 0, "set and search by label", NULL);
+    psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "set and search by label", NULL);
 
     // -pending