Changeset 30586 for branches/czw_branch/20101203/ippTools/share/disttool_pending_fake.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_fake.sql (modified) (2 diffs)

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

@@ -15 +15 @@
     0 as quality,
     distRun.no_magic,
-    0 as magicked
+    0 as magicked,
+    IFNULL(Label.priority, 10000) AS priority
 FROM distRun
 JOIN distTarget USING(target_id, stage, clean)
@@ -26 +27 @@
     ON distRun.dist_id = distComponent.dist_id 
     AND fakeProcessedImfile.class_id = distComponent.component
+LEFT JOIN Label ON distRun.label = Label.label
 WHERE
     distRun.state = 'new'
     AND distRun.stage = 'fake'
     AND distComponent.dist_id IS NULL
+    AND (Label.active OR Label.active IS NULL)