Changeset 28266

Timestamp:

Jun 9, 2010, 10:06:18 AM (16 years ago)

Author:

Paul Price

Message:

Don't change the state of an addRun when reverting.

Location:

trunk/ippTools

Files:

• share/Makefile.am (modified) (1 diff)
• share/addtool_reset_faulted_minidvodbruns.sql (deleted)
• share/addtool_reset_faulted_runs.sql (deleted)
• share/addtool_revertminidvodbprocessed.sql (modified) (1 diff)
• share/addtool_revertprocessedexp.sql (modified) (1 diff)
• src/addtool.c (modified) (4 diffs)

trunk/ippTools/share/Makefile.am

@@ -16 +16 @@
      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 \

trunk/ippTools/share/addtool_revertminidvodbprocessed.sql

@@ -5 +5 @@
     AND addRun.minidvodb_name = minidvodbRun.minidvodb_name
     AND minidvodbProcessed.fault != 0
+    AND minidvodbRun.state = 'new'

trunk/ippTools/share/addtool_revertprocessedexp.sql

@@ -7 +7 @@
     AND chipRun.exp_id = rawExp.exp_id
     AND addProcessedExp.fault != 0
+    AND addRun.state = 'new'

trunk/ippTools/src/addtool.c

@@ -431 +431 @@
         return false;
     }
-    
+
     psFree(query);
 
@@ -475 +475 @@
     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 +625 @@
         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 +1448 @@
 
   {
-        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) {