Changeset 12237 for trunk/ippTools/src/warptool.c

Timestamp:

Mar 5, 2007, 12:37:24 PM (19 years ago)

Author:

jhoblitt

Message:

add camPendingExp.workdir
fix warptool -tooverlap SQL to handle camProcessedExp.workdir

File:

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

trunk/ippTools/src/warptool.c

@@ -479 +479 @@
 
     // find all rawImfiles matching the default query
-    psString query = psStringCopy(
-        "SELECT\n"
-        "   warpRun.warp_id,\n"
-        "   camProcessedExp.*,\n"
-        "   rawExp.camera,\n"
-        "   warpRun.workdir\n"
-        " FROM warpRun\n"
-        " JOIN warpInputExp\n"
-        "   USING(warp_id)\n"
-        " JOIN camProcessedExp\n"
-        "   ON warpInputExp.cam_id = camProcessedExp.cam_id\n"
-        " JOIN chipProcessedExp\n"
-        "   ON camProcessedExp.chip_id = chipProcessedExp.chip_id"
-        " JOIN rawExp\n"
-        "   ON chipProcessedExp.exp_tag = rawExp.exp_tag\n"
-        " LEFT JOIN warpSkyCellMap\n"
-        "   ON warpInputExp.warp_id = warpSkyCellMap.warp_id\n"
-        "   AND warpInputExp.cam_id = warpSkyCellMap.cam_id\n"
-        " WHERE\n"
-        "   warpRun.state = 'run'\n"
-        "   AND camProcessedExp.fault = 0\n"
-        "   AND warpSkyCellMap.warp_id IS NULL\n"
-        "   AND warpSkyCellMap.cam_id IS NULL\n"
-    );
+    psString query = pxDataGet("warptool_tooverlap.sql");
+    if (!query) {
+        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+        return false;
+    }
 
     if (config->where) {