Changeset 8530

Timestamp:

Aug 23, 2006, 2:27:19 PM (20 years ago)

Author:

jhoblitt

Message:

change -processed to handle detInputExp.include & iterations

File:

• trunk/ippTools/src/dettool.c (modified) (1 diff)

trunk/ippTools/src/dettool.c

@@ -1125 +1125 @@
         // detProcessedImfile.exp_id is not in detStackedImfile
         // detProcessedImfile.class_id is not in detStackedImfile
+        // and detInputExp.include is 1
         query = psStringCopy(
-            " SELECT"
-            "   detRun.det_type,"
-            "   detProcessedImfile.*"
-            " FROM detProcessedImfile"
-            " JOIN detRun"
-            "   ON detProcessedImfile.det_id = detRun.position"
-            " LEFT JOIN detStackedImfile"
-            "   ON detRun.position = detStackedImfile.det_id"
-            "   AND detRun.iteration = detStackedImfile.iteration"
-            "   AND detProcessedImfile.class_id = detStackedImfile.class_id"
-            " WHERE"
-            "   detStackedImfile.det_id IS NULL"
-            "   AND detStackedImfile.iteration IS NULL"
-            "   AND detStackedImfile.class_id IS NULL"
+            " SELECT * FROM"
+            "   (SELECT"
+            "       detRun.iteration,"
+            "       detRun.det_type,"
+            "       detProcessedImfile.*"
+            "   FROM detProcessedImfile"
+            "   JOIN detRun"
+            "       ON detProcessedImfile.det_id = detRun.position"
+            "   JOIN detInputExp"
+            "       ON detRun.position = detInputExp.det_id"
+            "       AND detRun.iteration = detInputExp.iteration"
+            "       AND detProcessedImfile.exp_id = detInputExp.exp_id"
+            "   LEFT JOIN detStackedImfile"
+            "       ON detRun.position = detStackedImfile.det_id"
+            "       AND detRun.iteration = detStackedImfile.iteration"
+            "       AND detProcessedImfile.class_id = detStackedImfile.class_id"
+            "   WHERE"
+            "       detStackedImfile.det_id IS NULL"
+            "       AND detStackedImfile.iteration IS NULL"
+            "       AND detStackedImfile.class_id IS NULL"
+            "       AND detInputExp.include = 1"
+            "   ) as detProcessedImfile"
         ); 
     }
 
-    // XXX search criterian are disabled
-#if 1
     if (config->where) {
-        psString whereClause = psDBGenerateWhereConditionSQL(config->where, "detProcessedImfile");
-        psStringAppend(&query, " AND %s", whereClause);
+        psString whereClause = psDBGenerateWhereSQL(config->where, NULL);
+        psStringAppend(&query, " %s", whereClause);
         psFree(whereClause);
     }
-#endif
 
     if (!p_psDBRunQuery(config->dbh, query)) {