Changeset 14369

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

Files:

• share/detselect_search.sql (modified) (1 diff)
• share/detselect_select.sql (modified) (3 diffs)
• src/detselect.c (modified) (4 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'

trunk/ippTools/src/detselect.c

@@ -124 +124 @@
         }
     }
-    
+
     {
         bool status = false;
@@ -175 +175 @@
 
     if (config->where) {
-        psString whereClause = psDBGenerateWhereConditionSQL(config->where, "detRun");
+        psString whereClause = psDBGenerateWhereConditionSQL(config->where, NULL);
         psStringAppend(&query, " AND %s", whereClause);
         psFree(whereClause);
@@ -181 +181 @@
 
     {
-        psString whereClause = psDBGenerateWhereConditionSQL(where, "detRun");
+        psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
         psFree(where);
         if (whereClause) {
@@ -189 +189 @@
     }
 
-    // XXX this needs to be more controlled: we should specifically choose the 
-    // single detrend image which matches all criteria and has the latest 
+    // XXX this needs to be more controlled: we should specifically choose the
+    // single detrend image which matches all criteria and has the latest
     // insertion date
     psStringAppend(&query, " ORDER BY registered DESC LIMIT 1");