Changeset 27840 for branches/simtest_nebulous_branches/ippTools/share/difftool_todiffskyfile.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/difftool_todiffskyfile.sql (modified) (3 diffs)

branches/simtest_nebulous_branches/ippTools/share/difftool_todiffskyfile.sql

@@ -10 +10 @@
     diffRun.label,
     diffRun.state,
-    diffRun.bothways
+    diffRun.reduction,
+    diffRun.bothways,
+    diffRun.diff_mode
 FROM diffRun
 JOIN diffInputSkyfile USING(diff_id)
@@ -65 +67 @@
     OR (diffRun.state = 'update'
     AND diffSkyfile.fault = 0
-    AND diffSkyfile.quality = 0)
+    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
@@ -79 +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