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

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

@@ -15 +15 @@
     camProcessedExp.quality,
     distRun.no_magic,
-    chipRun.magicked
+    chipRun.magicked,
+    IFNULL(Label.priority, 10000) AS priority
 FROM distRun
 JOIN distTarget USING(target_id, stage, clean)
@@ -21 +22 @@
 JOIN camProcessedExp USING(cam_id)
 JOIN chipRun USING(chip_id)
--- JOIN chipProcessedImfile USING(exp_id, chip_id)
 JOIN rawExp using(exp_id)
 LEFT JOIN distComponent 
     ON distRun.dist_id = distComponent.dist_id 
---    AND chipProcessedImfile.class_id = distComponent.component
+LEFT JOIN Label
+    ON distRun.label = Label.label
 WHERE
     distRun.state = 'new'
     AND distRun.stage = 'camera'
     AND distComponent.dist_id IS NULL
-    AND (((clean OR (chipRun.magicked > 0)) AND (camRun.magicked > 0)) OR distRun.no_magic)
+    AND (((clean OR (chipRun.magicked != 0)) AND (camRun.magicked > 0)) OR distRun.no_magic)
     AND (camRun.state = 'full' OR (distRun.clean AND camRun.state = 'cleaned'))
+    AND (Label.active OR Label.active IS NULL)