Changeset 16152

Timestamp:

Jan 18, 2008, 4:49:36 PM (18 years ago)

Author:

jhoblitt

Message:

cleanup addprocessedimfileMode()
add end_stage support to chipProcessedCompleteExp()

File:

• branches/end_stage/ippTools/src/chiptool.c (modified) (3 diffs)

branches/end_stage/ippTools/src/chiptool.c

@@ -338 +338 @@
     }
 
-    chipProcessedImfileRow *imfile = chipProcessedImfileRowAlloc(
+    if (!chipProcessedImfileInsert(config->dbh,
         (psS64)atoll(chip_id),
         (psS64)atoll(exp_id),
@@ -363 +363 @@
         path_base,
         code
-    );
-    if (!imfile) {
+    )) {
         // rollback
         if (!psDBRollback(config->dbh)) {
             psError(PS_ERR_UNKNOWN, false, "database error");
         }
-        psError(PS_ERR_UNKNOWN, false, "failed to alloc chipProcessedImfileRow object");
-        return false;
-    }
-    if (!chipProcessedImfileInsertObject(config->dbh, imfile)) {
-        // rollback
-        if (!psDBRollback(config->dbh)) {
-            psError(PS_ERR_UNKNOWN, false, "database error");
-        }
-        psError(PS_ERR_UNKNOWN, false, "database error");
-        psFree(imfile);
-        return false;
-    }
-
-
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        return false;
+    }
 
     // XXX I've decided to make the transaction cover the Exp migration as
@@ -644 +632 @@
             return false;
         }
+
+        // should we stop here or proceed on to the cam stage?
+        if (psStrcasestr(chipRun->end_stage, "chip")) {
+            psFree(chipRun);
+            continue;
+        }
+        // else continue on...
 
         // camQueueChipID() can only be run after chipRun.state has been set to