Changeset 27517 for branches/eam_branches/20100225/ippTools/share/difftool_todiffskyfile.sql

Timestamp:

Mar 29, 2010, 3:55:49 PM (16 years ago)

Author:

eugene

Message:

update merges from trunk

Location:

branches/eam_branches/20100225

Files:

• . (modified) (1 prop)
• ippTools/share/difftool_todiffskyfile.sql (modified) (2 diffs)

branches/eam_branches/20100225/ippTools/share/difftool_todiffskyfile.sql

@@ -67 +67 @@
     OR (diffRun.state = 'update'
     AND diffSkyfile.fault = 0
-    AND diffSkyfile.data_state = 'cleaned')
+    AND diffSkyfile.data_state = 'update')
     )
 -- Ensure input warps are available
     AND (diffInputSkyfile.warp1 IS NULL
-    OR (warpRun.state = 'full'
+    OR (warpSkyfile.data_state = 'full'
     AND warpSkyfile.fault = 0
+    AND warpSkyfile.magicked >= 0
     AND warpSkyfile.quality = 0))
 -- Ensure input stacks are available
@@ -81 +82 @@
 -- Ensure template warps are available
     AND (diffInputSkyfile.warp2 IS NULL
-    OR (warpTemplateRun.state = 'full'
+    OR (warpTemplateSkyfile.data_state = 'full'
     AND warpTemplateSkyfile.fault = 0
+    AND warpSkyfile.magicked >= 0
     AND warpTemplateSkyfile.quality = 0))
 -- Ensure template stacks are available