Changeset 15272

Timestamp:

Oct 9, 2007, 3:56:40 PM (19 years ago)

Author:

jhoblitt

Message:

split magictool_toprocess.sql into two separate queries

Location:

trunk/ippTools/share

Files:

• Makefile.am (modified) (1 diff)
• magictool_toprocess.sql (modified) (1 diff)
• magictool_toprocess_inputs.sql (added)
• magictool_toprocess_tree.sql (added)

trunk/ippTools/share/Makefile.am

@@ -38 +38 @@
         difftool_todiffskyfile.sql \
         difftool_revertdiffskyfile.sql \
-        magictool_toprocess.sql \
+        magictool_toprocess_inputs.sql \
+        magictool_toprocess_tree.sql \
         pztool_find_completed_exp.sql \
         pztool_pendingimfile.sql \

trunk/ippTools/share/magictool_toprocess.sql

@@ -3 +3 @@
     -- convert magic_id into a boolean value (1 or 0)
     -- note that the type stays a 64 bit int
-    magicNodeResult.magic_id IS TRUE as done
+    magicNodeResult.magic_id IS TRUE as done,
+    diffSkyfile.uri
+FROM magicTree
+JOIN magicRun
+    USING(magic_id)
+JOIN magicInputSkyfile
+    USING(magic_id, node)
+LEFT JOIN diffSkyfile
+    using(diff_id)
+LEFT JOIN magicNodeResult
+    ON magicTree.magic_id = magicNodeResult.magic_id
+    AND magicTree.node = magicNodeResult.node
+WHERE
+    magicRun.state = 'run'
+UNION
+SELECT
+    magicTree.*,
+    -- convert magic_id into a boolean value (1 or 0)
+    -- note that the type stays a 64 bit int
+    magicNodeResult.magic_id IS TRUE as done,
+    magicNodeResult.uri
 FROM magicTree
 JOIN magicRun