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

trunk/ippTools/src/receivetool.c

@@ -136 +136 @@
     psString query = pxDataGet("receivetool_list.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;
@@ -195 +195 @@
     psString query = pxDataGet("receivetool_addfileset.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;
     }
@@ -302 +302 @@
     psString query = pxDataGet("receivetool_pendingfileset.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;
@@ -381 +381 @@
         psString file_type = psMetadataLookupStr(NULL, md, "file_type");
         psString component = psMetadataLookupStr(NULL, md, "component");
-        
+
         if (!file) {
             psError(PS_ERR_UNKNOWN, false, "failed to find value for file");
@@ -431 +431 @@
     psString query = pxDataGet("receivetool_pendingfile.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;
@@ -514 +514 @@
     psString query = pxDataGet("receivetool_revert.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;
@@ -547 +547 @@
     psString query = pxDataGet("receivetool_toadvance.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;
@@ -613 +613 @@
     psString query = NULL;              // Query to execute
     psStringAppend(&query, "UPDATE receiveFileset SET ");
-    
+
     psString sep = "";
     if (fault) {
@@ -631 +631 @@
         sep = ",";
     }
-    
+
     psStringAppend(&query, " WHERE fileset_id = %" PRId64, fileset_id);