Changeset 28304 for branches/czw_branch/20100519/ippTools/src/pstamptool.c

Timestamp:

Jun 10, 2010, 6:28:51 PM (16 years ago)

Author:

watersc1

Message:

Skycell Summary and stack Association stuff should be finished. I'll merge and do final tests on monday.

Location:

branches/czw_branch/20100519

Files:

• . (modified) (1 prop)
• ippTools/src (modified) (1 prop)
• ippTools/src/pstamptool.c (modified) (8 diffs)

branches/czw_branch/20100519/ippTools/src

@@ -38 +38 @@
 stamp-h1
 warptool
-
+staticskytool

@@ -38 +38 @@
 stamp-h1
 warptool
-
+staticskytool

branches/czw_branch/20100519/ippTools/src/pstamptool.c

@@ -30 +30 @@
 #include "pxdata.h"
 #include "pstamptool.h"
+#include "pstamp.h"
 
 static bool adddatastoreMode(pxConfig *config);
@@ -53 +54 @@
 static bool updatedependentMode(pxConfig *config);
 static bool revertdependentMode(pxConfig *config);
+static bool getwebrequestnumMode(pxConfig *config);
 
 # define MODECASE(caseName, func) \
@@ -95 +97 @@
         MODECASE(PSTAMPTOOL_MODE_UPDATEDEPENDENT, updatedependentMode);
         MODECASE(PSTAMPTOOL_MODE_REVERTDEPENDENT, revertdependentMode);
+        MODECASE(PSTAMPTOOL_MODE_GETWEBREQUESTNUM, getwebrequestnumMode);
         default:
             psAbort("invalid option (this should not happen)");
@@ -939 +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);
     }
 
@@ -961 +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;
@@ -1133 +1140 @@
             psFree(output);
             return false;
+        }
+        psS32 fault = psMetadataLookupS64(NULL, dep, "fault");
+        if (fault > 0) {
+            fprintf(stderr, "existing dependent has fault %d\n", fault);
+            exit (fault);
         }
         printf("%" PRId64 "\n", dep_id);
@@ -1315 +1327 @@
         return false;
     }
+
+    PXOPT_LOOKUP_S16(fault,      config->args, "-fault",          false, false);
+
     psString query = pxDataGet("pstamptool_revertdependent.sql");
     if (!query) {
@@ -1326 +1341 @@
     psFree(where);
 
-    if (!p_psDBRunQuery(config->dbh, query)) {
-        psError(PS_ERR_UNKNOWN, false, "database error");
-        psFree(query);
-        return false;
-    }
-
-    return true;
-}
+    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");
+        psFree(query);
+        return false;
+    }
+
+    return true;
+}
+
+static bool getwebrequestnumMode(pxConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(config, false);
+
+    if (!pstampWebRequestInsert(config->dbh, 0 )) {
+        psError(PS_ERR_UNKNOWN, false, "failed to insert pstampWebRequest");
+        return false;
+    }
+
+    psS64 req_id = psDBLastInsertID(config->dbh);
+
+    printf("%" PRId64 "\n", req_id);
+
+    return true;
+}

@@ -38 +38 @@
 stamp-h1
 warptool
-
+staticskytool