Changeset 30586 for branches/czw_branch/20101203/ippTools/share/disttool_pending_warp.sql

Timestamp:

Feb 11, 2011, 4:29:48 PM (15 years ago)

Author:

watersc1

Message:

Trying to merge back into trunk.

Location:

branches/czw_branch/20101203

Files:

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

branches/czw_branch/20101203/ippTools/share/disttool_pending_warp.sql

@@ -15 +15 @@
     warpSkyfile.quality,
     distRun.no_magic,
-    warpSkyfile.magicked
+    warpSkyfile.magicked,
+    IFNULL(Label.priority, 10000) AS priority
 FROM distRun
 JOIN distTarget USING(target_id, stage, clean)
@@ -27 +28 @@
     ON distRun.dist_id = distComponent.dist_id 
     AND warpSkyfile.skycell_id = distComponent.component
+LEFT JOIN Label ON distRun.label = Label.label
 WHERE
     distRun.state = 'new'
@@ -33 +35 @@
     AND ((warpRun.magicked > 0) OR distRun.no_magic)
     AND (warpRun.state = 'full' OR (distRun.clean AND warpRun.state = 'cleaned'))
+    AND (Label.active OR Label.active IS NULL)