Index: trunk/ippTools/src/warptool.c
===================================================================
--- trunk/ippTools/src/warptool.c	(revision 26676)
+++ trunk/ippTools/src/warptool.c	(revision 26981)
@@ -104,5 +104,5 @@
         MODECASE(WARPTOOL_MODE_TOCLEANEDSKYFILE,   tocleanedskyfileMode);
         MODECASE(WARPTOOL_MODE_TOPURGEDSKYFILE,    topurgedskyfileMode);
-	MODECASE(WARPTOOL_MODE_TOSCRUBBEDSKYFILE,  toscrubbedskyfileMode);
+        MODECASE(WARPTOOL_MODE_TOSCRUBBEDSKYFILE,  toscrubbedskyfileMode);
         MODECASE(WARPTOOL_MODE_TOFULLSKYFILE,      tofullskyfileMode);
         MODECASE(WARPTOOL_MODE_UPDATESKYFILE,      updateskyfileMode);
@@ -252,5 +252,5 @@
         !psMetadataLookupBool(NULL, config->args, "-all")) {
         psFree(where);
-        psError(PXTOOLS_ERR_DATA, false, "search parameters are required");
+        psError(PXTOOLS_ERR_CONFIG, false, "search parameters are required");
         return false;
     }
@@ -279,5 +279,5 @@
     psString query = pxDataGet("warptool_definebyquery.sql");
     if (!query) {
-        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+        psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
         psFree(where);
         return false;
@@ -390,8 +390,8 @@
     if (!psListLength(where->list)) {
         psFree(where);
-        psError(PXTOOLS_ERR_DATA, false, "search parameters are required");
-        return false;
-    }
-    
+        psError(PXTOOLS_ERR_CONFIG, false, "search parameters are required");
+        return false;
+    }
+
     psString query = psStringCopy("UPDATE warpRun JOIN fakeRun USING(fake_id) JOIN camRun USING(cam_id) JOIN chipRun USING(chip_id) JOIN rawExp USING(exp_id)");
 
@@ -419,5 +419,5 @@
     psString query = pxDataGet("warptool_exp.sql");
     if (!query) {
-        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+        psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
         return false;
     }
@@ -493,5 +493,5 @@
     psString query = pxDataGet("warptool_imfile.sql");
     if (!query) {
-        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+        psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
         return false;
     }
@@ -567,5 +567,5 @@
     psString query = pxDataGet("warptool_tooverlap.sql");
     if (!query) {
-        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+        psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
         return false;
     }
@@ -682,5 +682,5 @@
         && !psMetadataLookupBool(NULL, config->args, "-all")) {
         psFree(where);
-        psError(PXTOOLS_ERR_DATA, false, "search parameters are required");
+        psError(PXTOOLS_ERR_CONFIG, false, "search parameters are required");
         return false;
     }
