Changeset 14240

Timestamp:

Jul 16, 2007, 2:25:26 PM (19 years ago)

Author:

jhoblitt

Message:

add dettool -revertprocessedexp
add dettool -revertprocessedimfile

Location:

trunk/ippTools

Files:

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

trunk/ippTools/share/Makefile.am

@@ -16 +16 @@
         dettool_raw.sql \
         dettool_start_new_iteration.sql \
+        dettool_revertprocessedexp.sql \
+        dettool_revertprocessedimfile.sql \
         dettool_todetrunsummary.sql \
         dettool_tonormalizedexp.sql \

trunk/ippTools/src/dettool.c

@@ -41 +41 @@
 static bool inputMode(pxConfig *config);
 static bool rawMode(pxConfig *config);
+// imfile
 static bool toprocessedimfileMode(pxConfig *config);
 static bool addprocessedimfileMode(pxConfig *config);
+static bool processedimfileMode(pxConfig *config);
+static bool revertprocessedimfileMode(pxConfig *config);
+// exp
 static bool toprocessedexpMode(pxConfig *config);
 static bool addprocessedexpMode(pxConfig *config);
 static bool processedexpMode(pxConfig *config);
+static bool revertprocessedexpMode(pxConfig *config);
+// stacked
 static bool tostackedMode(pxConfig *config);
-static bool processedimfileMode(pxConfig *config);
 static bool addstackedMode(pxConfig *config);
 static bool stackedMode(pxConfig *config);
@@ -113 +118 @@
         MODECASE(DETTOOL_MODE_INPUT,            inputMode);
         MODECASE(DETTOOL_MODE_RAW,              rawMode);
+        // imfile
         MODECASE(DETTOOL_MODE_TOPROCESSEDIMFILE,toprocessedimfileMode);
         MODECASE(DETTOOL_MODE_ADDPROCESSEDIMFILE,addprocessedimfileMode);
         MODECASE(DETTOOL_MODE_PROCESSEDIMFILE,  processedimfileMode);
+        MODECASE(DETTOOL_MODE_REVERTPROCESSEDIMFILE, revertprocessedimfileMode);
+        // exp
         MODECASE(DETTOOL_MODE_TOPROCESSEDEXP,   toprocessedexpMode);
         MODECASE(DETTOOL_MODE_ADDPROCESSEDEXP,  addprocessedexpMode);
         MODECASE(DETTOOL_MODE_PROCESSEDEXP,     processedexpMode);
+        MODECASE(DETTOOL_MODE_REVERTPROCESSEDEXP, revertprocessedexpMode);
+        // stacked
         MODECASE(DETTOOL_MODE_TOSTACKED,        tostackedMode);
         MODECASE(DETTOOL_MODE_ADDSTACKED,       addstackedMode);
@@ -2760 +2770 @@
 }
 
