Index: trunk/ippTools/share/detselect_search.sql
===================================================================
--- trunk/ippTools/share/detselect_search.sql	(revision 14358)
+++ trunk/ippTools/share/detselect_search.sql	(revision 14369)
@@ -5,24 +5,18 @@
 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'
Index: trunk/ippTools/share/detselect_select.sql
===================================================================
--- trunk/ippTools/share/detselect_select.sql	(revision 14358)
+++ trunk/ippTools/share/detselect_select.sql	(revision 14369)
@@ -3,4 +3,5 @@
 FROM
     (SELECT DISTINCT
+	detRun.state,
         detNormalizedImfile.*
     FROM detNormalizedImfile
@@ -11,9 +12,9 @@
         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,5 +22,6 @@
         USING(det_id)
     WHERE
-        detRun.state = 'stop'
-        AND detRun.mode  = 'register'
+        detRun.mode  = 'register'
     ) as Foo
+WHERE
+    state = 'stop'
Index: trunk/ippTools/src/detselect.c
===================================================================
--- trunk/ippTools/src/detselect.c	(revision 14358)
+++ trunk/ippTools/src/detselect.c	(revision 14369)
@@ -124,5 +124,5 @@
         }
     }
-    
+
     {
         bool status = false;
@@ -175,5 +175,5 @@
 
     if (config->where) {
-        psString whereClause = psDBGenerateWhereConditionSQL(config->where, "detRun");
+        psString whereClause = psDBGenerateWhereConditionSQL(config->where, NULL);
         psStringAppend(&query, " AND %s", whereClause);
         psFree(whereClause);
@@ -181,5 +181,5 @@
 
     {
-        psString whereClause = psDBGenerateWhereConditionSQL(where, "detRun");
+        psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
         psFree(where);
         if (whereClause) {
@@ -189,6 +189,6 @@
     }
 
-    // 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");