Changeset 23386 for trunk/ippTools

Timestamp:

Mar 18, 2009, 10:15:08 AM (17 years ago)

Author:

bills

Message:

add chipRun.magicked

File:

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

trunk/ippTools/src/pxchip.c

@@ -128 +128 @@
 }
 
-bool pxchipRunSetState(pxConfig *config, psS64 chip_id, const char *state)
+bool pxchipRunSetState(pxConfig *config, psS64 chip_id, const char *state, const bool magicked)
 {
     PS_ASSERT_PTR_NON_NULL(config, false);
@@ -139 +139 @@
     }
 
-    char *query = "UPDATE chipRun SET state = '%s' WHERE chip_id = %" PRId64;
-    if (!p_psDBRunQueryF(config->dbh, query, state, chip_id)) {
+    char *query = "UPDATE chipRun SET state = '%s', magicked = %d WHERE chip_id = %" PRId64;
+    if (!p_psDBRunQueryF(config->dbh, query, state, magicked, chip_id)) {
         psError(PS_ERR_UNKNOWN, false,
                 "failed to change state for chip_id %" PRId64, chip_id);
@@ -158 +158 @@
     if (!pxIsValidState(state)) {
         psError(PS_ERR_UNKNOWN, false, "invalid chipRun state: %s", state);
+        return false;
+    }
+
+    if (!strcmp(state, "full")) {
+        // There are states that need to be met for a run to be set to full that we don't
+        // check here.
+        // for example all of the run's Imfiles must have chipProcessedImfile.data_state == "full"
+        // chipRun.magicked = (SUM(!chipProcessedImfile.magicked) = 0)
+        // so don't do allow setting the state to full
+        psError(PS_ERR_UNKNOWN, true, "cannot use -updaterun so set chipRun state to full");
         return false;
     }
@@ -253 +263 @@
             dvodb,
             tess_id,
-            end_stage)
+            end_stage, 
+            0           // magicked
+            )
     ) {
         if (!psDBRollback(config->dbh)) {