Changeset 11002 for trunk/ippTools/src/regtool.c

Timestamp:

Jan 9, 2007, 3:59:08 PM (19 years ago)

Author:

jhoblitt

Message:

rename setFaultCode() -> pxSetFaultCode() and move it into it's own file
add p2tool -faultimfile & -pendingimfile -faulted & -pendingimfile -limit

File:

• trunk/ippTools/src/regtool.c (modified) (5 diffs)

trunk/ippTools/src/regtool.c

@@ -41 +41 @@
 static rawImfileRow *newToRawImfile(pxConfig *config, newImfileRow *exp);
 //static psU32 mapCodeStrToInt(const char *codeStr);
-static bool setFaultCode(psDB *dbh, const char *tableName, psMetadata *where, psS8 code);
 
 
@@ -281 +280 @@
     }
 
-    if (!setFaultCode(config->dbh, "newExp", config->where, code)) {
+    if (!pxSetFaultCode(config->dbh, "newExp", config->where, code)) {
         psError(PS_ERR_UNKNOWN, false, "failed to set set fault flag");
         return false;
@@ -300 +299 @@
     }
 
-    if (!setFaultCode(config->dbh, "newImfile", config->where, code)) {
+    if (!pxSetFaultCode(config->dbh, "newImfile", config->where, code)) {
         psError(PS_ERR_UNKNOWN, false, "failed to set set fault flag");
-        return false;
-    }
-
-    return true;
-}
-
-
-static bool setFaultCode(psDB *dbh, const char *tableName, psMetadata *where, psS8 code)
-{
-    PS_ASSERT_PTR_NON_NULL(dbh, false);
-    PS_ASSERT_PTR_NON_NULL(tableName, false);
-    PS_ASSERT_PTR_NON_NULL(where, false);
-
-#if 0
-    // map code string to numeric fault code
-    psU32 code = mapCodeStrToInt(codeStr);
-    if (code == (psU32)-1) {
-        psError(PS_ERR_UNKNOWN, false, "error resolving error code");
-        return false;
-    }
-#endif
-
-    // update the database
-    psMetadata *values = psMetadataAlloc();
-    if (!psMetadataAddS8(values, PS_LIST_HEAD, "fault", 0, NULL, code)) {
-        psError(PS_ERR_UNKNOWN, false, "failed to add metadata item fault");
-        psFree(values);
-        return false;
-    }
-    psFree(values);
-
-    long rowsAffected = psDBUpdateRows(dbh, tableName, where, values); 
-    if (rowsAffected < 0) {
-        // database error
-        psError(PS_ERR_UNKNOWN, false, "database error");
-        return false;
-    }
-    if (rowsAffected < 1) {
-        // we didn't do anything
-        psError(PS_ERR_UNKNOWN, false, "zero rows were affected - either the search criteria didn't match any rows or the field already had the value being set.");
         return false;
     }
@@ -839 +798 @@
         exp->exp_tag,
         "my recipe",
-        0xff, // XXX calc version number
-        0xff, // XXX calc version number
-        label
+        0xff,   // XXX calc version number
+        0xff,   // XXX calc version number
+        label,
+        0       // fault code
     );
 
@@ -855 +815 @@
         "my recipe",
         0xff, // XXX calc version number
-        0xff // XXX calc version number
+        0xff, // XXX calc version number
+        0       // fault code
     );
 }