Changeset 8330 for trunk/ippTools/src

Timestamp:

Aug 14, 2006, 2:02:23 PM (20 years ago)

Author:

jhoblitt

Message:

correct SQL syntax for -raw

File:

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

trunk/ippTools/src/dettool.c

@@ -748 +748 @@
     PS_ASSERT_PTR_NON_NULL(config, false);
 
+    // select det_id, det_type & rawImfile *
+    // get det_id from detInputExp.det_id
+    // get det_type from detRun.position
+    // det_id is not in detProccessedImfile
+    // exp_id is not in detProccessedImfile
+    // class_is is not in detProccessedImfile
     psString query = psStringCopy(
             "SELECT detInputExp.det_id, detRun.det_type, rawImfile.*"
-            " FROM rawImfile JOIN detInputExp USING(exp_id) "
-            " JOIN detRun ON detInputExp.det_id = detRun.position"); 
+            " FROM rawImfile"
+            " LEFT JOIN detInputExp USING(exp_id) "
+            " LEFT JOIN detRun ON detInputExp.det_id = detRun.position"
+            " LEFT JOIN detProcessedImfile"
+                " ON detInputExp.det_id = detProcessedImfile.det_id"
+                " AND rawImfile.exp_id = detProcessedImfile.exp_id"
+                " AND rawImfile.class_id = detProcessedImfile.class_id"
+            " WHERE detProcessedImfile.det_id IS NULL AND"
+            " detProcessedImfile.exp_id IS NULL AND"
+            " detProcessedImfile.class_id IS NULL"
+        ); 
 
     // XXX search criterian are disabled