@@ -690,5 +690,5 @@
         psString query = pxDataGet("warptool_revertoverlap.sql");
         if (!query) {
-            psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+            psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
             if (!psDBRollback(config->dbh)) {
                 psError(PS_ERR_UNKNOWN, false, "database error");
@@ -822,5 +822,5 @@
     psString query = pxDataGet("warptool_scmap.sql");
     if (!query) {
-        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+        psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
         return false;
     }
@@ -895,5 +895,5 @@
     psString query = pxDataGet("warptool_towarped.sql");
     if (!query) {
-        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+        psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
         return false;
     }
@@ -1039,5 +1039,5 @@
     psString query = pxDataGet("warptool_finished_run_select.sql");
     if (!query) {
-        psError(PXTOOLS_ERR_DATA, false, "failed to retrieve SQL statement");
+        psError(PXTOOLS_ERR_SYS, false, "failed to retrieve SQL statement");
         return false;
     }
@@ -1115,5 +1115,5 @@
     psString query = pxDataGet("warptool_finished_run_select.sql");
     if (!query) {
-        psError(PXTOOLS_ERR_DATA, false, "failed to retrieve SQL statement");
+        psError(PXTOOLS_ERR_SYS, false, "failed to retrieve SQL statement");
         return false;
     }
@@ -1206,5 +1206,5 @@
     psString query = pxDataGet("warptool_warped.sql");
     if (!query) {
-        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+        psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
         return false;
     }
@@ -1214,9 +1214,9 @@
     psString where2 = NULL;
     if (!pxmagicAddWhere(config, &where2, "warpSkyfile")) {
-        psError(PXTOOLS_ERR_DATA, false, "pxMagicAddWhere failed");
+        psError(psErrorCodeLast(), false, "pxMagicAddWhere failed");
         return false;
     }
     if (!pxspaceAddWhere(config, &where2, "rawExp")) {
-        psError(PXTOOLS_ERR_DATA, false, "pxSpaceAddWhere failed");
+        psError(psErrorCodeLast(), false, "pxSpaceAddWhere failed");
         return false;
     }
@@ -1227,5 +1227,5 @@
         psFree(whereClause);
     } else if (!all && !where2) {
-        psError(PXTOOLS_ERR_DATA, true, "search parameters or -all are required");
+        psError(PXTOOLS_ERR_CONFIG, true, "search parameters or -all are required");
         return false;
     }
@@ -1300,5 +1300,5 @@
         && !psMetadataLookupBool(NULL, config->args, "-all")) {
         psFree(where);
-        psError(PXTOOLS_ERR_DATA, false, "search parameters are required");
+        psError(PXTOOLS_ERR_CONFIG, false, "search parameters are required");
         return false;
     }
@@ -1315,5 +1315,5 @@
         psString query = pxDataGet("warptool_revertwarped_delete.sql");
         if (!query) {
-            psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+            psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
             if (!psDBRollback(config->dbh)) {
                 psError(PS_ERR_UNKNOWN, false, "database error");
@@ -1435,5 +1435,5 @@
     psString query = pxDataGet("warptool_pendingcleanuprun.sql");
     if (!query) {
-        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+        psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
         return false;
     }
@@ -1498,5 +1498,5 @@
     psString query = pxDataGet("warptool_pendingcleanupskyfile.sql");
     if (!query) {
-        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+        psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
         return false;
     }
@@ -1559,5 +1559,5 @@
     psString query = pxDataGet("warptool_donecleanup.sql");
     if (!query) {
-        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+        psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
         return false;
     }
@@ -1715,5 +1715,5 @@
     if (!state) {
       psString query = pxDataGet("warptool_updateskyfile.sql");
-      
+
       if (!p_psDBRunQueryF(config->dbh, query, fault, warp_id, skycell_id)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
@@ -1724,15 +1724,15 @@
     else {
       if (strcmp(state,"error_cleaned") == 0) {
-	change_skyfile_data_state(config,"error_cleaned","goto_cleaned");
+        change_skyfile_data_state(config,"error_cleaned","goto_cleaned");
       }
       else if (strcmp(state, "error_scrubbed") == 0) {
-	change_skyfile_data_state(config,"error_scrubbed","goto_scrubbed");
+        change_skyfile_data_state(config,"error_scrubbed","goto_scrubbed");
       }
       else if (strcmp(state, "error_purged") == 0) {
-	change_skyfile_data_state(config,"error_purged","goto_purged");
+        change_skyfile_data_state(config,"error_purged","goto_purged");
       }
       else {
-	psError(PS_ERR_UNKNOWN, false, "unhandled state given");
-	return(false);
+        psError(PS_ERR_UNKNOWN, false, "unhandled state given");
+        return(false);
       }
     }
@@ -1780,5 +1780,5 @@
       psString query = pxDataGet(tables[i].sqlFilename);
       if (!query) {
-          psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+          psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
           return false;
       }
@@ -1947,5 +1947,5 @@
     psString query = pxDataGet("warptool_runstate.sql");
     if (!query) {
-        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+        psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
         return false;
     }
@@ -1956,5 +1956,5 @@
         psFree(whereClause);
     } else {
-        psError(PXTOOLS_ERR_DATA, true, "search parameters or -all are required");
+        psError(PXTOOLS_ERR_CONFIG, true, "search parameters or -all are required");
         return false;
     }