Changeset 32167

Timestamp:

Aug 22, 2011, 12:30:44 PM (15 years ago)

Author:

bills

Message:

From trunk. Fix logic dealing with diffRuns with no associated magicDSRun

File:

• tags/ipp-20110622/ippTools/share/pubtool_definerun.sql (modified) (2 diffs, 1 prop)

tags/ipp-20110622/ippTools/share/pubtool_definerun.sql

@@ -1 @@
--- Get runs to publish
+-- Get runs to publish 
 SELECT DISTINCT
     client_id,
@@ -20 +20 @@
     JOIN chipRun USING(chip_id)
     JOIN rawExp USING(exp_id)
+    LEFT JOIN magicDSRun ON magicDSRun.stage = 'diff' AND magicDSRun.stage_id = diff_id
     WHERE publishClient.stage = 'diff'
         AND publishClient.active = 1
         AND diffRun.state IN ('full', 'cleaned', 'goto_cleaned')
-        AND (diffRun.magicked != 0 OR diffRun.diff_mode = 4 OR publishClient.magicked = 0)
+        AND ( diffRun.diff_mode = 4
+           OR (publishClient.magicked AND diffRun.magicked != 0)
+           OR (publishClient.magicked = 0 AND 
+                (diffRun.magicked = 0 OR (diffRun.magicked != 0 AND magic_ds_id IS NOT NULL))
+              )
+           )
     -- WHERE hook %s
     UNION