Changeset 17572

Timestamp:

May 7, 2008, 3:48:27 PM (18 years ago)

Author:

jhoblitt

Message:

add handling for summitExp.fault

Location:

trunk/ippTools

Files:

• configure.ac (modified) (1 diff)
• src/pzgetexp.c (modified) (1 diff)
• src/pzgetimfiles.c (modified) (1 diff)
• src/pztool.c (modified) (1 diff)

trunk/ippTools/configure.ac

@@ -18 +18 @@
 PKG_CHECK_MODULES([PSLIB], [pslib >= 1.1.0])
 PKG_CHECK_MODULES([PSMODULES], [psmodules >= 1.1.0])
-PKG_CHECK_MODULES([IPPDB], [ippdb >= 1.1.32]) 
+PKG_CHECK_MODULES([IPPDB], [ippdb >= 1.1.33]) 
 
 PXTOOLS_CFLAGS="${PSLIB_CFLAGS=} ${PSMODULES_CFLAGS=} ${IPPDB_CFLAGS=}"

trunk/ippTools/src/pzgetexp.c

@@ -192 +192 @@
             "   SElECT"
             "       incoming.*,"
-            "       NULL"
+            "       NULL,"
+            "       0"
             "   FROM incoming"
             "   LEFT JOIN summitExp"

trunk/ippTools/src/pzgetimfiles.c

@@ -94 +94 @@
 
     if (exitStatus != 0) {
+        // mark the summitExp row as faulted
+        if (!p_psDBRunQuery(config->dbh, "UPDATE summitExp SET fault = 123 WHERE exp_name = '%s' AND camera = '%s' AND telescope = '%s'", filesetid, camera, telescope)) {
+            psError(PS_ERR_UNKNOWN, false, "database error");
+        }
+
         psError(PS_ERR_UNKNOWN, true, "%s failed with exit status %d",
             FILESET_LS_CMD, exitStatus);

trunk/ippTools/src/pztool.c

@@ -212 +212 @@
             "   AND pzDownloadExp.camera IS NULL"
             "   AND pzDownloadExp.telescope IS NULL"
+            "   AND summitExp.fault = 0"
         );