Changeset 29515 for branches/eam_branches/ipp-20100823/ippTools/share/difftool_todiffskyfile.sql

Timestamp:

Oct 21, 2010, 2:45:13 PM (16 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

• branches/eam_branches/ipp-20100823/ippTools/share/difftool_todiffskyfile.sql (modified) (4 diffs)

branches/eam_branches/ipp-20100823/ippTools/share/difftool_todiffskyfile.sql

@@ -13 +13 @@
     diffRun.bothways,
     diffRun.diff_mode,
-    diffSkyfile.path_base
+    diffSkyfile.path_base,
+    IFNULL(priority, 10000) AS priority
 FROM diffRun
 JOIN diffInputSkyfile USING(diff_id)
@@ -62 +63 @@
     ON diffInputSkyfile.diff_id = diffSkyfile.diff_id
     AND diffInputSkyfile.skycell_id = diffSkyfile.skycell_id
+LEFT JOIN Label ON Label.label = diffRun.label
 WHERE
 -- Ready to be processed
@@ -70 +72 @@
     AND diffSkyfile.data_state = 'update')
     )
+    AND (Label.active OR Label.active IS NULL)
 -- Ensure input warps are available
     AND (diffInputSkyfile.warp1 IS NULL
@@ -93 +96 @@
     AND stackTemplateSkyfile.quality = 0))
 
-
-