Changeset 26981 for trunk/ippTools/src/dettool_processedimfile.c

Timestamp:

Feb 17, 2010, 4:40:03 PM (16 years ago)

Author:

Paul Price

Message:

Reworked all ippTools to put fault=2 (SYS_ERROR) when can't find SQL file (presumably due to NFS problems). Removed DATA_ERROR because ippTools don't work on data (astronomical images or catalogues). This should allow us to turn on revert for fault=2 only.

File:

• trunk/ippTools/src/dettool_processedimfile.c (modified) (7 diffs)

trunk/ippTools/src/dettool_processedimfile.c

@@ -34 +34 @@
     psString query = pxDataGet("dettool_toprocessedimfile.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;
     }
@@ -180 +180 @@
     psString query = pxDataGet("dettool_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;
@@ -267 +267 @@
     psString query = pxDataGet("dettool_revertprocessedimfile.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;
     }
@@ -299 +299 @@
     PXOPT_LOOKUP_S64(det_id, config->args, "-det_id", true, false);
     PXOPT_LOOKUP_STR(data_state, config->args, "-data_state", true, false);
-    
+
     psMetadata *where = psMetadataAlloc();
 
@@ -327 +327 @@
     psString query = pxDataGet("dettool_pendingcleanup_processedimfile.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;
     }
@@ -356 +356 @@
     if (!output) {
         psError(PS_ERR_UNKNOWN, false, "database error");
-/*      fprintf(stderr,"WTF !output?\n"); */
+/*      fprintf(stderr,"WTF !output?\n"); */
         return false;
     }
     if (!psArrayLength(output)) {
         psTrace("dettool", PS_LOG_INFO, "no rows found");
-/*      fprintf(stderr,"WTF no rows??\n"); */
+/*      fprintf(stderr,"WTF no rows??\n"); */
         psFree(output);
         return true;
@@ -397 +397 @@
     psString query = pxDataGet("dettool_donecleanup_processedimfile.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;
     }