Changeset 9089 for trunk/ippTools/src/dettool.c

Timestamp:

Oct 2, 2006, 11:33:46 AM (20 years ago)

Author:

jhoblitt

Message:

fix -toprocessedexp to not return duplicate exp_tags

File:

• trunk/ippTools/src/dettool.c (modified) (3 diffs)

trunk/ippTools/src/dettool.c

@@ -1064 +1064 @@
     // det_id is not in detProcessedExp;
     // iteration is not in detProcessedExp;
-    // class_id is not in detProcessedExp;
 
     psString query = psStringCopy(
-        " SELECT"
+        " SELECT DISTINCT"
         "    detProcessedImfile.det_id,"
         "    detRun.iteration,"
@@ -1188 +1187 @@
         " JOIN rawDetrendExp"
         "    ON detInputExp.exp_tag = rawDetrendExp.exp_tag"
-        " JOIN detProcessedImfile"
+        " JOIN rawImfile"
+        "    ON detInputExp.exp_tag = rawImfile.exp_tag"
+        " LEFT JOIN detProcessedImfile"
         "    ON detInputExp.det_id = detProcessedImfile.det_id"
         "    AND detInputExp.exp_tag = detProcessedImfile.exp_tag"
+        "    AND detProcessedImfile.class_id = rawImfile.class_id"
         " LEFT JOIN detStackedImfile"
         "    ON detInputExp.det_id = detStackedImfile.det_id"
         "    AND detInputExp.iteration = detStackedImfile.iteration"
         "    AND detProcessedImfile.class_id = detStackedImfile.class_id"
-        " LEFT JOIN rawImfile"
-        "    ON detInputExp.exp_tag = rawImfile.exp_tag"
-        "    AND detProcessedImfile.class_id = rawImfile.class_id"
         " WHERE"
         "    detStackedImfile.det_id IS NULL"
@@ -1204 +1203 @@
         "    AND detInputExp.include = 1"
         " GROUP BY"
-        "    detProcessedImfile.class_id,"
         "    rawImfile.class_id"
         " HAVING"