Changeset 27389

Timestamp:

Mar 22, 2010, 12:31:12 PM (16 years ago)

Author:

Paul Price

Message:

Allow multiple labels for warptool -updaterun.

Location:

trunk/ippTools/src

Files:

• warptool.c (modified) (1 diff)
• warptoolConfig.c (modified) (1 diff)

trunk/ippTools/src/warptool.c

@@ -383 +383 @@
     PXOPT_COPY_S64(config->args, where, "-warp_id",   "warpRun.warp_id",   "==");
     PXOPT_COPY_STR(config->args, where, "-reduction", "warpRun.reduction", "==");
-    PXOPT_COPY_STR(config->args, where, "-label",     "warpRun.label",     "==");
     PXOPT_COPY_STR(config->args, where, "-state",     "warpRun.state",     "==");
-    PXOPT_COPY_STR(config->args, where, "-data_group","warpRun.data_group",     "==");
-    PXOPT_COPY_STR(config->args, where, "-dist_group","warpRun.dist_group",     "==");
+    PXOPT_COPY_STR(config->args, where, "-data_group","warpRun.data_group","==");
+    PXOPT_COPY_STR(config->args, where, "-dist_group","warpRun.dist_group","==");
+    pxAddLabelSearchArgs(config,  where, "-label",    "warpRun.label",     "==");
 
     PXOPT_COPY_TIME(config->args, where, "-registered_begin", "warpRun.registered",  ">=");

trunk/ippTools/src/warptoolConfig.c

@@ -133 +133 @@
     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-reduction", 0,  "search by warpRun reduction class", NULL);
     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-state", 0,      "search by warpRun state", NULL);
-    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-label", 0,      "search by warpRun label", NULL);
+    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "search by warpRun label", NULL);
     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-data_group", 0, "search by warpRun data_group", NULL);
     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-dist_group", 0, "search by warpRun dist_group", NULL);