Changeset 23688 for trunk/ippTools/src/dettool_normalizedstat.c

Timestamp:

Apr 2, 2009, 2:51:37 PM (17 years ago)

Author:

Paul Price

Message:

Merging in branches/pap/ from r23685. Some conflicts, most notably in ippTools, but these resolved fairly simply. Only question mark is on regtool reversion, but I think I got it right. Everything builds fine.

Location:

trunk

Files:

• . (modified) (1 prop)
• ippTools/src/dettool_normalizedstat.c (modified) (3 diffs)

trunk/ippTools/src/dettool_normalizedstat.c

@@ -83 +83 @@
     // default
     PXOPT_LOOKUP_S32(iteration, config->args, "-iteration", false, false);
-    PXOPT_LOOKUP_S16(code, config->args, "-code", false, false);
+    PXOPT_LOOKUP_S16(code, config->args, "-fault", false, false);
 
     detNormalizedStatImfileRow *row = detNormalizedStatImfileRowAlloc
-        (det_id,
-         iteration,
-         class_id,
-         norm,
-         "full",
-         code);
-                                                                         
+        (det_id,
+         iteration,
+         class_id,
+         norm,
+         "full",
+         code);
+
     if (!detNormalizedStatImfileInsertObject(config->dbh, row)) {
-        psError(PS_ERR_UNKNOWN, false, "database error");
-        return false;
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        return false;
     }
 
@@ -181 +181 @@
     PXOPT_COPY_S32(config->args, where, "-iteration", "iteration", "==");
     PXOPT_COPY_STR(config->args, where, "-class_id",  "class_id", "==");
-    PXOPT_COPY_S16(config->args, where, "-code",      "fault", "==");
+    PXOPT_COPY_S16(config->args, where, "-fault",      "fault", "==");
 
     psString query = pxDataGet("dettool_revertnormalizedstat.sql");
@@ -221 +221 @@
 
     if (!setNormStatImfileDataState(config, det_id, iteration, class_id, data_state)) {
-        return false;
+        return false;
     }
     return true;