Changeset 25299 for trunk/ippTools/src/camtool.c

Timestamp:

Sep 8, 2009, 5:32:55 PM (17 years ago)

Author:

watersc1

Message:

Merge my branch back into the trunk. This includes:

ipp_cleanup.pl : and associated edits to allow cleanup to work
burntool : updated to newest version, ipp_apply_burntool.pl modified to use persist=t options
ppImageBurntoolMask.c : masks region burntool identifies
psastro : allow selection of wcs header format
addtool : splits addstar step off from the camera stage

Location:

trunk

Files:

• . (modified) (1 prop)
• ippTools/src/camtool.c (modified) (1 diff)

trunk/ippTools/src/camtool.c

@@ -656 +656 @@
         return false;
     }
+
+    if (!pxaddQueueByCamID(config,
+                           pendingRow->cam_id,
+                           pendingRow->workdir,
+                           pendingRow->label,
+                           pendingRow->reduction,
+                           pendingRow->dvodb
+    )) {
+        // rollback
+        if (!psDBRollback(config->dbh)) {
+            psError(PS_ERR_UNKNOWN, false, "database error");
+        }
+        psError(PS_ERR_UNKNOWN, false, "failed to queue new addRun");
+        psFree(pendingRow);
+        return false;
+    }
+
     psFree(pendingRow);