Changeset 27840 for branches/simtest_nebulous_branches/ippTools/share/magictool_definebyquery_select.sql

Timestamp:

May 3, 2010, 8:50:52 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simtest_nebulous_branches

Files:

• . (modified) (1 prop)
• ippTools/share/magictool_definebyquery_select.sql (modified) (4 diffs)

branches/simtest_nebulous_branches/ippTools/share/magictool_definebyquery_select.sql

@@ -1 +1 @@
 -- Get a list of exposures on which magic may be performed
-SELECT
-    exp_id,
+SELECT DISTINCT
+    chipRun.exp_id,
     MAX(diffWarps.diff_id) AS diff_id,
     -- The following trick pulls out the 'inverse' value for the maximum diff_id
@@ -15 +15 @@
     WHERE diffInputSkyfile.warp1 IS NOT NULL
         AND diffRun.exposure = 1
-    -- WHERE hook %s
+        AND diffRun.magicked = 0
+    -- diff WHERE hook %s
     UNION
     -- Backward diffs
@@ -27 +28 @@
         AND diffRun.exposure = 1
         AND diffRun.bothways = 1
-    -- WHERE hook %s
+        AND diffRun.magicked = 0
+    -- diff WHERE hook %s
     ) AS diffWarps
 JOIN warpRun USING(warp_id)
@@ -33 +35 @@
 JOIN camRun USING(cam_id)
 JOIN chipRun USING(chip_id)
-LEFT JOIN magicRun USING(exp_id)
+LEFT JOIN
+    (SELECT magic_id, exp_id, label
+        FROM magicRun 
+        -- rerun hook %s
+    ) AS oldMagicRun
+    ON oldMagicRun.exp_id = chipRun.exp_id
 -- WHERE hook %s
-GROUP BY exp_id
+GROUP BY chipRun.exp_id