Changeset 23688 for trunk/ippTools/src/dettool_detrunsummary.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_detrunsummary.c (modified) (9 diffs)

trunk/ippTools/src/dettool_detrunsummary.c

@@ -101 +101 @@
 
     // default values
-    PXOPT_LOOKUP_S16(code, config->args, "-code", false, false);
+    PXOPT_LOOKUP_S16(fault, config->args, "-fault", false, false);
     PXOPT_LOOKUP_BOOL(accept, config->args, "-accept", false);
 
@@ -107 +107 @@
             det_id,
             iteration,
-            "full",
+            "full",
             bg,
             bg_stdev,
             bg_mean_stdev,
             accept,
-            code
+            fault
         );
 }
@@ -120 +120 @@
 {
     PS_ASSERT_PTR_NON_NULL(config, false);
-    
+
     // build a query to search by det_id, iteration, exp_id
     psMetadata *where = psMetadataAlloc();
@@ -129 +129 @@
     PXOPT_LOOKUP_BOOL(again, config->args, "-again", false);
 
-    // The values supplied as arguments on the command (eg, -bg) are parsed 
-    // by mdToDetRunSummary below. 
+    // The values supplied as arguments on the command (eg, -bg) are parsed
+    // by mdToDetRunSummary below.
     // XXX why is there ever more than one?
 
@@ -141 +141 @@
     if (psListLength(where->list)) {
         psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
-        psStringAppend(&query, " WHERE %s", whereClause);
-        psFree(whereClause);
+        psStringAppend(&query, " WHERE %s", whereClause);
+        psFree(whereClause);
     }
     psFree(where);
@@ -199 +199 @@
     psFree(output);
 
-    // XXX this logic does not deal with the case of -code being set
-    // XXX it should be an error for -again and -code to both be set
+    // XXX this logic does not deal with the case of -fault being set
+    // XXX it should be an error for -again and -fault to both be set
     if (again) {
         if (!startNewIteration(config, det_id)) {
@@ -306 +306 @@
     PXOPT_COPY_S64(config->args, where, "-det_id",    "det_id", "==");
     PXOPT_COPY_S32(config->args, where, "-iteration", "iteration", "==");
-    PXOPT_COPY_STR(config->args, where, "-code",      "fault", "==");
+    PXOPT_COPY_STR(config->args, where, "-fault",      "fault", "==");
 
     psString query = pxDataGet("dettool_revertdetrunsummary.sql");
@@ -340 +340 @@
 {
     PS_ASSERT_PTR_NON_NULL(config, false);
-    
+
     PXOPT_LOOKUP_S64(det_id, config->args, "-det_id", true, false); // required
     PXOPT_LOOKUP_BOOL(accept, config->args, "-accept", false);
@@ -355 +355 @@
     }
 
-    char *query = "UPDATE detRunSummary SET accept = %d WHERE det_id = %"PRId64; 
+    char *query = "UPDATE detRunSummary SET accept = %d WHERE det_id = %"PRId64;
     if (!p_psDBRunQueryF(config->dbh, query, accept, det_id)) {
         psError(PS_ERR_UNKNOWN, false, "database error");