Changeset 29171 for trunk/ippTools/share/warptool_towarped.sql

Timestamp:

Sep 17, 2010, 2:39:25 PM (16 years ago)

Author:

bills

Message:

fix problem in update

File:

• trunk/ippTools/share/warptool_towarped.sql (modified) (1 diff)

trunk/ippTools/share/warptool_towarped.sql

@@ -97 +97 @@
         AND warpSkyfile.fault = 0
         AND camRun.state = 'full'
-        AND chipProcessedImfile.data_state = 'full'
-        -- if warpSkyfile was magicked previously require inputs to be magicked
-        -- this blocks processing until all the chip inputs have been destreaked
-        AND (warpSkyfile.magicked = 0 OR chipProcessedImfile.magicked >= 0)
         AND (Label.active OR Label.active IS NULL)
         -- where hook 2 %s
     GROUP BY warp_id, skycell_id
-    HAVING COUNT(warpSkyCellMap.class_id) = COUNT(chipProcessedImfile.class_id)
+    -- if warpSkyfile was magicked previously require inputs to be magicked
+    -- this blocks processing until all the chip inputs have been destreaked
+    HAVING COUNT(warpSkyCellMap.class_id) = SUM(IF(chipProcessedImfile.data_state ='full' and (chipRun.magicked = 0 OR chipProcessedImfile.magicked > 0), 1, 0))
     -- limit hook 2 %s
     )