Changeset 14098

Timestamp:

Jul 10, 2007, 10:30:39 AM (19 years ago)

Author:

jhoblitt

Message:

add regtool -revertprocessedexp

Location:

trunk/ippTools

Files:

• share/Makefile.am (modified) (1 diff)
• share/regtool_revertprocessedexp.sql (added)
• src/regtool.c (modified) (5 diffs)
• src/regtool.h (modified) (1 diff)
• src/regtoolConfig.c (modified) (4 diffs)

trunk/ippTools/share/Makefile.am

@@ -29 +29 @@
         regtool_processedexp.sql \
         regtool_processedimfile.sql \
+        regtool_revertprocessedexp.sql \
         regtool_revertprocessedimfile.sql \
         stacktool_inputskyfile.sql \

trunk/ippTools/src/regtool.c

@@ -31 +31 @@
 #include "chiptool.h"
 
+// imfile
 static bool pendingimfileMode(pxConfig *config);
 static bool addprocessedimfileMode(pxConfig *config);
@@ -36 +37 @@
 static bool revertprocessedimfileMode(pxConfig *config);
 static bool updateprocessedimfileMode(pxConfig *config);
-
+// exp
 static bool pendingexpMode(pxConfig *config);
 static bool addprocessedexpMode(pxConfig *config);
 static bool processedexpMode(pxConfig *config);
+static bool revertprocessedexpMode(pxConfig *config);
 static bool updateprocessedexpMode(pxConfig *config);
 
@@ -70 +72 @@
 
     switch (config->mode) {
+        // imfile
         MODECASE(REGTOOL_MODE_PENDINGIMFILE,         pendingimfileMode);
         MODECASE(REGTOOL_MODE_ADDPROCESSEDIMFILE,    addprocessedimfileMode);
@@ -75 +78 @@
         MODECASE(REGTOOL_MODE_REVERTPROCESSEDIMFILE, revertprocessedimfileMode);
         MODECASE(REGTOOL_MODE_UPDATEPROCESSEDIMFILE, updateprocessedimfileMode);
+        // exp
         MODECASE(REGTOOL_MODE_PENDINGEXP,            pendingexpMode);
         MODECASE(REGTOOL_MODE_ADDPROCESSEDEXP,       addprocessedexpMode);
         MODECASE(REGTOOL_MODE_PROCESSEDEXP,          processedexpMode);
+        MODECASE(REGTOOL_MODE_REVERTPROCESSEDEXP,    revertprocessedexpMode);
         MODECASE(REGTOOL_MODE_UPDATEPROCESSEDEXP,    updateprocessedexpMode);
         default:
@@ -816 +821 @@
 
     psFree(output);
+
+    return true;
+}
+
+static bool revertprocessedexpMode(pxConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(config, false);
+
+    psString query = pxDataGet("regtool_revertprocessedexp.sql");
+    if (!query) {
+        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+        return false;
+    }
+
+    if (config->where) {
+        psString whereClause = psDBGenerateWhereConditionSQL(config->where, "rawExp");
+        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;

trunk/ippTools/src/regtool.h

@@ -33 +33 @@
     REGTOOL_MODE_ADDPROCESSEDEXP,
     REGTOOL_MODE_PROCESSEDEXP,
+    REGTOOL_MODE_REVERTPROCESSEDEXP,
     REGTOOL_MODE_UPDATEPROCESSEDEXP,
 } regtoolMode;

trunk/ippTools/src/regtoolConfig.c

@@ -252 +252 @@
         "use the simple output format", false);
 
+    // -revertprocessedimfile
+    psMetadata *revertprocessedexpArgs = psMetadataAlloc();
+    psMetadataAddStr(revertprocessedexpArgs, PS_LIST_TAIL, "-exp_id",  0,
+            "search by exposure ID (required)", NULL);
+    psMetadataAddS16(revertprocessedexpArgs, PS_LIST_TAIL, "-code",  0,
+            "search by fault code", 0);
+
     // -updatedprocessedexp
     psMetadata *updatedprocessedexpArgs = psMetadataAlloc();
@@ -271 +278 @@
     PXTOOL_ADD_MODE("-addprocessedexp",         "",  REGTOOL_MODE_ADDPROCESSEDEXP, addprocessedexpArgs);
     PXTOOL_ADD_MODE("-processedexp",            "",     REGTOOL_MODE_PROCESSEDEXP, processedexpArgs);
+    PXTOOL_ADD_MODE("-revertprocessedexp",      "", REGTOOL_MODE_REVERTPROCESSEDEXP, revertprocessedexpArgs);
     PXTOOL_ADD_MODE("-updateprocessedexp",      "",  REGTOOL_MODE_UPDATEPROCESSEDEXP,      updatedprocessedexpArgs);
 
@@ -298 +306 @@
 }
 
+#define addWhereS16(name) \
+{ \
+    psS16 s16 = 0; \
+    bool status = false; \
+    if ((s16= psMetadataLookupS16(&status, config->args, "-" #name))) { \
+        if (!psMetadataAddS16(config->where, PS_LIST_TAIL, #name, 0, "==", s16)) { \
+            psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \
+            psFree(config); \
+            return NULL; \
+        } \
+    } \
+}
+
     // generate SQL where clause
     config->where = psMetadataAlloc();
@@ -320 +341 @@
     addWhereStr(tmp_class_id);
     addWhereStr(filter);
+    addWhereS16(code);
 
     if (config->where->list->n < 1) {