Changeset 10124

Timestamp:

Nov 21, 2006, 12:05:32 PM (20 years ago)

Author:

jhoblitt

Message:

rewrite toprocessedimfileMode() SQL to be more efficient & to also return rawDetrendExp.camera

File:

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

trunk/ippTools/src/dettool.c

@@ -1318 +1318 @@
     // class_is is not in detProccessedImfile
     psString query = psStringCopy(
-            "SELECT detInputExp.det_id, detRun.det_type, rawImfile.*"
-            " FROM rawImfile"
-            " LEFT JOIN detInputExp USING(exp_tag) "
-            " LEFT JOIN detRun ON detInputExp.det_id = detRun.det_id"
+            "SELECT"
+            "   detRun.det_id,"
+            "   detRun.det_type,"
+            "   rawImfile.*,"
+            "   rawDetrendExp.camera"
+            " FROM detRun"
+            " JOIN detInputExp"
+            "    USING(det_id, iteration)"
+            " JOIN rawDetrendExp"
+            "    ON detInputExp.exp_tag = rawDetrendExp.exp_tag"
+            " JOIN rawImfile"
+            "    ON detInputExp.exp_tag = rawImfile.exp_tag"
             " LEFT JOIN detProcessedImfile"
-                " ON detInputExp.det_id = detProcessedImfile.det_id"
-                " AND rawImfile.exp_tag = detProcessedImfile.exp_tag"
-                " AND rawImfile.class_id = detProcessedImfile.class_id"
+            "   ON detInputExp.det_id = detProcessedImfile.det_id"
+            "   AND rawImfile.exp_tag = detProcessedImfile.exp_tag"
+            "   AND rawImfile.class_id = detProcessedImfile.class_id"
             " WHERE"
-            " detRun.state = 'run'"
-            " AND detInputExp.det_id IS NOT NULL"
-            " AND detInputExp.exp_tag IS NOT NULL"
-            " AND detProcessedImfile.det_id IS NULL"
-            " AND detProcessedImfile.exp_tag IS NULL"
-            " AND detProcessedImfile.class_id IS NULL"
+            "   detRun.state = 'run'"
+            "   AND detProcessedImfile.det_id IS NULL"
+            "   AND detProcessedImfile.exp_tag IS NULL"
+            "   AND detProcessedImfile.class_id IS NULL"
         );