Index: trunk/ippTools/share/Makefile.am
===================================================================
--- trunk/ippTools/share/Makefile.am	(revision 18523)
+++ trunk/ippTools/share/Makefile.am	(revision 18524)
@@ -70,4 +70,5 @@
 	magictool_toprocess_tree.sql \
 	magictool_toskyfilemask.sql \
+	magictool_node.sql \
 	pxadmin_create_tables.sql \
 	pxadmin_drop_tables.sql \
Index: trunk/ippTools/share/magictool_node.sql
===================================================================
--- trunk/ippTools/share/magictool_node.sql	(revision 18524)
+++ trunk/ippTools/share/magictool_node.sql	(revision 18524)
@@ -0,0 +1,29 @@
+SELECT *
+FROM (
+-- Single skycells
+SELECT
+    magicInputSkyfile.node,
+    magicRun.state,
+    diffSkyfile.uri,
+    diffSkyfile.fault
+FROM magicInputSkyfile
+JOIN diffSkyfile
+    using(diff_id)
+JOIN magicRun
+    USING(magic_id)
+UNION
+-- Merged skycells
+SELECT
+    magicTree.node,
+    magicRun.state,
+    magicNodeResult.uri,
+    magicNodeResult.fault
+FROM magicTree
+JOIN magicRun
+    USING(magic_id)
+JOIN magicNodeResult
+    ON magicTree.magic_id = magicNodeResult.magic_id
+    AND magicTree.dep = magicNodeResult.node
+) as Foo
+WHERE
+    fault = 0
Index: trunk/ippTools/share/magictool_toprocess_inputs.sql
===================================================================
--- trunk/ippTools/share/magictool_toprocess_inputs.sql	(revision 18523)
+++ trunk/ippTools/share/magictool_toprocess_inputs.sql	(revision 18524)
@@ -3,6 +3,5 @@
     -- 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,
-    diffSkyfile.uri
+    magicNodeResult.magic_id IS TRUE as done
 FROM magicTree
 JOIN magicRun
Index: trunk/ippTools/share/magictool_toprocess_tree.sql
===================================================================
--- trunk/ippTools/share/magictool_toprocess_tree.sql	(revision 18523)
+++ trunk/ippTools/share/magictool_toprocess_tree.sql	(revision 18524)
@@ -3,6 +3,5 @@
     -- 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
+    magicNodeResult.magic_id IS TRUE as done
 FROM magicTree
 JOIN magicRun
