Changeset 28180

Timestamp:

Jun 1, 2010, 2:27:13 PM (16 years ago)

Author:

heather

Message:

fixing up some stuff

File:

• branches/haf_branches/ipp.20100512/ippTools/src/addtool.c (modified) (2 diffs)

branches/haf_branches/ipp.20100512/ippTools/src/addtool.c

@@ -1245 +1245 @@
   }
   
-  // since there is only one exp per 'new' set mindvodbRun.state = 'merging'
-  
-  psString query2 = NULL ;
-  psStringAppend(&query2, "UPDATE minidvodbRun SET state = 'merging' WHERE minidvodb_id = %'" PRIu64, row->minidvodb_id); 
-        
-  if (!p_psDBRunQuery(config->dbh, query2)) {
-    // rollback
-    if (!psDBRollback(config->dbh)) {
-      psError(PS_ERR_UNKNOWN, false, "database error");
-    }
-    psError(PS_ERR_UNKNOWN, false, "database error");
-    psFree(query2);
-    return false;
-  }
-  
 
 
@@ -1317 +1302 @@
   }
   //    
-  
-  
-  psFree(query4);
+psFree(query4);
+
+
+
+// since there is only one exp per 'new' set mindvodbRun.state = 'merged'
+  
+  psString query2 = NULL ;
+  psStringAppend(&query2, "UPDATE minidvodbRun SET state = 'merged' WHERE minidvodb_id = %'" PRIu64, row->minidvodb_id); 
+        
+  if (!p_psDBRunQuery(config->dbh, query2)) {
+    // rollback
+    if (!psDBRollback(config->dbh)) {
+      psError(PS_ERR_UNKNOWN, false, "database error");
+    }
+    psError(PS_ERR_UNKNOWN, false, "database error");
+    psFree(query2);
+    return false;
+  }
+  
+
+
+
+
+  
+  
+ 
   psFree(row);
   psFree(pendingRow);