Changeset 11770

Timestamp:

Feb 13, 2007, 11:57:00 AM (19 years ago)

Author:

jhoblitt

Message:

make p4tool -addoverlap atomic

File:

• trunk/ippTools/src/warptool.c (modified) (2 diffs)

trunk/ippTools/src/warptool.c

@@ -583 +583 @@
     }
 
+    if (!psDBTransaction(config->dbh)) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        return false;
+    }
+
     if (!parseAndInsertSkyCellMap(config, mapfile)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to inject mapfile: %s into the database", mapfile);
+        // rollback
+        if (!psDBRollback(config->dbh)) {
+            psError(PS_ERR_UNKNOWN, false, "database error");
+        }
+        return false;
+    }
+
+    // point of no return
+    if (!psDBCommit(config->dbh)) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        return false;
     }
 
@@ -626 +643 @@
 
         if (!p4SkyCellMapInsertObject(config->dbh, row)) {
-            psError(PS_ERR_UNKNOWN, false, "failed to convert mapfile: %s metdata entry into a p4SkyCellMap object", mapfile);
+            psError(PS_ERR_UNKNOWN, false, "database error");
             psFree(row);
             psFree(iter);