Index: trunk/ippTools/src/warptool.c
===================================================================
--- trunk/ippTools/src/warptool.c	(revision 12237)
+++ trunk/ippTools/src/warptool.c	(revision 12261)
@@ -284,16 +284,9 @@
 
     // find all rawImfiles matching the default query
-    psString query = psStringCopy(
-        "SELECT\n"
-        "   camProcessedExp.*\n"
-        " FROM warpRun\n"
-        " JOIN warpInputExp\n"
-        "   USING(warp_id)\n"
-        " JOIN camProcessedExp\n"
-        "   ON warpInputExp.cam_id = camProcessedExp.cam_id\n"
-        " WHERE\n"
-        "   warpRun.state = 'run'\n"
-        "   AND camProcessedExp.fault = 0\n"
-    );
+    psString query = pxDataGet("warptool_exp.sql");
+    if (!query) {
+        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+        return false;
+    }
 
     if (config->where) {
@@ -380,20 +373,10 @@
 
     // find all rawImfiles matching the default query
-    psString query = psStringCopy(
-        "SELECT\n"
-        "   rawImfile.*,\n"
-        "   warpInputExp.cam_id\n"
-        " FROM warpRun\n"
-        " JOIN warpInputExp\n"
-        "   USING(warp_id)\n"
-        " JOIN camProcessedExp\n"
-        "   ON warpInputExp.cam_id = camProcessedExp.cam_id"
-        " JOIN chipProcessedExp\n"
-        "   ON camProcessedExp.chip_id = chipProcessedExp.chip_id"
-        " JOIN rawImfile\n" // is there any reason not to refer back to rawimfiles?
-        "   ON chipProcessedExp.exp_tag = rawImfile.exp_tag\n"
-        " WHERE\n"
-        "   warpRun.state = 'run'\n"
-    );
+    psString query = pxDataGet("warptool_imfile.sql");
+    if (!query) {
+        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+        return false;
+    }
+
     if (config->where) {
         psString whereClause = psDBGenerateWhereConditionSQL(config->where, "warpInputExp");
@@ -667,19 +650,9 @@
 
     // find all rawImfiles matching the default query
-    psString query = psStringCopy(
-        "SELECT\n"
-        "   warpSkyCellMap.*,\n"
-        "   chipProcessedImfile.uri\n"
-        " FROM warpRun\n"
-        " JOIN warpSkyCellMap\n"
-        "   USING(warp_id)\n"
-        " JOIN camProcessedExp\n"
-        "   ON warpSkyCellMap.cam_id = camProcessedExp.cam_id"
-        " JOIN chipProcessedImfile\n"
-        "   ON camProcessedExp.chip_id = chipProcessedImfile.chip_id"
-        "   AND warpSkyCellMap.class_id = chipProcessedImfile.class_id\n"
-        " WHERE\n"
-        "   warpRun.state = 'run'\n"
-    );
+    psString query = pxDataGet("warptool_scmap.sql");
+    if (!query) {
+        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+        return false;
+    }
 
     if (config->where) {
@@ -766,28 +739,9 @@
 
     // find all rawImfiles matching the default query
-    psString query = psStringCopy(
-        "SELECT\n"
-        "   warpSkyCellMap.*,\n"
-        "   rawExp.camera,\n"
-        "   warpRun.workdir\n"
-        " FROM warpRun\n"
-        " JOIN warpSkyCellMap\n"
-        "   USING(warp_id)\n"
-        " JOIN camProcessedExp\n"
-        "   ON warpSkyCellMap.cam_id = camProcessedExp.cam_id"
-        " JOIN chipProcessedExp\n"
-        "   ON camProcessedExp.chip_id = chipProcessedExp.chip_id"
-        " JOIN rawExp\n"
-        "   ON chipProcessedExp.exp_tag = rawExp.exp_tag\n"
-        " LEFT JOIN warpSkyfile\n"
-        "   ON warpRun.warp_id = warpSkyfile.warp_id\n"
-        "   AND warpSkyCellMap.skycell_id = warpSkyfile.skycell_id\n"
-        "   AND warpSkyCellMap.tess_id = warpSkyfile.tess_id\n"
-        " WHERE\n"
-        "   warpRun.state = 'run'\n"
-        "   AND warpSkyfile.warp_id IS NULL\n"
-        "   AND warpSkyfile.skycell_id IS NULL\n"
-        "   AND warpSkyfile.tess_id IS NULL\n"
-    );
+    psString query = pxDataGet("warptool_towarped.sql");
+    if (!query) {
+        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+        return false;
+    }
 
     if (config->where) {
@@ -964,4 +918,6 @@
     PS_ASSERT_PTR_NON_NULL(config, false);
 
+    // XXX this SQL has not been broken out to into seperate files as the MYSQL
+    // < 5 & MYSQL 5 versions need to be kept in sync
 #if MYSQL5
     // XXX at MySQL 4.1.21 (probably all of 4.1.x) chokes and dies on this
@@ -1075,13 +1031,9 @@
 
     // find all rawImfiles matching the default query
-    psString query = psStringCopy(
-        "SELECT\n"
-        "   warpSkyfile.*\n"
-        " FROM warpRun\n"
-        " JOIN warpSkyfile\n"
-        "   USING(warp_id)\n"
-        " WHERE\n"
-        "   warpRun.state = 'run'\n"
-    );
+    psString query = pxDataGet("warptool_warped.sql");
+    if (!query) {
+        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+        return false;
+    }
 
     if (config->where) {