Changeset 26981 for trunk/ippTools/src/dettool_correction.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_correction.c (modified) (5 diffs)

trunk/ippTools/src/dettool_correction.c

@@ -34 +34 @@
     PXOPT_LOOKUP_STR(label, config->args, "-label", false, false);
 
-    // build the needed where 
+    // build the needed where
     psMetadata *where = psMetadataAlloc();
     psMetadataAddS64(where, PS_LIST_TAIL, "det_id", 0, "==", ref_det_id);
@@ -88 +88 @@
          detRun->solang_max,
          use_label,
-         detRun->det_id, // ref_det_id
-         detRun->iteration // ref_iter
+         detRun->det_id, // ref_det_id
+         detRun->iteration // ref_iter
     );
     psFree(runs);
@@ -140 +140 @@
     psString query = pxDataGet("dettool_tocorrectimfile.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;
     }
 
     if (psListLength(where->list)) {
-        // NOTE the SQL uses an intermediate table 'det1' for this query
-        psString whereClause = psDBGenerateWhereConditionSQL(where, "det1"); 
+        // NOTE the SQL uses an intermediate table 'det1' for this query
+        psString whereClause = psDBGenerateWhereConditionSQL(where, "det1");
         psStringAppend(&query, " AND %s", whereClause);
         psFree(whereClause);
@@ -198 +198 @@
     psString query = pxDataGet("dettool_tocorrectexp.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;
     }
@@ -248 +248 @@
         return false;
     }
-    
+
     // automatically stop completed 'correct' detRuns
     psString query = pxDataGet("dettool_stop_completed_correct_runs.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;
     }