Changeset 30497

Timestamp:

Feb 7, 2011, 1:10:32 PM (15 years ago)

Author:

bills

Message:

fixed problem reported in ticket 1455 magictool -reverttree only uses last label

Location:

trunk/ippTools/src

Files:

• magictool.c (modified) (1 diff)
• magictoolConfig.c (modified) (1 diff)

trunk/ippTools/src/magictool.c

@@ -627 +627 @@
     PXOPT_COPY_S64(config->args, where, "-magic_id", "magic_id", "==");
     PXOPT_COPY_S16(config->args, where, "-fault", "fault", "==");
-    PXOPT_COPY_STR(config->args, where, "-label", "label", "==");
+    pxAddLabelSearchArgs (config, where, "-label", "magicRun.label", "==");
 
     psString query = psStringCopy("UPDATE magicRun SET fault = 0 WHERE state = 'new' AND fault != 0");

trunk/ippTools/src/magictoolConfig.c

@@ -114 +114 @@
     psMetadataAddS64(reverttreeArgs, PS_LIST_TAIL, "-magic_id", 0, "search by magictool ID", 0);
     psMetadataAddS16(reverttreeArgs, PS_LIST_TAIL, "-fault", 0, "search by fault code", 0);
-    psMetadataAddStr(reverttreeArgs, PS_LIST_TAIL, "-label", 0, "search by label", NULL);
+    psMetadataAddStr(reverttreeArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "search by label", NULL);
 
     // -inputs