Changeset 30498
- Timestamp:
- Feb 7, 2011, 1:15:23 PM (15 years ago)
- Location:
- tags/ipp-20101215/ippTools/src
- Files:
-
- 2 edited
-
magictool.c (modified) (1 diff, 1 prop)
-
magictoolConfig.c (modified) (1 diff, 1 prop)
Legend:
- Unmodified
- Added
- Removed
-
tags/ipp-20101215/ippTools/src/magictool.c
- Property svn:mergeinfo changed
/trunk/ippTools/src/magictool.c merged: 30497
r30420 r30498 627 627 PXOPT_COPY_S64(config->args, where, "-magic_id", "magic_id", "=="); 628 628 PXOPT_COPY_S16(config->args, where, "-fault", "fault", "=="); 629 PXOPT_COPY_STR(config->args, where, "-label", "label", "==");629 pxAddLabelSearchArgs (config, where, "-label", "magicRun.label", "=="); 630 630 631 631 psString query = psStringCopy("UPDATE magicRun SET fault = 0 WHERE state = 'new' AND fault != 0"); - Property svn:mergeinfo changed
-
tags/ipp-20101215/ippTools/src/magictoolConfig.c
- Property svn:mergeinfo changed
/trunk/ippTools/src/magictoolConfig.c merged: 30497
r30417 r30498 114 114 psMetadataAddS64(reverttreeArgs, PS_LIST_TAIL, "-magic_id", 0, "search by magictool ID", 0); 115 115 psMetadataAddS16(reverttreeArgs, PS_LIST_TAIL, "-fault", 0, "search by fault code", 0); 116 psMetadataAddStr(reverttreeArgs, PS_LIST_TAIL, "-label", 0, "search by label", NULL);116 psMetadataAddStr(reverttreeArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "search by label", NULL); 117 117 118 118 // -inputs - Property svn:mergeinfo changed
Note:
See TracChangeset
for help on using the changeset viewer.
