Changeset 24244 for branches/cnb_branches/cnb_branch_20090301/ippTools/share/difftool_todiffskyfile.sql

Timestamp:

May 26, 2009, 1:59:32 PM (17 years ago)

Author:

beaumont

Message:

merged with trunk

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

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

branches/cnb_branches/cnb_branch_20090301/ippTools/share

@@ -1 +1 @@
 Makefile.in
 Makefile
+pxadmin_create_mirror_tables.sql

@@ -1 +1 @@
 Makefile.in
 Makefile
+pxadmin_create_mirror_tables.sql

branches/cnb_branches/cnb_branch_20090301/ippTools/share/difftool_todiffskyfile.sql

@@ -9 +9 @@
     diffRun.tess_id,
     diffRun.label,
-    diffRun.state
+    diffRun.state,
+    diffRun.bothways
 FROM diffRun
 JOIN diffInputSkyfile USING(diff_id)
@@ -63 +64 @@
     AND diffSkyfile.diff_id IS NULL)
     OR (diffRun.state = 'update'
-    AND diffSkyfile.fault = 0)
+    AND diffSkyfile.fault = 0
+    AND diffSkyfile.quality = 0)
     )
 -- Ensure input warps are available
@@ -69 +71 @@
     OR (warpRun.state = 'full'
     AND warpSkyfile.fault = 0
-    AND warpSkyfile.ignored = 0))
+    AND warpSkyfile.quality = 0))
 -- Ensure input stacks are available
     AND (diffInputSkyfile.stack1 IS NULL
     OR (stackRun.state = 'full'
-    AND stackSumSkyfile.fault = 0))
+    AND stackSumSkyfile.fault = 0
+    AND stackSumSkyfile.quality = 0))
 -- Ensure template warps are available
     AND (diffInputSkyfile.warp2 IS NULL
     OR (warpTemplateRun.state = 'full'
     AND warpTemplateSkyfile.fault = 0
-    AND warpTemplateSkyfile.ignored = 0))
+    AND warpTemplateSkyfile.quality = 0))
 -- Ensure template stacks are available
     AND (diffInputSkyfile.stack2 IS NULL
     OR (stackTemplateRun.state = 'full'
-    AND stackTemplateSkyfile.fault = 0))
+    AND stackTemplateSkyfile.fault = 0
+    AND stackTemplateSkyfile.quality = 0))
 
 

@@ -1 +1 @@
 Makefile.in
 Makefile
+pxadmin_create_mirror_tables.sql