Changeset 21463 for trunk/ippTools/src/chiptool.c

Timestamp:

Feb 13, 2009, 8:51:50 AM (17 years ago)

Author:

bills

Message:

Add new tasks to handle promotion of exposures from chip to camera stage
and from camera to fake. Remove unreliable attempts to promote automatically
in the processed imfile mode. Add new -promoteexp modes to be called from
the tasks.

File:

• trunk/ippTools/src/chiptool.c (modified) (11 diffs)

trunk/ippTools/src/chiptool.c

@@ -42 +42 @@
 static bool revertprocessedimfileMode(pxConfig *config);
 static bool updateprocessedimfileMode(pxConfig *config);
+static bool promoteexpMode(pxConfig *config);
 static bool blockMode(pxConfig *config);
 static bool maskedMode(pxConfig *config);
@@ -54 +55 @@
 static bool topurgedimfileMode(pxConfig *config);
 
-static bool chipProcessedCompleteExp(pxConfig *config);
-
 # define MODECASE(caseName, func) \
     case caseName: \
@@ -80 +79 @@
         MODECASE(CHIPTOOL_MODE_REVERTPROCESSEDIMFILE,   revertprocessedimfileMode);
         MODECASE(CHIPTOOL_MODE_UPDATEPROCESSEDIMFILE,   updateprocessedimfileMode);
+        MODECASE(CHIPTOOL_MODE_PROMOTEEXP,              promoteexpMode);
         MODECASE(CHIPTOOL_MODE_BLOCK,                   blockMode);
         MODECASE(CHIPTOOL_MODE_MASKED,                  maskedMode);
@@ -495 +495 @@
     }
 
+#if 0
     // XXX I've decided to make the transaction cover the Exp migration as
     // well.  Otherwise, if the last imfile in an exp is moved and the exp
@@ -508 +509 @@
         return false;
     }
+#endif
 
     if (!psDBCommit(config->dbh)) {
@@ -1074 +1076 @@
 
 
-static bool chipProcessedCompleteExp(pxConfig *config)
+static bool promoteexpMode(pxConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(config, false);
+
+    PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
+
+    psMetadata *where = psMetadataAlloc();
+    PXOPT_COPY_STR(config->args, where, "-label", "label", "==");
 
     // look for completed chipPendingExp
@@ -1086 +1093 @@
     }
 
+    if (where && psListLength(where->list)) {
+        psString whereClause = psDBGenerateWhereSQL(where, NULL);
+        psStringAppend(&query, " %s", whereClause);
+        psFree(whereClause);
+    }
+    psFree(where);
+
+    // treat limit == 0 as "no limit"
+    if (limit) {
+        psString limitString = psDBGenerateLimitSQL(limit);
+        psStringAppend(&query, " %s", limitString);
+        psFree(limitString);
+    }
+
     if (!p_psDBRunQuery(config->dbh, query)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
@@ -1108 +1129 @@
 
         chipRunRow *chipRun = chipRunObjectFromMetadata(row);
+        if (!psDBTransaction(config->dbh)) {
+            psError(PS_ERR_UNKNOWN, false, "database error");
+            return false;
+        }
+
         // set chipRun.state to 'stop'
         if (!pxchipRunSetState(config, chipRun->chip_id, "full")) {
@@ -1119 +1145 @@
         // NULL for end_stage means go as far as possible
         if (chipRun->end_stage && psStrcasestr(chipRun->end_stage, "chip")) {
+            if (!psDBCommit(config->dbh)) {
+                psError(PS_ERR_UNKNOWN, false, "database error");
+                return false;
+            }
+
             psFree(chipRun);
             continue;
@@ -1136 +1167 @@
                     chipRun->end_stage
         )) {
-            // rollback
-            if (!psDBRollback(config->dbh)) {
+           if (!psDBRollback(config->dbh)) {
                 psError(PS_ERR_UNKNOWN, false, "database error");
             }
@@ -1145 +1175 @@
             return false;
         }
+        if (!psDBCommit(config->dbh)) {
+            psError(PS_ERR_UNKNOWN, false, "database error");
+            return false;
+        }
         psFree(chipRun);
     }