Changeset 27220

Timestamp:

Mar 6, 2010, 5:46:39 PM (16 years ago)

Author:

bills

Message:

add -data_group as a selector for magicdstool -updaterun
add *Run.data_group to the query so that it will be set properly

Location:

trunk/ippTools

Files:

• share/magicdstool_definebyquery_camera.sql (modified) (1 diff)
• share/magicdstool_definebyquery_chip.sql (modified) (1 diff)
• share/magicdstool_definebyquery_diff.sql (modified) (1 diff)
• share/magicdstool_definebyquery_raw.sql (modified) (1 diff)
• share/magicdstool_definebyquery_warp.sql (modified) (1 diff)
• share/magicdstool_definecopy_chip.sql (modified) (1 diff)
• share/magicdstool_definecopy_warp.sql (modified) (1 diff)
• src/magicdstool.c (modified) (1 diff)
• src/magicdstoolConfig.c (modified) (1 diff)

trunk/ippTools/share/magicdstool_definebyquery_camera.sql

@@ -4 +4 @@
     'camera' AS stage,
     camRun.cam_id AS stage_id,
+    camRun.data_group,
     camRun.cam_id,
     magicRun.label,

trunk/ippTools/share/magicdstool_definebyquery_chip.sql

@@ -4 +4 @@
     'chip' AS stage,
     chip_id AS stage_id,
+    chipRun.data_group,
     camRun.cam_id,
     magicRun.label,

trunk/ippTools/share/magicdstool_definebyquery_diff.sql

@@ -6 +6 @@
     'diff' AS stage,
     diff_id AS stage_id,
+    diffRun.data_group,
     0 AS cam_id,
     magicRun.label,

trunk/ippTools/share/magicdstool_definebyquery_raw.sql

@@ -4 +4 @@
     'raw' AS stage,
     exp_id AS stage_id,
+    chipRun.data_group,
     0 AS cam_id,
     magicRun.label,

trunk/ippTools/share/magicdstool_definebyquery_warp.sql

@@ -4 +4 @@
     'warp' AS stage,
     warp_id AS stage_id,
+    warpRun.data_group,
     0 AS cam_id,
     magicRun.label,

trunk/ippTools/share/magicdstool_definecopy_chip.sql

@@ -4 +4 @@
     'chip' AS stage,
     chipRun.chip_id AS stage_id,
+    chipRun.data_group,
     camRun.cam_id,
     chipRun.label,

trunk/ippTools/share/magicdstool_definecopy_warp.sql

@@ -4 +4 @@
     'warp' AS stage,
     warpRun.warp_id AS stage_id,
+    warpRun.data_group,
     camRun.cam_id,
     warpRun.label,

trunk/ippTools/src/magicdstool.c

@@ -574 +574 @@
     PXOPT_COPY_STR(config->args, where, "-stage", "stage", "==");
     PXOPT_COPY_STR(config->args, where, "-state", "state", "==");
+    PXOPT_COPY_STR(config->args, where, "-data_group", "data_group", "LIKE");
 
     if (psListLength(where->list) < 2) {

trunk/ippTools/src/magicdstoolConfig.c

@@ -103 +103 @@
     psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-stage_id", 0, "define stage_id", 0);
     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-label",     0, "define label", NULL);
+    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-data_group",     0, "data_group (LIKE) comparision", NULL);
     psMetadataAddBool(updaterunArgs, PS_LIST_TAIL, "-noreplace", 0, "only update runs with replace not set", false);