Changeset 28031 for branches/czw_branch/20100427/ippTools

Timestamp:

May 19, 2010, 2:11:08 PM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/czw_branch/20100427

Files:

• . (modified) (1 prop)
• ippTools/share/chiptool_setimfiletoupdate.sql (modified) (2 diffs)
• ippTools/share/difftool_setskyfiletoupdate.sql (modified) (2 diffs)
• ippTools/share/warptool_setskyfiletoupdate.sql (modified) (2 diffs)

branches/czw_branch/20100427/ippTools/share/chiptool_setimfiletoupdate.sql

@@ -1 +1 @@
 UPDATE chipRun
     JOIN chipProcessedImfile USING(chip_id)
+    LEFT JOIN magicDSRun ON (stage_id = chip_id AND stage = 'chip')
+    LEFT JOIN magicDSFile ON (magicDSRun.magic_ds_id = magicDSFile.magic_ds_id
+                              AND component = class_id)
 SET chipRun.state = 'update', 
     chipProcessedImfile.data_state = 'update'
@@ -7 +10 @@
     AND (chipRun.state = 'cleaned' OR chipRun.state = 'update')
     AND (chipProcessedImfile.data_state = 'cleaned')
+    -- don't queue update if the associated magicDSFile exists
+    AND (chipRun.magicked = 0 
+      OR (magicDSRun.state = 'cleaned' OR magicDSRun.state = 'new')
+            AND magicDSFile.component IS NULL)

branches/czw_branch/20100427/ippTools/share/difftool_setskyfiletoupdate.sql

@@ -1 +1 @@
 UPDATE diffRun
     JOIN diffSkyfile USING(diff_id)
+    LEFT JOIN magicDSRun ON (stage_id = diff_id AND stage = 'diff')
+    LEFT JOIN magicDSFile ON (magicDSRun.magic_ds_id = magicDSFile.magic_ds_id
+                              AND component = skycell_id)
 SET diffRun.state = 'update', 
     diffSkyfile.data_state = 'update'
@@ -7 +10 @@
     AND (diffRun.state = 'cleaned' OR diffRun.state = 'update')
     AND (diffSkyfile.data_state = 'cleaned')
+    -- don't queue update if the associated magicDSFile still exists
+    AND (diffRun.magicked = 0 
+      OR (magicDSRun.state = 'cleaned' OR magicDSRun.state = 'new')
+            AND magicDSFile.component IS NULL)

branches/czw_branch/20100427/ippTools/share/warptool_setskyfiletoupdate.sql

@@ -1 +1 @@
 UPDATE warpRun
     JOIN warpSkyfile USING(warp_id)
+    LEFT JOIN magicDSRun ON (stage_id = warp_id AND stage = 'warp')
+    LEFT JOIN magicDSFile ON (magicDSRun.magic_ds_id = magicDSFile.magic_ds_id
+                              AND component = skycell_id)
 SET warpRun.state = 'update', 
     warpSkyfile.data_state = 'update'
@@ -7 +10 @@
     AND (warpRun.state = 'cleaned' OR warpRun.state = 'update')
     AND (warpSkyfile.data_state = 'cleaned')
+    AND (warpRun.magicked = 0
+      OR (magicDSRun.state = 'cleaned' OR magicDSRun.state = 'new')
+      AND magicDSFile.component IS NULL)