Changeset 14269

Timestamp:

Jul 17, 2007, 10:55:24 AM (19 years ago)

Author:

jhoblitt

Message:

add detool -revertdetrunsummary

Location:

trunk/ippTools

Files:

• share/Makefile.am (modified) (1 diff)
• share/dettool_revertdetrunsummary.sql (added)
• src/dettool.c (modified) (4 diffs)
• src/dettool.h (modified) (1 diff)
• src/dettoolConfig.c (modified) (2 diffs)

trunk/ippTools/share/Makefile.am

@@ -16 +16 @@
         dettool_normalizedstat.sql \
         dettool_raw.sql \
+        dettool_revertdetrunsummary.sql \
         dettool_revertnormalizedexp.sql \
         dettool_revertnormalizedimfile.sql \

trunk/ippTools/src/dettool.c

@@ -86 +86 @@
 static bool adddetrunsummaryMode(pxConfig *config);
 static bool detrunsummaryMode(pxConfig *config);
+static bool revertdetrunsummaryMode(pxConfig *config);
 static bool updatedetrunMode(pxConfig *config);
 static bool rerunMode(pxConfig *config);
@@ -177 +178 @@
         MODECASE(DETTOOL_MODE_ADDDETRUNSUMMARY, adddetrunsummaryMode);
         MODECASE(DETTOOL_MODE_DETRUNSUMMARY,    detrunsummaryMode);
+        MODECASE(DETTOOL_MODE_REVERTDETRUNSUMMARY, revertdetrunsummaryMode);
         MODECASE(DETTOOL_MODE_UPDATEDETRUN,     updatedetrunMode);
         MODECASE(DETTOOL_MODE_RERUN,            rerunMode);
@@ -5997 +5999 @@
     psFree(output);
 
+    // XXX this logic does not deal with the case of -code being set
     if (again) {
         if (!startNewIteration(config, (psS64)atoll(det_id))) {
@@ -6177 +6180 @@
     return true;
 }
+
+
+static bool revertdetrunsummaryMode(pxConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(config, false);
+
+    psString query = pxDataGet("dettool_revertdetrunsummary.sql");
+    if (!query) {
+        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+        return false;
+    }
+
+    if (config->where) {
+        psString whereClause = psDBGenerateWhereConditionSQL(config->where, "detRunSummary");
+        psStringAppend(&query, " AND %s", whereClause);
+        psFree(whereClause);
+    }
+
+    if (!p_psDBRunQuery(config->dbh, query)) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        psFree(query);
+        return false;
+    }
+    psFree(query);
+
+    if (psDBAffectedRows(config->dbh) < 1) {
+        psError(PS_ERR_UNKNOWN, false, "should have affected atleast 1 row");
+        return false;
+    }
+
+    return true;
+}
+
 
 static bool updatedetrunMode(pxConfig *config)

trunk/ippTools/src/dettool.h

@@ -66 +66 @@
     DETTOOL_MODE_REVERTRESIDEXP,
     DETTOOL_MODE_TODETRUNSUMMARY,
-    DETTOOL_MODE_UPDATERESIDEXP,
     DETTOOL_MODE_ADDDETRUNSUMMARY,
     DETTOOL_MODE_DETRUNSUMMARY,
+    DETTOOL_MODE_REVERTDETRUNSUMMARY,
+    DETTOOL_MODE_UPDATERESIDEXP,
     DETTOOL_MODE_UPDATEDETRUN,
     DETTOOL_MODE_RERUN,

trunk/ippTools/src/dettoolConfig.c

@@ -928 +928 @@
             "use the simple output format", false);
 
+    // -revertdetrunsummary
+    psMetadata *revertdetrunsummaryArgs = psMetadataAlloc();
+    psMetadataAddStr(revertdetrunsummaryArgs, PS_LIST_TAIL, "-det_id", 0,
+            "search by detrend ID (required)", NULL);
+    psMetadataAddS32(revertdetrunsummaryArgs, PS_LIST_TAIL, "-iteration", 0,
+            "search by iteration number", 0);
+    psMetadataAddS16(revertdetrunsummaryArgs, PS_LIST_TAIL, "-code",  0,
+            "search by fault code", 0);
+
     // -updatedetrun
     psMetadata *updatedetrunArgs = psMetadataAlloc();
@@ -1070 +1079 @@
     PXTOOL_ADD_MODE("-adddetrunsummary", "", DETTOOL_MODE_ADDDETRUNSUMMARY,adddetrunsummaryArgs);
     PXTOOL_ADD_MODE("-detrunsummary", "", DETTOOL_MODE_DETRUNSUMMARY,detrunsummaryArgs);
+    PXTOOL_ADD_MODE("-revertdetrunsummary", "", DETTOOL_MODE_REVERTDETRUNSUMMARY, revertdetrunsummaryArgs);
     PXTOOL_ADD_MODE("-updatedetrun", "", DETTOOL_MODE_UPDATEDETRUN, updatedetrunArgs);
     PXTOOL_ADD_MODE("-rerun",           "", DETTOOL_MODE_RERUN,         rerunArgs);