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

trunk/ippTools/src/pxadd.c

@@ -124 +124 @@
 bool pxaddQueueByCamID(pxConfig *config,
                        psS64 cam_id,
-                       char *workdir,
-                       char *reduction,
-                       char *label,
+                       char *workdir,
+                       char *reduction,
+                       char *label,
                        char *data_group,
-                       char *dvodb,
+                       char *dvodb,
                        char *note,
-                       bool image_only)
+                       bool image_only)
 {
     PS_ASSERT_PTR_NON_NULL(config, false);
@@ -140 +140 @@
         psMemSetPersistent(query, true);
         if (!query) {
-            psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+            psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
             return false;
         }
@@ -149 +149 @@
     // on 32/64
     if (!p_psDBRunQueryF(config->dbh, query,
-                         "new", // state
-                         workdir  ? workdir   : "NULL",
-                         "dirty", //workdir_state
-                         reduction? reduction : "NULL",
-                         label    ? label     : "NULL",
-                         data_group ? data_group     : "NULL",
-                         dvodb    ? dvodb     : "NULL",
-                         note     ? note     : "NULL",
-                         image_only,
-                         (long long) cam_id
+                         "new", // state
+                         workdir  ? workdir   : "NULL",
+                         "dirty", //workdir_state
+                         reduction? reduction : "NULL",
+                         label    ? label     : "NULL",
+                         data_group ? data_group     : "NULL",
+                         dvodb    ? dvodb     : "NULL",
+                         note     ? note     : "NULL",
+                         image_only,
+                         (long long) cam_id
     )) {
         psError(PS_ERR_UNKNOWN, false, "database error");