Changeset 23688 for trunk/ippTools/src/dettool_processedexp.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_processedexp.c (modified) (4 diffs)

trunk/ippTools/src/dettool_processedexp.c

@@ -80 +80 @@
 
     // default values
-    PXOPT_LOOKUP_S16(code, config->args, "-code", false, false);
-
-    // Required if code == 0
-    PXOPT_LOOKUP_STR(recipe, config->args, "-recip", (code == 0), false);
+    PXOPT_LOOKUP_S16(fault, config->args, "-fault", false, false);
+
+    // Required if fault == 0
+    PXOPT_LOOKUP_STR(recipe, config->args, "-recip", (fault == 0), false);
 
     // optional
@@ -141 +141 @@
         user_5,
         path_base,
-        "full",
-        code
+        "full",
+        fault
     );
 
@@ -231 +231 @@
     PXOPT_COPY_S64(config->args, where, "-det_id", "det_id", "==");
     PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "==");
-    PXOPT_COPY_S16(config->args, where, "-code",   "fault", "==");
+    PXOPT_COPY_S16(config->args, where, "-fault",   "fault", "==");
 
     psString query = pxDataGet("dettool_revertprocessedexp.sql");
@@ -269 +269 @@
     PXOPT_LOOKUP_STR(data_state, config->args, "-data_state", true, false);
     if (!setProcessedExpDataState(config, det_id, exp_id, data_state)) {
-        return false;
+        return false;
     }
     return true;