Changeset 14271 for trunk/ippTools/share

Timestamp:

Jul 17, 2007, 12:05:17 PM (19 years ago)

Author:

jhoblitt

Message:

rework dettool * detselect's handling for registered detrends

Location:

trunk/ippTools/share

Files:

• detselect_search.sql (modified) (1 diff)
• detselect_select.sql (modified) (1 diff)

trunk/ippTools/share/detselect_search.sql

@@ -1 +1 @@
 SELECT DISTINCT
-    detRunSummary.det_id,
-    detRunSummary.iteration,
-    detRun.filelevel
-FROM detRun
-JOIN detRunSummary
-    USING(det_id)
-WHERE
-   detRun.state = 'stop'
-   AND detRun.mode  = 'master'
-   AND detRunSummary.accept = 1
+    det_id,
+    iteration,
+    filelevel
+FROM
+    (SELECT DISTINCT
+        detRun.det_id,
+        detRun.iteration,
+        detRun.filelevel,
+        detRun.registered
+    FROM detRun
+    JOIN detRunSummary
+        USING(det_id)
+    WHERE
+       detRun.state = 'stop'
+       AND detRun.mode  = 'master'
+       AND detRunSummary.accept = 1
+    UNION
+    SELECT DISTINCT
+        detRun.det_id,
+        detRun.iteration,
+        detRun.filelevel,
+        detRun.registered
+    FROM detRun
+    WHERE
+       detRun.state = 'stop'
+       AND detRun.mode  = 'register'
+    ) as Foo

trunk/ippTools/share/detselect_select.sql

@@ -1 +1 @@
 SELECT DISTINCT
-    detNormalizedImfile.*
-FROM detNormalizedImfile
-JOIN detRun
-    USING(det_id)
-JOIN detRunSummary
-    ON detNormalizedImfile.det_id = detRunSummary.det_id
-    AND detNormalizedImfile.iteration = detRunSummary.iteration
-WHERE
-    detRun.state = 'stop'
-    AND detRun.mode  = 'master'
-    AND detRunSummary.accept = 1
+    *
+FROM
+    (SELECT DISTINCT
+        detNormalizedImfile.*
+    FROM detNormalizedImfile
+    JOIN detRun
+        USING(det_id)
+    JOIN detRunSummary
+        ON detNormalizedImfile.det_id = detRunSummary.det_id
+        AND detNormalizedImfile.iteration = detRunSummary.iteration
+    WHERE
+        detRun.state = 'stop'
+        AND detRun.mode  = 'master'
+        AND detRunSummary.accept = 1
+    UNION
+    SELECT DISTINCT
+        detRegisteredImfile.*
+    FROM detRegisteredImfile
+    JOIN detRun
+        USING(det_id)
+    WHERE
+        detRun.state = 'stop'
+        AND detRun.mode  = 'register'
+    ) as Foo