Changeset 28146

Timestamp:

May 27, 2010, 1:37:11 PM (16 years ago)

Author:

bills

Message:

don't revert dependent faults with fault > 10 unless explicitly requested by the user

Location:

trunk

Files:

• ippTools/share/pstamptool_revertdependent.sql (modified) (1 diff)
• ippTools/src/pstamptool.c (modified) (5 diffs)
• pstamp/src/pstamp.h (modified) (1 diff)

trunk/ippTools/share/pstamptool_revertdependent.sql

@@ -4 +4 @@
 SET pstampDependent.fault = 0
 WHERE pstampDependent.state = 'new'
+    AND (pstampDependent.fault > 0)

trunk/ippTools/src/pstamptool.c

@@ -30 +30 @@
 #include "pxdata.h"
 #include "pstamptool.h"
+#include "pstamp.h"
 
 static bool adddatastoreMode(pxConfig *config);
@@ -941 +942 @@
     PXOPT_LOOKUP_S16(fault, config->args, "-fault",  false, false);
 
-    // By default only revert faults < 10 which are our "ipp exit codes"
+    // By default only revert faults < PSTAMP_FIRST_ERROR_CODE which are our "ipp exit codes"
     // codes larger than that are the pstamp request interface.
     // Don't fault those unless -fault waa provided
-    psString faultClause = "";
+    psString faultClause = psStringCopy("");
     if (!fault) {
-        faultClause = " \nAND (pstampJob.fault < 10)";
+        psStringAppend(&faultClause, " \nAND (pstampJob.fault < %d)", PSTAMP_FIRST_ERROR_CODE);
     }
 
@@ -963 +964 @@
 
     if (!p_psDBRunQueryF(config->dbh, query, faultClause)) {
-        psError(PS_ERR_UNKNOWN, false, "database error");
-        return false;
-    }
+        psFree(faultClause);
+        psFree(query);
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        return false;
+    }
+
+    psFree(faultClause);
 
     return true;
@@ -1322 +1327 @@
         return false;
     }
+
+    PXOPT_LOOKUP_S16(fault,      config->args, "-fault",          false, false);
+
     psString query = pxDataGet("pstamptool_revertdependent.sql");
     if (!query) {
@@ -1333 +1341 @@
     psFree(where);
 
+    if (!fault) {
+        // unless asked to clear a specific fault value, restrict reverts to fault codes
+        // that are less than the minimum fault in the API
+        psStringAppend(&query, " AND (pstampDependent.fault < %d)", PSTAMP_FIRST_ERROR_CODE);
+    }
+
     if (!p_psDBRunQuery(config->dbh, query)) {
         psError(PS_ERR_UNKNOWN, false, "database error");

trunk/pstamp/src/pstamp.h

@@ -9 +9 @@
 typedef enum {
         PSTAMP_SUCCESS          = 0,
+        PSTAMP_FIRST_ERROR_CODE = 10,
         PSTAMP_SYSTEM_ERROR     = 10,
         PSTAMP_NOT_IMPLEMENTED  = 11,