Changeset 25027 for branches/pap/ippTools/share/magicdstool_completed_runs.sql

Timestamp:

Aug 7, 2009, 4:08:25 PM (17 years ago)

Author:

Paul Price

Message:

Merging trunk (r25026) to get up-to-date on old branch.

Location:

branches/pap

Files:

• . (modified) (1 prop)
• ippTools/share/magicdstool_completed_runs.sql (modified) (4 diffs)

branches/pap/ippTools/share/magicdstool_completed_runs.sql

@@ -16 +16 @@
     GROUP BY
         magicDSRun.magic_ds_id,
-        rawImfile.exp_id
+        stage_id
     HAVING
         COUNT(rawImfile.class_id) = COUNT(magicDSFile.component)
@@ -32 +32 @@
         magicDSRun.state = 'new'
         AND magicDSRun.stage = 'chip'
+        AND chipProcessedImfile.quality = 0
     GROUP BY
         magic_ds_id,
-        chip_id
+        stage_id
     HAVING
         COUNT(chipProcessedImfile.class_id) = COUNT(magicDSFile.component)
         AND SUM(magicDSFile.fault) = 0
+UNION
+-- camera stage
+SELECT
+    magicDSRun.magic_ds_id
+    FROM magicDSRun
+    JOIN camProcessedExp ON stage_id = camProcessedExp.cam_id
+    LEFT JOIN magicDSFile
+        ON magicDSFile.magic_ds_id = magicDSRun.magic_ds_id
+        AND magicDSFile.component IS NOT NULL
+    WHERE
+        magicDSRun.state = 'new'
+        AND magicDSRun.stage = 'camera'
+        AND camProcessedExp.quality = 0
+        AND magicDSFile.fault = 0
+    GROUP BY
+        magic_ds_id,
+        stage_id
 UNION
 -- warp stage
@@ -54 +72 @@
     GROUP BY
         magicDSRun.magic_ds_id,
-        warp_id
+        stage_id
     HAVING
         COUNT(warpSkyfile.skycell_id) = COUNT(magicDSFile.component)
@@ -66 +84 @@
     JOIN magicInputSkyfile USING(magic_id)
     JOIN diffSkyfile
-        ON magicInputSkyfile.diff_id = diffSkyfile.diff_id
+        ON magicRun.diff_id = diffSkyfile.diff_id
         AND magicInputSkyfile.node = diffSkyfile.skycell_id
     LEFT JOIN magicDSFile