Changeset 23783

Timestamp:

Apr 9, 2009, 3:20:44 PM (17 years ago)

Author:

bills

Message:

fix problems in definebyquery for camera stage

Location:

trunk/ippTools

Files:

• share/disttool_definebyquery_camera.sql (modified) (2 diffs)
• src/disttool.c (modified) (8 diffs)

trunk/ippTools/share/disttool_definebyquery_camera.sql

@@ -1 +1 @@
 SELECT
-    'cam' as stage,
+    'camera' as stage,
     camRun.cam_id as stage_id,
     rawExp.exp_name as run_tag,
@@ -16 +16 @@
     AND rcInterest.state = 'enabled'
     AND distRun.dist_id IS NULL      -- no existing distRun 
-    AND ((!distTarget.clean  AND camRun.state = 'full') OR (distTarget.clean AND camRun.state = 'cleaned'))
+    AND ((camRun.state = 'full') OR (distTarget.clean AND camRun.state = 'cleaned'))

trunk/ippTools/src/disttool.c

@@ -157 +157 @@
 
     psString query = NULL;
-    psString runType = NULL;
+    psString magicRunType = NULL;
     psString runJoinStr = NULL;
     if (!strcmp(stage, "raw")) {
-        runType = "rawExp";
+        magicRunType = "rawExp";
         runJoinStr = "rawExp.exp_id";
         query = pxDataGet("disttool_definebyquery_raw.sql");
@@ -169 +169 @@
         }
     } else if (!strcmp(stage, "chip")) {
-        runType = "chipRun";
+        magicRunType = "chipRun";
         runJoinStr = "chipRun.chip_id";
         query = pxDataGet("disttool_definebyquery_chip.sql");
@@ -182 +182 @@
         }
     } else if (!strcmp(stage, "camera")) {
-        runType = "camRun";
+        magicRunType = "chipRun";    // This is used below to set the magicked business
         query = pxDataGet("disttool_definebyquery_camera.sql");
         if (!query) {
@@ -194 +194 @@
         }
     } else if (!strcmp(stage, "fake")) {
-        runType = "fakeRun";
+        magicRunType = "fakeRun";
         query = pxDataGet("disttool_definebyquery_fake.sql");
         if (!query) {
@@ -208 +208 @@
         no_magic = true;
     } else if (!strcmp(stage, "warp")) {
-        runType = "warpRun";
+        magicRunType = "warpRun";
         runJoinStr = "warpRun.warp_id";
         query = pxDataGet("disttool_definebyquery_warp.sql");
@@ -222 +222 @@
 
     } else if (!strcmp(stage, "diff")) {
-        runType = "diffRun";
+        magicRunType = "diffRun";
         runJoinStr = "diffRun.diff_id";
         query = pxDataGet("disttool_definebyquery_diff.sql");
@@ -236 +236 @@
 
     } else if (!strcmp(stage, "stack")) {
-        runType = "stackRun";
+        magicRunType = "stackRun";
         query = pxDataGet("disttool_definebyquery_stack.sql");
         if (!query) {
@@ -265 +265 @@
 
     if (!no_magic) {
-        psStringAppend(&query, " AND (distTarget.clean OR %s.magicked)", runType);
+        psStringAppend(&query, " AND (distTarget.clean OR %s.magicked)", magicRunType);
 
         // is selecting by magic_ds_id really interesting?