Changeset 30446 for branches/eam_branches/ipp-20101205/ippTools/share/disttool_pending_sky.sql

Timestamp:

Jan 31, 2011, 2:51:48 PM (15 years ago)

Author:

eugene

Message:

merging changes from trunk

File:

• branches/eam_branches/ipp-20101205/ippTools/share/disttool_pending_sky.sql (modified) (3 diffs)

branches/eam_branches/ipp-20101205/ippTools/share/disttool_pending_sky.sql

@@ -15 +15 @@
     staticskyResult.quality,
     1 AS no_magic,
-    0 AS magicked
+    0 AS magicked,
+    IFNULL(Label.priority, 10000) AS priority
 FROM distRun
 JOIN distTarget USING(target_id, stage, clean)
@@ -43 +44 @@
     ON distRun.dist_id = distComponent.dist_id 
     AND stackRun.skycell_id = distComponent.component
+LEFT JOIN Label ON distRun.label = Label.label
 WHERE
     distRun.state = 'new'
@@ -49 +51 @@
     AND (staticskyRun.state = 'full' OR (distRun.clean AND staticskyRun.state = 'cleaned'))
     AND (staticskyResult.fault = 0 AND staticskyResult.quality = 0)
+    AND (Label.active OR Label.active IS NULL)