Changeset 23974

Timestamp:

Apr 24, 2009, 3:00:14 PM (17 years ago)

Author:

bills

Message:

properly select by label in magicdstool -todestreak

Location:

trunk/ippTools

Files:

• share/magicdstool_todestreak.sql (modified) (4 diffs)
• src/magicdstool.c (modified) (1 diff)
• src/magicdstoolConfig.c (modified) (1 diff)

trunk/ippTools/share/magicdstool_todestreak.sql

@@ -5 +5 @@
     magicRun.magic_id,
     magicRun.exp_id,
+    magicDSRun.label,
     camera,
     magicMask.uri as streaks_uri,
@@ -35 +36 @@
     magicDSRun.magic_id,
     chipRun.exp_id,
+    magicDSRun.label,
     camera,
     magicMask.uri as streaks_uri,
@@ -69 +71 @@
     magicRun.magic_id,
     magicRun.exp_id,
+    magicDSRun.label,
     camera,
     magicMask.uri as streaks_uri,
@@ -104 +107 @@
     magicRun.magic_id,
     magicRun.exp_id,
+    magicDSRun.label,
     rawExp.camera,
     magicMask.uri as streaks_uri,

trunk/ippTools/src/magicdstool.c

@@ -398 +398 @@
     PXOPT_COPY_S64(config->args, where, "-magic_ds_id", "magic_ds_id", "==");
     PXOPT_COPY_S64(config->args, where, "-magic_id", "magic_id", "==");
-    PXOPT_COPY_STR(config->args, where, "-label", "label", "==");
+    pxAddLabelSearchArgs (config, where, "-label", "label", "==");
 
     PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);

trunk/ippTools/src/magicdstoolConfig.c

@@ -88 +88 @@
     psMetadataAddS64(todestreakArgs, PS_LIST_TAIL, "-magic_ds_id", 0, "search by magic Destreak ID", 0);
     psMetadataAddS64(todestreakArgs, PS_LIST_TAIL, "-magic_id", 0, "search by magic ID", 0);
-    psMetadataAddStr(todestreakArgs, PS_LIST_TAIL, "-label", 0, "define label", NULL);
+    psMetadataAddStr(todestreakArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "define label", NULL);
     psMetadataAddU64(todestreakArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0);
     psMetadataAddBool(todestreakArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false);