Changeset 16985

Timestamp:

Mar 13, 2008, 12:16:21 PM (18 years ago)

Author:

jhoblitt

Message:

fix camtool -revertprocessedexp

Location:

trunk/ippTools

Files:

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

trunk/ippTools/share/Makefile.am

@@ -5 +5 @@
         camtool_find_chip_id.sql \
         camtool_queue_chip_id.sql \
+        camtool_reset_faulted_runs.sql \
         camtool_revertprocessedexp.sql \
         chiptool_completely_processed_exp.sql \

trunk/ippTools/src/camtool.c

@@ -647 +647 @@
     PS_ASSERT_PTR_NON_NULL(config, false);
 
-    psString query = pxDataGet("camtool_revertprocessedexp.sql");
+    if (!psDBTransaction(config->dbh)) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        return false;
+    }
+
+{
+    psString query = pxDataGet("camtool_reset_faulted_runs.sql");
     if (!query) {
         psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
@@ -660 +666 @@
 
     if (!p_psDBRunQuery(config->dbh, query)) {
+        // rollback
+        if (!psDBRollback(config->dbh)) {
+            psError(PS_ERR_UNKNOWN, false, "database error");
+        }
         psError(PS_ERR_UNKNOWN, false, "database error");
         psFree(query);
@@ -665 +675 @@
     }
     psFree(query);
+}
+
+{
+    psString query = pxDataGet("camtool_revertprocessedexp.sql");
+    if (!query) {
+        // rollback
+        if (!psDBRollback(config->dbh)) {
+            psError(PS_ERR_UNKNOWN, false, "database error");
+        }
+        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+        return false;
+    }
+
+    if (config->where) {
+        psString whereClause = psDBGenerateWhereConditionSQL(config->where, "camProcessedExp");
+        psStringAppend(&query, " AND %s", whereClause);
+        psFree(whereClause);
+    }
+
+    if (!p_psDBRunQuery(config->dbh, query)) {
+        // rollback
+        if (!psDBRollback(config->dbh)) {
+            psError(PS_ERR_UNKNOWN, false, "database error");
+        }
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        psFree(query);
+        return false;
+    }
+    psFree(query);
+}
 
     if (psDBAffectedRows(config->dbh) < 1) {
+        // rollback
+        if (!psDBRollback(config->dbh)) {
+            psError(PS_ERR_UNKNOWN, false, "database error");
+        }
         psError(PS_ERR_UNKNOWN, false, "should have affected atleast 1 row");
+        return false;
+    }
+
+    if (!psDBCommit(config->dbh)) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
         return false;
     }