Index: trunk/ippTools/src/regtool.c
===================================================================
--- trunk/ippTools/src/regtool.c	(revision 25835)
+++ trunk/ippTools/src/regtool.c	(revision 26981)
@@ -117,5 +117,5 @@
     psString query = pxDataGet("regtool_pendingimfile.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;
     }
@@ -347,9 +347,9 @@
     psString where2 = NULL;
     if (!pxmagicAddWhere(config, &where2, "rawImfile")) {
-        psError(PXTOOLS_ERR_DATA, false, "pxSpaceAddWhere failed");
+        psError(psErrorCodeLast(), false, "pxSpaceAddWhere failed");
         return false;
     }
     if (!pxspaceAddWhere(config, &where2, "rawImfile")) {
-        psError(PXTOOLS_ERR_DATA, false, "pxSpaceAddWhere failed");
+        psError(psErrorCodeLast(), false, "pxSpaceAddWhere failed");
         return false;
     }
@@ -357,5 +357,5 @@
     psString query = pxDataGet("regtool_processedimfile.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;
@@ -367,5 +367,5 @@
         psFree(whereClause);
     } else if (!all && !where2) {
-        psError(PXTOOLS_ERR_DATA, false, "search parameters are required");
+        psError(PXTOOLS_ERR_CONFIG, false, "search parameters are required");
         return false;
     }
@@ -452,5 +452,5 @@
     psString query = pxDataGet("regtool_revertprocessedimfile.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;
@@ -463,5 +463,5 @@
     } else {
         psFree(where);
-        psError(PXTOOLS_ERR_DATA, false, "search parameters are required");
+        psError(PXTOOLS_ERR_CONFIG, false, "search parameters are required");
         return false;
     }
@@ -493,10 +493,10 @@
 /*     PXOPT_LOOKUP_F64(user_1, config->args, "-user_1", false, false); */
     PXOPT_LOOKUP_S16(burntool_state, config->args, "-burntool_state", false, false);
-    
-    if ((fault == INT16_MAX) && !isfinite(burntool_state)) { 
+
+    if ((fault == INT16_MAX) && !isfinite(burntool_state)) {
         psError(PS_ERR_UNKNOWN, false, "one of -fault or -burntool_state must be selected");
         return false;
     }
-    if ((fault != INT16_MAX) && isfinite(burntool_state)) { 
+    if ((fault != INT16_MAX) && isfinite(burntool_state)) {
         psError(PS_ERR_UNKNOWN, false, "only one of -fault or -burntool_state must be selected");
         return false;
@@ -508,25 +508,25 @@
 
     if (fault != INT16_MAX) {
-	// this is fairly dangerous : can set all if the where is not set...
-	if (!pxSetFaultCode(config->dbh, "rawImfile", where, fault)) {
-	    psError(PS_ERR_UNKNOWN, false, "failed to set set fault flag");
-	    psFree (where);
-	    return false;
-	}
+        // this is fairly dangerous : can set all if the where is not set...
+        if (!pxSetFaultCode(config->dbh, "rawImfile", where, fault)) {
+            psError(PS_ERR_UNKNOWN, false, "failed to set set fault flag");
+            psFree (where);
+            return false;
+        }
     }
 
     if (isfinite(burntool_state)) {
-	psString query = pxDataGet("regtool_updateprocessedimfile.sql");
-	if (!query) {
-	    psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
-	    return false;
-	}
-
-	if (!p_psDBRunQueryF(config->dbh, query, burntool_state, exp_id, class_id)) {
-	    psError(PS_ERR_UNKNOWN, false, "database error");
-	    psFree(query);
-	    return false;
-	}
-	psFree(query);
+        psString query = pxDataGet("regtool_updateprocessedimfile.sql");
+        if (!query) {
+            psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
+            return false;
+        }
+
+        if (!p_psDBRunQueryF(config->dbh, query, burntool_state, exp_id, class_id)) {
+            psError(PS_ERR_UNKNOWN, false, "database error");
+            psFree(query);
+            return false;
+        }
+        psFree(query);
     }
     psFree (where);
@@ -549,5 +549,5 @@
     psString query = pxDataGet("regtool_pendingexp.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;
     }
@@ -687,5 +687,5 @@
     psString query = pxDataGet("regtool_pendingexp.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;
     }
@@ -920,5 +920,5 @@
     psString query = pxDataGet("regtool_processedexp.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;
     }
@@ -1043,5 +1043,5 @@
     psString query = pxDataGet("regtool_revertprocessedexp.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;
@@ -1054,5 +1054,5 @@
     } else {
         psFree(where);
-        psError(PXTOOLS_ERR_DATA, false, "search parameters are required");
+        psError(PXTOOLS_ERR_CONFIG, false, "search parameters are required");
         return false;
     }
@@ -1111,5 +1111,5 @@
             psError(PS_ERR_UNKNOWN, false, "database error");
         }
-        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+        psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
         return false;
     }
@@ -1137,5 +1137,5 @@
             psError(PS_ERR_UNKNOWN, false, "database error");
         }
-        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+        psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
         return false;
     }
@@ -1229,5 +1229,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;
     }