Changeset 28769

Timestamp:

Jul 29, 2010, 12:06:06 PM (16 years ago)

Author:

bills

Message:

from trunk order data to be processed by priority

Location:

tags/ipp-20100701/ippTools

Files:

• share/magictool_definebyquery_select.sql (modified) (1 prop)
• share/magictool_toprocess_inputs.sql (modified) (3 diffs)
• share/magictool_toprocess_runs.sql (modified) (2 diffs)
• share/magictool_toprocess_tree.sql (modified) (1 diff)
• share/magictool_totree.sql (modified) (2 diffs)
• src/magictool.c (modified) (2 diffs, 1 prop)

tags/ipp-20100701/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

tags/ipp-20100701/ippTools/share/magictool_toprocess_runs.sql

@@ -1 +1 @@
 SELECT DISTINCT
-    magic_id
+    magic_id,
+    IFNULL(priority, 10000) AS priority
 FROM magicTree
 JOIN magicRun USING(magic_id)
 LEFT JOIN magicNodeResult USING(magic_id, node)
+LEFT JOIN Label ON magicRun.label = Label.label
 WHERE
     magicRun.state = 'new'
@@ -9 +11 @@
 -- WHERE hook %s
 ORDER BY
-    magicRun.magic_id
+    priority DESC, magicRun.magic_id

tags/ipp-20100701/ippTools/share/magictool_toprocess_tree.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 magicTree
 JOIN magicRun USING(magic_id)
 JOIN rawExp USING(exp_id)
 LEFT JOIN magicNodeResult USING(magic_id, node)
+LEFT JOIN Label ON magicRun.label = Label.label
 WHERE
     magicRun.state = 'new'
 -- WHERE hook %s
 ORDER BY
-    magicRun.magic_id
+    priority, magicRun.magic_id

tags/ipp-20100701/ippTools/share/magictool_totree.sql

@@ -6 +6 @@
     ra,
     decl,
-    diffRun.tess_id
+    diffRun.tess_id,
+    IFNULL(priority, 10000) AS priority
 FROM magicRun
 JOIN diffRun USING(diff_id)
@@ -12 +13 @@
 LEFT JOIN magicTree
     USING(magic_id)
+LEFT JOIN Label ON magicRun.label = Label.label
 WHERE
     magicRun.state = 'new'

tags/ipp-20100701/ippTools/src/magictool.c

@@ -522 +522 @@
     psFree(where);
 
+    psStringAppend(&query, "\nORDER BY priority DESC, magic_id");
+
     // treat limit == 0 as "no limit"
     if (limit) {
@@ -831 +833 @@
     psFree(where);
 
+    psStringAppend(&query, "\nORDER BY priority DESC, magic_id");
+
     // treat limit == 0 as "no limit"
     if (limit) {