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

Timestamp:

Jan 25, 2008, 2:41:18 PM (18 years ago)

Author:

jhoblitt

Message:

add pxwarpQueueByCamID()
modify camtool so that it can auto-start warp runs

File:

• trunk/ippTools/src/camtool.c (modified) (4 diffs)

trunk/ippTools/src/camtool.c

@@ -27 +27 @@
 
 #include "pxtools.h"
+#include "pxwarp.h"
 #include "camtool.h"
 
@@ -485 +486 @@
         code
     );
-    psFree(pendingRow);
 
     if (!camProcessedExpInsertObject(config->dbh, row)) {
@@ -494 +494 @@
         psError(PS_ERR_UNKNOWN, false, "database error");
         psFree(row);
+        psFree(pendingRow);
         return false;
     }
@@ -501 +502 @@
         psError(PS_ERR_UNKNOWN, false, "failed to change camRun.state for cam_id: %" PRId64, row->cam_id);
         psFree(row);
-        return false;
-    }
-
+        psFree(pendingRow);
+        return false;
+    }
+
+    // should we stop here or proceed on to the warp stage?
+    // NULL for end_stage means go as far as possible
+    // we can't start a warp run unlesss tess_id is defined
+    if ((pendingRow->end_stage && psStrcasestr(pendingRow->end_stage, "cam"))
+        || pendingRow->tess_id == NULL) {
+        psFree(row);
+        psFree(pendingRow);
+        if (!psDBCommit(config->dbh)) {
+            psError(PS_ERR_UNKNOWN, false, "database error");
+            return false;
+        }
+
+        return true;
+    }
     psFree(row);
+    // else continue on...
+
+    if (!pxwarpQueueByCamID(config,
+            pendingRow->cam_id,
+            pendingRow->workdir,
+            pendingRow->dvodb,
+            pendingRow->tess_id,
+            pendingRow->end_stage
+    )) {
+        // rollback
+        if (!psDBRollback(config->dbh)) {
+            psError(PS_ERR_UNKNOWN, false, "database error");
+        }
+        psError(PS_ERR_UNKNOWN, false, "failed to queue new warpRun");
+        psFree(pendingRow);
+        return false;
+    }
+    psFree(pendingRow);
 
     if (!psDBCommit(config->dbh)) {