Changeset 14369 for trunk/ippTools/share

Timestamp:

Jul 24, 2007, 3:17:29 PM (19 years ago)

Author:

Paul Price

Message:

Fixing SQL for detselect --- tried it after registering detrends, and it didn't like it. Seems to work now.

Location:

trunk/ippTools/share

Files:

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

trunk/ippTools/share/detselect_search.sql

@@ -5 +5 @@
 FROM
     (SELECT DISTINCT
-        detRun.det_id,
-        detRun.iteration,
-        detRun.filelevel,
-        detRun.registered
+        detRun.*
     FROM detRun
     JOIN detRunSummary
         USING(det_id)
     WHERE
-       detRun.state = 'stop'
-       AND detRun.mode  = 'master'
+       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'
+       detRun.mode  = 'register'
     ) as Foo
+WHERE
+    state = 'stop'

trunk/ippTools/share/detselect_select.sql

@@ -3 +3 @@
 FROM
     (SELECT DISTINCT
+        detRun.state,
         detNormalizedImfile.*
     FROM detNormalizedImfile
@@ -11 +12 @@
         AND detNormalizedImfile.iteration = detRunSummary.iteration
     WHERE
-        detRun.state = 'stop'
-        AND detRun.mode  = 'master'
+        detRun.mode  = 'master'
         AND detRunSummary.accept = 1
     UNION
     SELECT DISTINCT
+        detRun.state,
         detRegisteredImfile.*
     FROM detRegisteredImfile
@@ -21 +22 @@
         USING(det_id)
     WHERE
-        detRun.state = 'stop'
-        AND detRun.mode  = 'register'
+        detRun.mode  = 'register'
     ) as Foo
+WHERE
+    state = 'stop'