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

Timestamp:

Nov 28, 2006, 11:02:41 AM (20 years ago)

Author:

jhoblitt

Message:

fix -residdetrun to work with verify mode

File:

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

trunk/ippTools/src/dettool.c

@@ -4282 +4282 @@
 
     psString query = psStringCopy(
-        "SELECT DISTINCT"
-        "   det_id,"
-        "   iteration,"
-        "   det_type,"
-        "   camera"
-        " FROM"
-        "   (SELECT DISTINCT"
-        "       detRun.det_id AS det_id,"
-        "       detRun.iteration,"
-        "       detRun.det_type,"
-        "       detInputExp.exp_tag,"
-        "       rawDetrendExp.camera"
-        "   FROM detRun"
-        "       LEFT JOIN detInputExp"
-        "       ON detRun.det_id = detInputExp.det_id"
-        "       AND detRun.iteration = detInputExp.iteration"
-        "   LEFT JOIN rawDetrendExp"
-        "       ON detInputExp.exp_tag = rawDetrendExp.exp_tag"
-        "   LEFT JOIN detResidExp"
-        "       ON detRun.det_id = detResidExp.det_id"
-        "       AND detRun.iteration = detResidExp.iteration"
-        "       AND detInputExp.exp_tag = detResidExp.exp_tag"
-        "   WHERE"
-        "       detRun.state = 'run'"
-        "   AND detRun.mode = 'master'"
-        "   GROUP BY"
-        "       detRun.det_id,"
-        "       detRun.iteration"
-        "   HAVING"
-        "       COUNT(detResidExp.exp_tag) = COUNT(detInputExp.exp_tag)"
-        " ) AS residdetrun"
+        "SELECT DISTINCT\n"
+        "   det_id,\n"
+        "   iteration,\n"
+        "   det_type,\n"
+        "   mode,\n"
+        "   camera\n"
+        " FROM\n"
+        "   (SELECT DISTINCT\n"
+        "       detRun.det_id,\n"
+        "       detRun.iteration,\n"
+        "       detRun.det_type,\n"
+        "       detRun.mode,\n"
+        "       detInputExp.exp_tag,\n"
+        "       rawDetrendExp.camera\n"
+        "   FROM detRun\n"
+        "   JOIN detInputExp\n"
+        "       USING(det_id, iteration)\n"
+        "   JOIN rawDetrendExp\n"
+        "       ON detInputExp.exp_tag = rawDetrendExp.exp_tag\n"
+        "   LEFT JOIN detResidExp\n"
+        "       ON detRun.det_id = detResidExp.det_id\n"
+        "       AND detRun.iteration = detResidExp.iteration\n"
+        "       AND detInputExp.exp_tag = detResidExp.exp_tag\n"
+        "   WHERE\n"
+        "       detRun.state = 'run'\n"
+        "   GROUP BY\n"
+        "       detRun.det_id,\n"
+        "       detRun.iteration\n"
+        "   HAVING\n"
+        "       COUNT(detResidExp.exp_tag) = COUNT(detInputExp.exp_tag)\n"
+        " ) AS residdetrun\n"
         );