Changeset 10988

Timestamp:

Jan 8, 2007, 4:08:02 PM (19 years ago)

Author:

jhoblitt

Message:

convert new[Exp|Imfile].flags -> .fault and change it into a S16

Location:

trunk/ippTools/src

Files:

• regtool.c (modified) (9 diffs)
• regtoolConfig.c (modified) (2 diffs)

trunk/ippTools/src/regtool.c

@@ -40 +40 @@
 static rawDetrendExpRow *newToRawDetrendExp(pxConfig *config, newExpRow *exp);
 static rawImfileRow *newToRawImfile(pxConfig *config, newImfileRow *exp);
-static psU32 mapCodeStrToInt(const char *codeStr);
-static bool setFaultFlags(psDB *dbh, const char *tableName, psMetadata *where, const char *codeStr);
+//static psU32 mapCodeStrToInt(const char *codeStr);
+static bool setFaultCode(psDB *dbh, const char *tableName, psMetadata *where, psS8 code);
 
 
@@ -128 +128 @@
     if (faulted) {
         // list only faulted rows
-        psStringAppend(&query, " %s", "AND newExp.flags > 0");
+        psStringAppend(&query, " %s", "AND newExp.fault != 0");
     } else {
         // don't list faulted rows
-        psStringAppend(&query, " %s", "AND newExp.flags = 0");
+        psStringAppend(&query, " %s", "AND newExp.fault = 0");
     }
 
@@ -218 +218 @@
     if (faulted) {
         // list only faulted rows
-        psStringAppend(&query, " %s", "AND newImfile.flags > 0");
+        psStringAppend(&query, " %s", "AND newImfile.fault != 0");
     } else {
         // don't list faulted rows
-        psStringAppend(&query, " %s", "AND newImfile.flags = 0");
+        psStringAppend(&query, " %s", "AND newImfile.fault = 0");
     }
 
@@ -275 +275 @@
 {
     bool status = false;
-    psString codeStr = psMetadataLookupStr(&status, config->args, "-code");
+    psS8 code = psMetadataLookupS8(&status, config->args, "-code");
     if (!status) {
         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -code");
         return false;
     }
-    if (!codeStr) {
-        psError(PS_ERR_UNKNOWN, true, "-code is required");
-        return false;
-    }
-
-    if (!setFaultFlags(config->dbh, "newExp", config->where, codeStr)) {
+
+    if (!setFaultCode(config->dbh, "newExp", config->where, code)) {
         psError(PS_ERR_UNKNOWN, false, "failed to set set fault flag");
         return false;
@@ -298 +294 @@
 
     bool status = false;
-    psString codeStr = psMetadataLookupStr(&status, config->args, "-code");
+    psS8 code = psMetadataLookupS8(&status, config->args, "-code");
     if (!status) {
         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -code");
         return false;
     }
-    if (!codeStr) {
-        psError(PS_ERR_UNKNOWN, true, "-code is required");
-        return false;
-    }
-
-    if (!setFaultFlags(config->dbh, "newImfile", config->where, codeStr)) {
+
+    if (!setFaultCode(config->dbh, "newImfile", config->where, code)) {
         psError(PS_ERR_UNKNOWN, false, "failed to set set fault flag");
         return false;
@@ -316 +308 @@
 }
 
-static bool setFaultFlags(psDB *dbh, const char *tableName, psMetadata *where, const char *codeStr)
+
+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(codeStr, false);
-
+    PS_ASSERT_PTR_NON_NULL(where, false);
+
+#if 0
     // map code string to numeric fault code
     psU32 code = mapCodeStrToInt(codeStr);
@@ -328 +322 @@
         return false;
     }
+#endif
 
     // update the database
     psMetadata *values = psMetadataAlloc();
-    if (!psMetadataAddU32(values, PS_LIST_HEAD, "flags", 0, NULL, code)) {
-        psError(PS_ERR_UNKNOWN, false, "failed to add metadata item flags");
+    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;
@@ -1141 +1136 @@
 }
 
+#if 0
 static psU32 mapCodeStrToInt(const char *codeStr)
 {
@@ -1157 +1153 @@
     return (psU32) -1;
 }
+#endif

trunk/ippTools/src/regtoolConfig.c

@@ -125 +125 @@
     psMetadataAddStr(faultexpArgs, PS_LIST_TAIL, "-exp_tag",  0,
         "search by exposure ID", NULL);
-    psMetadataAddStr(faultexpArgs, PS_LIST_TAIL, "-code",  0,
-        "set fault code (required)", NULL);
+    psMetadataAddS8(faultexpArgs, PS_LIST_TAIL, "-code",  0,
+        "set fault code (required)", 0);
     
     // -updateimfile
@@ -175 +175 @@
     psMetadataAddStr(faultimfileArgs, PS_LIST_TAIL, "-class_id",  0,
         "search by class ID", NULL);
-    psMetadataAddStr(faultimfileArgs, PS_LIST_TAIL, "-code",  0,
-        "set fault code (required)", NULL);
+    psMetadataAddS8(faultimfileArgs, PS_LIST_TAIL, "-code",  0,
+        "set fault code (required)", 0);
     
     // -rawimfile