Changeset 23381

Timestamp:

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

Author:

bills

Message:

add chipRun.magicked

Location:

trunk/ippTools

Files:

• share/chiptool_completely_processed_exp.sql (modified) (1 diff)
• src/chiptool.c (modified) (8 diffs)
• src/chiptoolConfig.c (modified) (2 diffs)
• src/pxchip.h (modified) (1 diff)

trunk/ippTools/share/chiptool_completely_processed_exp.sql

@@ -11 +11 @@
     dvodb,
     tess_id,
-    end_stage
+    end_stage,
+    all_files_magicked as magicked
 FROM
     (SELECT
         chipRun.*,
         rawImfile.class_id as rawimfile_class_id,
-        chipProcessedImfile.class_id
+        chipProcessedImfile.class_id,
+        SUM(!chipProcessedImfile.magicked) = 0 as all_files_magicked
     FROM chipRun
     JOIN rawImfile

trunk/ippTools/src/chiptool.c

@@ -209 +209 @@
             return false;
         }
-
+        //
         // queue the exp
         if (!pxchipQueueByExpTag(config, exp_id, workdir, label, reduction, expgroup, dvodb, tess_id, end_stage)) {
@@ -415 +415 @@
     PXOPT_LOOKUP_F32(n_cr, config->args,           "-n_cr", false, false);
     PXOPT_LOOKUP_STR(path_base, config->args,      "-path_base", false, false);
+    PXOPT_LOOKUP_BOOL(magicked, config->args,      "-magicked", false);
 
     // default values
@@ -490 +491 @@
                                    path_base,
                                    code,
-                                   0    // magic_ds_id
+                                   magicked
             )) {
         // rollback
@@ -540 +541 @@
     PXOPT_COPY_STR(config->args, where, "-reduction", "chipRun.reduction", "==");
     PXOPT_COPY_STR(config->args, where, "-label", "chipRun.label", "LIKE");
+    PXOPT_COPY_S32(config->args, where, "-magicked", "chipRun.magicked", "==");
 
     psString query = pxDataGet("chiptool_processedimfile.sql");
@@ -1137 +1139 @@
         }
 
-        // set chipRun.state to 'stop'
-        if (!pxchipRunSetState(config, chipRun->chip_id, "full")) {
+        // set chipRun.state to 'stop' and update the magicked state
+        if (!pxchipRunSetState(config, chipRun->chip_id, "full", chipRun->magicked)) {
             psError(PS_ERR_UNKNOWN, false, "failed to change chipRun.state for chip_id: %" PRId64, chipRun->chip_id);
             psFree(chipRun);
@@ -1209 +1211 @@
     }
 
-    // note only updates if chipRun.state = run_state
-    if (!p_psDBRunQueryF(config->dbh, query, data_state, chip_id, class_id, run_state)) {
+    psString set_magic = "";
+    if (!strcmp(data_state, "full")) {
+        // copy the magicked state from the input to the output when transitioning to full state
+        set_magic = "\n , chipProcessedImfile.magicked = rawImfile.magicked";
+    }
+
+    if (!p_psDBRunQueryF(config->dbh, query, data_state, set_magic, chip_id, class_id)) {
+        psFree(query);
         psError(PS_ERR_UNKNOWN, false, "database error");
         // rollback
@@ -1227 +1235 @@
     query = pxDataGet("chiptool_change_exp_state.sql");
     if (!p_psDBRunQueryF(config->dbh, query, data_state, chip_id, data_state)) {
+        psFree(query);
         // rollback
         if (!psDBRollback(config->dbh)) {
@@ -1234 +1243 @@
         return false;
     }
+    psFree(query);
 
     if (!psDBCommit(config->dbh)) {

trunk/ippTools/src/chiptoolConfig.c

@@ -147 +147 @@
     psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-path_base",  0,            "define base output location", NULL);
     psMetadataAddS16(addprocessedimfileArgs, PS_LIST_TAIL, "-code",  0,            "set fault code", 0);
+    psMetadataAddBool(addprocessedimfileArgs, PS_LIST_TAIL, "-magicked",  0,        "define magicked status", false);
 
     // -processedimfile
@@ -155 +156 @@
     psMetadataAddStr(processedimfileArgs,  PS_LIST_TAIL, "-reduction",          0, "search by reduction class", NULL);
     psMetadataAddStr(processedimfileArgs,  PS_LIST_TAIL, "-label",              0, "search by chipRun label (LIKE comparison)", NULL);
+    psMetadataAddBool(processedimfileArgs, PS_LIST_TAIL, "-magicked",  0,        "search by magicked status", false);
     pxchipSetSearchArgs(processedimfileArgs);
     psMetadataAddU64(processedimfileArgs, PS_LIST_TAIL, "-limit",  0,           "limit result set to N items", 0);

trunk/ippTools/src/pxchip.h

@@ -25 +25 @@
 #include "pxtools.h"
 
-bool pxchipRunSetState(pxConfig *config, psS64 chip_id, const char *state);
+bool pxchipRunSetState(pxConfig *config, psS64 chip_id, const char *state, const bool magicked);
 bool pxchipRunSetStateByQuery(pxConfig *config, psMetadata *where, const char *state);
 bool pxchipRunSetLabel(pxConfig *config, psS64 chip_id, const char *label);