Index: /trunk/ippTools/share/Makefile.am
===================================================================
--- /trunk/ippTools/share/Makefile.am	(revision 28265)
+++ /trunk/ippTools/share/Makefile.am	(revision 28266)
@@ -16,6 +16,4 @@
      addtool_queue_cam_id.sql \
      addtool_queue_minidvodbrun.sql \
-     addtool_reset_faulted_minidvodbruns.sql \
-     addtool_reset_faulted_runs.sql \
      addtool_revertminidvodbprocessed.sql \
      addtool_revertprocessedexp.sql \
Index: unk/ippTools/share/addtool_reset_faulted_minidvodbruns.sql
===================================================================
--- /trunk/ippTools/share/addtool_reset_faulted_minidvodbruns.sql	(revision 28265)
+++ 	(revision )
@@ -1,6 +1,0 @@
-UPDATE minidvodbProcessed, minidvodbRun, addRun
-SET minidvodbRun.state = 'to_be_merged'
-WHERE
-    minidvodbProcessed.minidvodb_id = minidvodbRun.minidvodb_id
-    AND addRun.minidvodb_id = minidvodbRun.minidvodb_id
-    AND minidvodbProcessed.fault != 0
Index: unk/ippTools/share/addtool_reset_faulted_runs.sql
===================================================================
--- /trunk/ippTools/share/addtool_reset_faulted_runs.sql	(revision 28265)
+++ 	(revision )
@@ -1,8 +1,0 @@
-UPDATE addRun, addProcessedExp, camRun, chipRun, rawExp
-SET addRun.state = 'new'
-WHERE
-    addRun.add_id = addProcessedExp.add_id
-    AND addRun.cam_id = camRun.cam_id
-    AND camRun.chip_id = chipRun.chip_id
-    AND chipRun.exp_id = rawExp.exp_id
-    AND addProcessedExp.fault != 0
Index: /trunk/ippTools/share/addtool_revertminidvodbprocessed.sql
===================================================================
--- /trunk/ippTools/share/addtool_revertminidvodbprocessed.sql	(revision 28265)
+++ /trunk/ippTools/share/addtool_revertminidvodbprocessed.sql	(revision 28266)
@@ -5,2 +5,3 @@
     AND addRun.minidvodb_name = minidvodbRun.minidvodb_name
     AND minidvodbProcessed.fault != 0
+    AND minidvodbRun.state = 'new'
Index: /trunk/ippTools/share/addtool_revertprocessedexp.sql
===================================================================
--- /trunk/ippTools/share/addtool_revertprocessedexp.sql	(revision 28265)
+++ /trunk/ippTools/share/addtool_revertprocessedexp.sql	(revision 28266)
@@ -7,2 +7,3 @@
     AND chipRun.exp_id = rawExp.exp_id
     AND addProcessedExp.fault != 0
+    AND addRun.state = 'new'
Index: /trunk/ippTools/src/addtool.c
===================================================================
--- /trunk/ippTools/src/addtool.c	(revision 28265)
+++ /trunk/ippTools/src/addtool.c	(revision 28266)
@@ -431,5 +431,5 @@
         return false;
     }
-    
+
     psFree(query);
 
@@ -475,12 +475,12 @@
     if (minidvodb_name) {
       psString setName = NULL;
-      psStringAppend (&setName, "UPDATE addRun set minidvodb_name = '%s' where add_id = %" PRId64, minidvodb_name, row->add_id); 
+      psStringAppend (&setName, "UPDATE addRun set minidvodb_name = '%s' where add_id = %" PRId64, minidvodb_name, row->add_id);
       if (!p_psDBRunQuery(config->dbh, setName)) {
-	if (!psDBRollback(config->dbh)) {
-	  psError(PS_ERR_UNKNOWN, false, "database error");
+        if (!psDBRollback(config->dbh)) {
+          psError(PS_ERR_UNKNOWN, false, "database error");
         }
         psError(PS_ERR_UNKNOWN, false, "database error");
-	
-	return false;
+
+        return false;
       }
     }
@@ -625,32 +625,4 @@
         psFree(where);
         return false;
-    }
-
-    {
-        psString query = pxDataGet("addtool_reset_faulted_runs.sql");
-        if (!query) {
-            psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
-            psFree(where);
-            return false;
-        }
-
-        // use psDBGenerateWhereConditionalSQL with AND ... because the SQL ends in a WHERE
-        if (where && psListLength(where->list)) {
-            psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
-            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);
-            psFree(where);
-            return false;
-        }
-        psFree(query);
     }
 
@@ -1476,32 +1448,4 @@
 
   {
-        psString query = pxDataGet("addtool_reset_faulted_minidvodbruns.sql");
-        if (!query) {
-            psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
-            psFree(where);
-            return false;
-        }
-
-        // use psDBGenerateWhereConditionalSQL with AND ... because the SQL ends in a WHERE
-
-        if (where && psListLength(where->list)) {
-          psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
-          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);
-          psFree(where);
-          return false;
-        }
-        psFree(query);
-  }
-  {
     psString query = pxDataGet("addtool_revertminidvodbprocessed.sql");
     if (!query) {