Changeset 28794 for branches/eam_branches/ipp-20100621/ippTools/share/magictool_toprocess_inputs.sql

Timestamp:

Jul 30, 2010, 9:31:50 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

File:

• branches/eam_branches/ipp-20100621/ippTools/share/magictool_toprocess_inputs.sql (modified) (3 diffs)

branches/eam_branches/ipp-20100621/ippTools/share/magictool_toprocess_inputs.sql

@@ -7 +7 @@
     -- note that the type stays a 64 bit int
     magicNodeResult.magic_id IS TRUE AS done,
-    magicNodeResult.fault IS TRUE AS bad
+    magicNodeResult.fault IS TRUE AS bad,
+    IFNULL(Label.priority, 10000) AS priority
 FROM magicRun
 JOIN magicTree USING(magic_id)
@@ -18 +19 @@
     ON diffRun.diff_id =  diffSkyfile.diff_id
 LEFT JOIN magicNodeResult USING(magic_id, node)
+LEFT JOIN Label ON magicRun.label = Label.label
 WHERE
     magicRun.state = 'new'
@@ -23 +25 @@
     AND magicNodeResult.node IS NULL
     AND diffRun.state = 'full'
+    AND (Label.active OR Label.active IS NULL)
 -- WHERE hook %s