Changeset 29136 for trunk/ippTools/share/magicdstool_completed_runs.sql

Timestamp:

Sep 9, 2010, 1:22:02 PM (16 years ago)

Author:

bills

Message:

in magicdstool -advancerun move the transactoin inside the loop so that if one
run has a problem it doesn't rollback other runs that worked.
Get magicked status of the run. If it is already set don't try and set it again.

File:

• trunk/ippTools/share/magicdstool_completed_runs.sql (modified) (6 diffs)

trunk/ippTools/share/magicdstool_completed_runs.sql

@@ -1 +1 @@
 SELECT DISTINCT
     magic_ds_id,
+    magicked,
     re_place,
     label
@@ -7 +8 @@
 -- raw stage
 SELECT
-    magicDSRun.*
+    magicDSRun.*,
+    rawExp.magicked
     FROM magicDSRun
     JOIN rawImfile ON stage_id = rawImfile.exp_id
+    JOIN rawExp using(exp_id)
     LEFT JOIN magicDSFile
         ON magicDSRun.magic_ds_id = magicDSFile.magic_ds_id
@@ -25 +28 @@
 -- chip stage
 SELECT
-    magicDSRun.*
+    magicDSRun.*,
+    chipRun.magicked
     FROM magicDSRun
-    JOIN chipProcessedImfile ON stage_id = chip_id
+    JOIN chipRun ON stage_id = chip_id
+    JOIN chipProcessedImfile USING(chip_id)
     LEFT JOIN magicDSFile
         ON magicDSFile.magic_ds_id = magicDSRun.magic_ds_id
@@ -44 +49 @@
 -- camera stage
 SELECT
-    magicDSRun.*
+    magicDSRun.*,
+    camRun.magicked
     FROM magicDSRun
-    JOIN camProcessedExp ON stage_id = camProcessedExp.cam_id
+    JOIN camRun ON stage_id = camRun.cam_id
+    JOIN camProcessedExp ON camRun.cam_id = camProcessedExp.cam_id
     LEFT JOIN magicDSFile
         ON magicDSFile.magic_ds_id = magicDSRun.magic_ds_id
@@ -61 +68 @@
 -- warp stage
 SELECT
-    magicDSRun.*
+    magicDSRun.*,
+    warpRun.magicked
     FROM magicDSRun
-    JOIN warpSkyfile on stage_id = warp_id
+    JOIN warpRun on stage_id = warp_id
+    JOIN warpSkyfile USING(warp_id)
     LEFT JOIN magicDSFile
         ON magicDSRun.magic_ds_id = magicDSFile.magic_ds_id
@@ -81 +90 @@
 -- diff stage
 SELECT DISTINCT
-    magicDSRun.*
+    magicDSRun.*,
+    diffRun.magicked
     FROM magicDSRun
     JOIN magicRun USING (magic_id)
     JOIN magicInputSkyfile USING(magic_id)
+    JOIN diffRun
+        ON magicRun.diff_id = diffRun.diff_id
     JOIN diffSkyfile
-        ON magicRun.diff_id = diffSkyfile.diff_id
+        ON diffRun.diff_id = diffSkyfile.diff_id
         AND magicInputSkyfile.node = diffSkyfile.skycell_id
     LEFT JOIN magicDSFile