Changeset 35799 for trunk/ippTools

Timestamp:

Jul 11, 2013, 12:16:06 PM (13 years ago)

Author:

bills

Message:

handle reverting faults for camRuns in state update

Location:

trunk/ippTools

Files:

• share/Makefile.am (modified) (1 diff)
• share/camtool_revertupdatedexp.sql (added)
• src/camtool.c (modified) (3 diffs)

trunk/ippTools/share/Makefile.am

@@ -75 +75 @@
         camtool_queue_chip_id.sql \
         camtool_revertprocessedexp.sql \
+        camtool_revertupdatedexp.sql \
         camtool_export_run.sql \
         camtool_export_processed_exp.sql \

trunk/ippTools/src/camtool.c

@@ -938 +938 @@
     }
 
+    psString whereClause = NULL;
     {
         psString query = pxDataGet("camtool_revertprocessedexp.sql");
@@ -952 +953 @@
         // use psDBGenerateWhereConditionalSQL with AND ... because the SQL ends in a WHERE
         if (where && psListLength(where->list)) {
-            psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
+            whereClause = psDBGenerateWhereConditionSQL(where, NULL);
             psStringAppend(&query, " AND %s", whereClause);
-            psFree(whereClause);
         }
 
@@ -977 +977 @@
     }
     psLogMsg("camtool", PS_LOG_INFO, "Deleted %d camProcessedExps", numDeleted);
+
+    {
+        psString query = pxDataGet("camtool_revertupdatedexp.sql");
+        if (!query) {
+            psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
+            return false;
+        }
+
+        if (whereClause) {
+            psStringAppend(&query, "\n AND %s", whereClause);
+            psFree(whereClause);
+        }
+
+        if (!p_psDBRunQuery(config->dbh, query)) {
+            psError(PS_ERR_UNKNOWN, false, "database error");
+            psFree(query);
+            return false;
+        }
+        psFree(query);
+    }
+    int numUpdated = psDBAffectedRows(config->dbh);
+    psLogMsg("camtool", PS_LOG_INFO, "Updated %d camProcessedExps", numUpdated);
 
     return true;