Changeset 7969 for trunk/ippTools/src/pztool.c

Timestamp:

Jul 24, 2006, 4:29:23 PM (20 years ago)

Author:

jhoblitt

Message:

change copydoneMode() to be transactional

File:

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

trunk/ippTools/src/pztool.c

@@ -126 +126 @@
     }
 
-    // XXX start transaction
+    // start a transaction so we don't end up with entries in newImfile that
+    // haven't been removed from pzPendingImfile
+    if (!psDBTransaction(config->dbh)) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        psFree(pending);
+        return false;
+    }
 
     for (long i = 0; i < pending->n; i++) {
@@ -140 +146 @@
         if (!newImfileInsertObject(config->dbh, newImfile)) {
             psError(PS_ERR_UNKNOWN, false, "dbh access failed");
+            psFree(newImfile);
             return false;
         }
+
+        psFree(newImfile);
     }
 
     if (pzPendingImfileDeleteRowObjects(config->dbh, pending, MAX_ROWS)
         < 0) {
-            psError(PS_ERR_UNKNOWN, false, "dbh access failed");
-            return false;
-    }
-
-    // XXX commit transaction
+        psError(PS_ERR_UNKNOWN, false, "dbh access failed");
+        psFree(pending);
+        return false;
+    }
+    psFree(pending);
+
+    // point of no return 
+    if (!psDBCommit(config->dbh)) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        return false;
+    }
 
     // check for completed exps