+
+static bool revertprocessedexpMode(pxConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(config, false);
+
+    psString query = pxDataGet("dettool_revertprocessedexp.sql");
+    if (!query) {
+        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+        return false;
+    }
+
+    if (config->where) {
+        psString whereClause = psDBGenerateWhereConditionSQL(config->where, "detProcessedExp");
+        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 tostackedMode(pxConfig *config)
 {
@@ -2955 +2998 @@
     return true;
 }
+
+
+static bool revertprocessedimfileMode(pxConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(config, false);
+
+    psString query = pxDataGet("dettool_revertprocessedimfile.sql");
+    if (!query) {
+        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+        return false;
+    }
+
+    if (config->where) {
+        psString whereClause = psDBGenerateWhereConditionSQL(config->where, "detProcessedImfile");
+        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 addstackedMode(pxConfig *config)

trunk/ippTools/src/dettool.h

@@ -36 +36 @@
     DETTOOL_MODE_ADDPROCESSEDIMFILE,
     DETTOOL_MODE_PROCESSEDIMFILE,
+    DETTOOL_MODE_REVERTPROCESSEDIMFILE,
     DETTOOL_MODE_TOPROCESSEDEXP,
     DETTOOL_MODE_ADDPROCESSEDEXP,
     DETTOOL_MODE_PROCESSEDEXP,
+    DETTOOL_MODE_REVERTPROCESSEDEXP,
     DETTOOL_MODE_TOSTACKED,
     DETTOOL_MODE_ADDSTACKED,

trunk/ippTools/src/dettoolConfig.c

@@ -381 +381 @@
             "use the simple output format", false);
 
+    // -revertprocessedimfile
+    psMetadata *revertprocessedimfileArgs = psMetadataAlloc();
+    psMetadataAddStr(revertprocessedimfileArgs, PS_LIST_TAIL, "-det_id",  0,
+            "search for detrend ID (required)", NULL);
+    psMetadataAddStr(revertprocessedimfileArgs, PS_LIST_TAIL, "-exp_id",  0,
+            "search by exposure ID", NULL);
+    psMetadataAddStr(revertprocessedimfileArgs, PS_LIST_TAIL, "-class_id",  0,
+            "search by class ID", NULL);
+    psMetadataAddS16(revertprocessedimfileArgs, PS_LIST_TAIL, "-code",  0,
+            "search by fault code", 0);
+
     // -toprocessedexp
     psMetadata *toprocessedexpArgs = psMetadataAlloc();
@@ -435 +446 @@
     psMetadataAddBool(processedexpArgs, PS_LIST_TAIL, "-simple",  0,
             "use the simple output format", false);
+
+    // -revertprocessedexp
+    psMetadata *revertprocessedexpArgs = psMetadataAlloc();
+    psMetadataAddStr(revertprocessedexpArgs, PS_LIST_TAIL, "-det_id",  0,
+            "search by detrend ID (required)", NULL);
+    psMetadataAddStr(revertprocessedexpArgs, PS_LIST_TAIL, "-exp_id",  0,
+            "search by exposure ID", NULL);
+    psMetadataAddS16(revertprocessedexpArgs, PS_LIST_TAIL, "-code",  0,
+            "search by fault code", 0);
 
     // -tostacked
@@ -935 +955 @@
     PXTOOL_ADD_MODE("-addprocessedimfile", "", DETTOOL_MODE_ADDPROCESSEDIMFILE,  addprocessedimfileArgs);
     PXTOOL_ADD_MODE("-processedimfile", "", DETTOOL_MODE_PROCESSEDIMFILE, processedimfileArgs);
+    PXTOOL_ADD_MODE("-revertprocessedimfile", "", DETTOOL_MODE_REVERTPROCESSEDIMFILE, revertprocessedimfileArgs);
     PXTOOL_ADD_MODE("-toprocessedexp",  "", DETTOOL_MODE_TOPROCESSEDEXP,  toprocessedexpArgs);
     PXTOOL_ADD_MODE("-addprocessedexp", "", DETTOOL_MODE_ADDPROCESSEDEXP, addprocessedexpArgs);
+    PXTOOL_ADD_MODE("-revertprocessedexp", "", DETTOOL_MODE_REVERTPROCESSEDEXP, revertprocessedexpArgs);
     PXTOOL_ADD_MODE("-processedexp",    "", DETTOOL_MODE_PROCESSEDEXP, processedexpArgs);
     PXTOOL_ADD_MODE("-tostacked",       "", DETTOOL_MODE_TOSTACKED,     tostackedArgs);
@@ -1059 +1081 @@
     }
 
+    // convert '-code' to 'fault'
+    {
+        psS16 fault = 0;
+        bool status = false;
+        if ((fault = psMetadataLookupS16(&status, config->args, "-code"))) {
+            if (!psMetadataAddS16(config->where, PS_LIST_TAIL, "fault", 0, "==", fault)) {
+                psError(PS_ERR_UNKNOWN, false, "failed to add item fault");
+                psFree(config);
+                return NULL;
+            }
+        }
+    }
+
     if (config->where->list->n < 1) {
         psFree(config->where);