Changeset 9708 for trunk/ippTools/src/detselect.c

Timestamp:

Oct 20, 2006, 6:01:12 PM (20 years ago)

Author:

jhoblitt

Message:

change -search to match against the new fields in detRun

File:

• trunk/ippTools/src/detselect.c (modified) (2 diffs)

trunk/ippTools/src/detselect.c

@@ -69 +69 @@
     PS_ASSERT_PTR_NON_NULL(config, false);
 
-# define JOSH_SQL 0
-# if (JOSH_SQL)
     psString query = psStringCopy(
-        "SELECT"
-        "   detNormalizedImfile.det_id,"
-        "   detNormalizedImfile.iteration"
+        "SELECT DISTINCT"
+        "   detRunSummary.det_id,"
+        "   detRunSummary.iteration"
         " FROM detRun"
-        " JOIN detInputExp"
-        // can't join on the iteration here as we want the results from all
-        // iterations
-        "   ON detRun.det_id = detInputExp.det_id"
-        " JOIN detNormalizedImfile"
-        "   ON detInputExp.det_id = detNormalizedImfile.det_id"
-        "   AND detInputExp.iteration = detNormalizedImfile.iteration"
-        " JOIN rawDetrendExp"
-        "   ON detInputExp.exp_tag = rawDetrendExp.exp_tag"
         " JOIN detRunSummary"
-        "   ON detInputExp.det_id = detRunSummary.det_id"
-        "   AND detInputExp.iteration = detRunSummary.iteration"
+        "   USING(det_id)"
         " WHERE"
         "   detRun.state = 'stop'"
         "   AND detRunSummary.accept = 1" 
     );
-# else
+# if 0
     psString query = psStringCopy(
         "SELECT DISTINCT"
@@ -122 +110 @@
 
     if (config->where) {
-        psString whereClause = psDBGenerateWhereConditionSQL(config->where, "rawDetrendExp");
+        psString whereClause = psDBGenerateWhereConditionSQL(config->where, "detRun");
         psStringAppend(&query, " AND %s", whereClause);
         psFree(whereClause);