Changeset 23971

Timestamp:

Apr 24, 2009, 2:25:24 PM (17 years ago)

Author:

bills

Message:

changes to make -label work for -toprocess

Location:

trunk/ippTools/share

Files:

• magictool_toprocess_inputs.sql (modified) (3 diffs)
• magictool_toprocess_tree.sql (modified) (1 diff)

trunk/ippTools/share/magictool_toprocess_inputs.sql

@@ -1 @@
-SELECT
+SELECT * FROM
+(SELECT
     magicTree.*,
+    rawExp.exp_id,
     rawExp.camera,
-    rawExp.exp_id,
-    diffSkyfile.path_base,
+--    diffSkyfile.path_base,
     magicRun.workdir,
     -- 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,
+    magicNodeResult.fault IS TRUE as bad,
+    warpSkyfile.uri as template_uri
 FROM magicTree
 JOIN magicRun USING(magic_id)
@@ -14 +17 @@
     ON magicInputSkyfile.diff_id = diffSkyfile.diff_id
     AND magicInputSkyfile.node = diffSkyfile.skycell_id
+JOIN diffInputSkyfile 
+    ON diffSkyfile.diff_id = diffInputSkyfile.diff_id
+    AND diffSkyfile.skycell_id = diffInputSkyfile.skycell_id
+JOIN warpSkyfile
+    ON diffInputSkyfile.warp2 = warpSkyfile.warp_id
+    AND diffInputSkyfile.skycell_id = warpSkyfile.skycell_id
 JOIN rawExp USING(exp_id)
 LEFT JOIN magicNodeResult
@@ -22 +31 @@
     AND magicNodeResult.magic_id IS NULL
     AND magicNodeResult.node IS NULL
+    -- where hook 1 %s
+UNION
+SELECT
+    magicTree.*,
+    rawExp.exp_id,
+    rawExp.camera,
+--    diffSkyfile.path_base,
+    magicRun.workdir,
+    -- 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.fault IS TRUE as bad,
+    stackSumSkyfile.uri as template_uri
+FROM magicTree
+JOIN magicRun USING(magic_id)
+JOIN magicInputSkyfile USING(magic_id, node)
+JOIN diffSkyfile 
+    ON magicInputSkyfile.diff_id = diffSkyfile.diff_id
+    AND magicInputSkyfile.node = diffSkyfile.skycell_id
+JOIN diffInputSkyfile 
+    ON diffSkyfile.diff_id = diffInputSkyfile.diff_id
+    AND diffSkyfile.skycell_id = diffInputSkyfile.skycell_id
+JOIN stackSumSkyfile
+    ON diffInputSkyfile.stack2 = stackSumSkyfile.stack_id
+JOIN rawExp USING(exp_id)
+LEFT JOIN magicNodeResult
+    ON magicTree.magic_id = magicNodeResult.magic_id
+    AND magicTree.node = magicNodeResult.node
+WHERE
+    magicRun.state = 'new'
+    AND magicNodeResult.magic_id IS NULL
+    AND magicNodeResult.node IS NULL
+    -- where hook 2 %s
+) as foo

trunk/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,
+    'notused' as template_uri
 FROM magicTree
 JOIN magicRun USING(magic_id)