Changeset 11233

Timestamp:

Jan 22, 2007, 3:18:56 PM (19 years ago)

Author:

jhoblitt

Message:

fix -tostacked SQL, the fault handling broke the left join between rawImfile table and detProcessedImfile

File:

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

trunk/ippTools/src/dettool.c

@@ -2420 +2420 @@
 
     psString query = psStringCopy(
-        " SELECT"
-        "    detProcessedImfile.det_id,"
-        "    detRun.iteration,"
-        "    detRun.det_type,"
-        "    detRun.workdir,"
-        "    detProcessedImfile.class_id,"
-        "    rawExp.camera"
-        " FROM detRun"
-        " JOIN detInputExp"
-        "    ON detRun.det_id = detInputExp.det_id"
-        "    AND detRun.iteration = detInputExp.iteration"
-        " JOIN rawExp"
-        "    ON detInputExp.exp_tag = rawExp.exp_tag"
-        " 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"
-        " WHERE"
-        "   detRun.state = 'run'"
-        "   AND detRun.mode = 'master'"
-        "   AND detProcessedImfile.fault = 0"
-        "   AND detStackedImfile.det_id IS NULL"
-        "   AND detStackedImfile.iteration IS NULL"
-        "   AND detStackedImfile.class_id IS NULL"
-        "   AND detInputExp.include = 1"
-        " GROUP BY"
-        "    rawImfile.class_id,"
-        "    detRun.det_id"
-        " HAVING"
-        "    COUNT(detProcessedImfile.class_id) = COUNT(rawImfile.class_id)"
+        " SELECT\n"
+        "    detProcessedImfile.det_id,\n"
+        "    detRun.iteration,\n"
+        "    detRun.det_type,\n"
+        "    detRun.workdir,\n"
+        "    detProcessedImfile.class_id,\n"
+        "    rawExp.camera\n"
+        " FROM detRun\n"
+        " JOIN detInputExp\n"
+        "    ON detRun.det_id = detInputExp.det_id\n"
+        "    AND detRun.iteration = detInputExp.iteration\n"
+        " JOIN rawExp\n"
+        "    ON detInputExp.exp_tag = rawExp.exp_tag\n"
+        " JOIN rawImfile\n"
+        "    ON detInputExp.exp_tag = rawImfile.exp_tag\n"
+        " LEFT JOIN detProcessedImfile\n"
+        "    ON detInputExp.det_id = detProcessedImfile.det_id\n"
+        "    AND detInputExp.exp_tag = detProcessedImfile.exp_tag\n"
+        "    AND rawImfile.class_id = detProcessedImfile.class_id\n"
+        " LEFT JOIN detStackedImfile\n"
+        "    ON detInputExp.det_id = detStackedImfile.det_id\n"
+        "    AND detInputExp.iteration = detStackedImfile.iteration\n"
+        "    AND rawImfile.class_id = detStackedImfile.class_id\n"
+        " WHERE\n"
+        "   detRun.state = 'run'\n"
+        "   AND detRun.mode = 'master'\n"
+        "   AND (detProcessedImfile.fault = 0 or detProcessedImfile.fault IS NULL)\n"
+        "   AND detStackedImfile.det_id IS NULL\n"
+        "   AND detStackedImfile.iteration IS NULL\n"
+        "   AND detStackedImfile.class_id IS NULL\n"
+        "   AND detInputExp.include = 1\n"
+        " GROUP BY\n"
+        "    rawImfile.class_id,\n"
+        "    detRun.det_id\n"
+        " HAVING\n"
+        "    COUNT(detProcessedImfile.class_id) = COUNT(rawImfile.class_id)\n"
         );