Index: trunk/ippTools/src/chiptool.c =================================================================== --- trunk/ippTools/src/chiptool.c (revision 23154) +++ trunk/ippTools/src/chiptool.c (revision 23229) @@ -52,9 +52,10 @@ static bool runMode(pxConfig *config); static bool tocleanedimfileMode(pxConfig *config); -static bool tocleanedimfile_from_scrubbedMode(pxConfig *config); +// static bool tocleanedimfile_from_scrubbedMode(pxConfig *config); static bool tofullimfileMode(pxConfig *config); static bool topurgedimfileMode(pxConfig *config); static bool exportrunMode(pxConfig *config); static bool importrunMode(pxConfig *config); +static bool change_imfile_data_state(pxConfig *config, psString data_state, psString run_state); # define MODECASE(caseName, func) \ @@ -92,5 +93,5 @@ MODECASE(CHIPTOOL_MODE_RUN, runMode); MODECASE(CHIPTOOL_MODE_TOCLEANEDIMFILE, tocleanedimfileMode); - MODECASE(CHIPTOOL_MODE_TOCLEANEDIMFILE_FROM_SCRUBBED, tocleanedimfile_from_scrubbedMode); + // MODECASE(CHIPTOOL_MODE_TOCLEANEDIMFILE_FROM_SCRUBBED, tocleanedimfile_from_scrubbedMode); MODECASE(CHIPTOOL_MODE_TOFULLIMFILE, tofullimfileMode); MODECASE(CHIPTOOL_MODE_TOPURGEDIMFILE, topurgedimfileMode); @@ -651,13 +652,36 @@ PXOPT_COPY_S64(config->args, where, "-chip_id", "chip_id", "=="); PXOPT_COPY_STR(config->args, where, "-class_id", "class_id", "=="); - PXOPT_LOOKUP_S16(code, config->args, "-code", true, false); - - if (!pxSetFaultCode(config->dbh, "chipProcessedImfile", where, code)) { + PXOPT_LOOKUP_STR(state, config->args, "-set_state", false, false); + PXOPT_LOOKUP_S16(code, config->args, "-code", false, false); + + if (state && code) { + psError(PS_ERR_UNKNOWN, true, "only one of -set_state and -code may be supplied"); + return false; + } + + if (state) { + // make sure that the state string is valid + if (!pxIsValidState(state)) { + psError(PXTOOLS_ERR_DATA, false, "%s is not a valid state", state); + return false; + } + if (!change_imfile_data_state(config, state, "unknown")) { psError(PS_ERR_UNKNOWN, false, "failed to set set fault flag"); return false; - } - psFree(where); - - return true; + } + return true; + } + + if (code) { + if (!pxSetFaultCode(config->dbh, "chipProcessedImfile", where, code)) { + psError(PS_ERR_UNKNOWN, false, "failed to set set fault flag"); + return false; + } + psFree(where); + return true; + } + + psError(PS_ERR_UNKNOWN, true, "one of -set_state or -code must be supplied"); + return false; } @@ -1195,4 +1219,9 @@ // shared code for the modes -tocleanedimfile -tofullimfile -topurgedimfile +// XXX EAM : this function was enforcing only certain transitions with the SQL. However, +// this is getting fairly messy now that we have added a few additional target and +// destination states. I'm disabling these restrictions for now; is there are better way +// to enforce the allowed state transitions? + static bool change_imfile_data_state(pxConfig *config, psString data_state, psString run_state) { @@ -1210,6 +1239,8 @@ } + // XXX this feature is disabled (run_state is ignored) // note only updates if chipRun.state = run_state - if (!p_psDBRunQueryF(config->dbh, query, data_state, chip_id, class_id, run_state)) { + + if (!p_psDBRunQueryF(config->dbh, query, data_state, chip_id, class_id)) { psError(PS_ERR_UNKNOWN, false, "database error"); // rollback @@ -1246,8 +1277,4 @@ { return change_imfile_data_state(config, "cleaned", "goto_cleaned"); -} -static bool tocleanedimfile_from_scrubbedMode(pxConfig *config) -{ - return change_imfile_data_state(config, "cleaned", "goto_scrubbed"); } static bool tofullimfileMode(pxConfig *config) Index: trunk/ippTools/src/chiptoolConfig.c =================================================================== --- trunk/ippTools/src/chiptoolConfig.c (revision 23154) +++ trunk/ippTools/src/chiptoolConfig.c (revision 23229) @@ -172,7 +172,8 @@ // -updateprocessedimfile psMetadata *updateprocessedimfileArgs = psMetadataAlloc(); - psMetadataAddS64(updateprocessedimfileArgs, PS_LIST_TAIL, "-chip_id", 0, "search by chip ID", 0); - psMetadataAddStr(updateprocessedimfileArgs, PS_LIST_TAIL, "-class_id", 0, "search by class ID", NULL); - psMetadataAddS16(updateprocessedimfileArgs, PS_LIST_TAIL, "-code", 0, "set fault code (required)", 0); + psMetadataAddS64(updateprocessedimfileArgs, PS_LIST_TAIL, "-chip_id", 0, "search by chip ID", 0); + psMetadataAddStr(updateprocessedimfileArgs, PS_LIST_TAIL, "-class_id", 0, "search by class ID", NULL); + psMetadataAddS16(updateprocessedimfileArgs, PS_LIST_TAIL, "-code", 0, "set fault code", 0); + psMetadataAddStr(updateprocessedimfileArgs, PS_LIST_TAIL, "-set_state", 0, "set state", NULL); // -promoteexp @@ -234,9 +235,9 @@ psMetadataAddStr(tocleanedimfileArgs, PS_LIST_TAIL, "-class_id", 0, "class ID to update", NULL); - // -tocleanedimfile_from_scrubbed - psMetadata *tocleanedimfile_from_scrubbedArgs = psMetadataAlloc(); - psMetadataAddS64(tocleanedimfile_from_scrubbedArgs, PS_LIST_TAIL, "-chip_id", 0, "chip ID to update", 0); - psMetadataAddStr(tocleanedimfile_from_scrubbedArgs, PS_LIST_TAIL, "-class_id", 0, "class ID to update", NULL); - +// // -tocleanedimfile_from_scrubbed +// psMetadata *tocleanedimfile_from_scrubbedArgs = psMetadataAlloc(); +// psMetadataAddS64(tocleanedimfile_from_scrubbedArgs, PS_LIST_TAIL, "-chip_id", 0, "chip ID to update", 0); +// psMetadataAddStr(tocleanedimfile_from_scrubbedArgs, PS_LIST_TAIL, "-class_id", 0, "class ID to update", NULL); +// // -tofullimfile psMetadata *tofullimfileArgs = psMetadataAlloc(); @@ -280,5 +281,5 @@ PXOPT_ADD_MODE("-run", "show runs", CHIPTOOL_MODE_RUN, runArgs); PXOPT_ADD_MODE("-tocleanedimfile", "set imfile state to cleaned", CHIPTOOL_MODE_TOCLEANEDIMFILE, tocleanedimfileArgs); - PXOPT_ADD_MODE("-tocleanedimfile_from_scrubbed", "set imfile state to cleaned (for goto_scrubbed)", CHIPTOOL_MODE_TOCLEANEDIMFILE_FROM_SCRUBBED, tocleanedimfile_from_scrubbedArgs); + // PXOPT_ADD_MODE("-tocleanedimfile_from_scrubbed", "set imfile state to cleaned (for goto_scrubbed)", CHIPTOOL_MODE_TOCLEANEDIMFILE_FROM_SCRUBBED, tocleanedimfile_from_scrubbedArgs); PXOPT_ADD_MODE("-tofullimfile", "set imfile state to full", CHIPTOOL_MODE_TOFULLIMFILE, tofullimfileArgs); PXOPT_ADD_MODE("-topurgedimfile", "set imfile state to purged", CHIPTOOL_MODE_TOPURGEDIMFILE, topurgedimfileArgs); Index: trunk/ippTools/src/dettoolConfig.c =================================================================== --- trunk/ippTools/src/dettoolConfig.c (revision 23154) +++ trunk/ippTools/src/dettoolConfig.c (revision 23229) @@ -640,13 +640,14 @@ // -residimfile psMetadata *residimfileArgs = psMetadataAlloc(); - psMetadataAddS64(residimfileArgs, PS_LIST_TAIL, "-det_id", 0, "search for detrend ID", 0); - psMetadataAddS32(residimfileArgs, PS_LIST_TAIL, "-iteration", 0, "search for iteration number", 0); - psMetadataAddS64(residimfileArgs, PS_LIST_TAIL, "-exp_id", 0, "search by detrend ID", 0); - psMetadataAddStr(residimfileArgs, PS_LIST_TAIL, "-class_id", 0, "search for class ID", NULL); - psMetadataAddStr(residimfileArgs, PS_LIST_TAIL, "-recip", 0, "search for recipe", NULL); - psMetadataAddU64(residimfileArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + psMetadataAddS64(residimfileArgs, PS_LIST_TAIL, "-det_id", 0, "search for detrend ID", 0); + psMetadataAddS32(residimfileArgs, PS_LIST_TAIL, "-iteration", 0, "search for iteration number", 0); + psMetadataAddS64(residimfileArgs, PS_LIST_TAIL, "-exp_id", 0, "search by detrend ID", 0); + psMetadataAddStr(residimfileArgs, PS_LIST_TAIL, "-class_id", 0, "search for class ID", NULL); + psMetadataAddStr(residimfileArgs, PS_LIST_TAIL, "-recip", 0, "search for recipe", NULL); + psMetadataAddU64(residimfileArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); psMetadataAddBool(residimfileArgs, PS_LIST_TAIL, "-faulted", 0, "only return imfiles with a fault status set", false); psMetadataAddBool(residimfileArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); - psMetadataAddStr(residimfileArgs, PS_LIST_TAIL, "-select_state", 0, "search for state", NULL); + psMetadataAddBool(residimfileArgs, PS_LIST_TAIL, "-included", 0, "restrict results to exposures 'includeded' in the current iteration", false); + psMetadataAddStr(residimfileArgs, PS_LIST_TAIL, "-select_state", 0, "search for state", NULL); // -revertresidimfile Index: trunk/ippTools/src/dettool_processedimfile.c =================================================================== --- trunk/ippTools/src/dettool_processedimfile.c (revision 23154) +++ trunk/ippTools/src/dettool_processedimfile.c (revision 23229) @@ -165,11 +165,4 @@ PS_ASSERT_PTR_NON_NULL(config, false); - bool hasWhere = false; - - PXOPT_LOOKUP_BOOL(included, config->args, "-included", false); - PXOPT_LOOKUP_BOOL(faulted, config->args, "-faulted", false); - PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); - PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); - psMetadata *where = psMetadataAlloc(); PXOPT_COPY_S64(config->args, where, "-det_id", "detProcessedImfile.det_id", "=="); @@ -179,4 +172,10 @@ PXOPT_COPY_STR(config->args, where, "-select_mode", "detRun.mode", "=="); + PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); + PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); + + PXOPT_LOOKUP_BOOL(faulted, config->args, "-faulted", false); + PXOPT_LOOKUP_BOOL(included, config->args, "-included", false); + psString query = pxDataGet("dettool_processedimfile.sql"); if (!query) { @@ -186,4 +185,5 @@ } + bool hasWhere = false; if (psListLength(where->list)) { psString whereClause = psDBGenerateWhereSQL(where, NULL); @@ -211,4 +211,5 @@ if (faulted) { + // list only faulted rows psStringAppend(&query, " %s", " detProcessedImfile.fault != 0"); } else { Index: trunk/ippTools/src/dettool_residimfile.c =================================================================== --- trunk/ippTools/src/dettool_residimfile.c (revision 23154) +++ trunk/ippTools/src/dettool_residimfile.c (revision 23229) @@ -159,5 +159,7 @@ PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); + PXOPT_LOOKUP_BOOL(faulted, config->args, "-faulted", false); + PXOPT_LOOKUP_BOOL(included, config->args, "-included", false); psString query = pxDataGet("dettool_residimfile.sql"); @@ -175,4 +177,14 @@ } psFree(where); + + // restrict search to included imfiles + if (included) { + if (hasWhere) { + psStringAppend(&query, " AND detInputExp.include = 1"); + } else { + psStringAppend(&query, " WHERE detInputExp.include = 1"); + } + hasWhere = true; + } if (hasWhere) { Index: trunk/ippTools/src/warptool.c =================================================================== --- trunk/ippTools/src/warptool.c (revision 23154) +++ trunk/ippTools/src/warptool.c (revision 23229) @@ -55,4 +55,5 @@ static bool updateskyfileMode(pxConfig *config); +static bool change_skyfile_data_state(pxConfig *config, psString data_state, psString run_state); static bool parseAndInsertSkyCellMap(pxConfig *config, const char *mapfile); static bool isValidMode(pxConfig *config, const char *mode); @@ -1604,4 +1605,9 @@ // shared code for the modes -tocleanedskyfile -tofullskyfile -topurgedskyfile +// XXX EAM : this function was enforcing only certain transitions with the SQL. However, +// this is getting fairly messy now that we have added a few additional target and +// destination states. I'm disabling these restrictions for now; is there are better way +// to enforce the allowed state transitions? + static bool change_skyfile_data_state(pxConfig *config, psString data_state, psString run_state) { @@ -1619,6 +1625,8 @@ } + // XXX this feature is disabled (run_state is ignored) // note only updates if warpRun.state = run_state - if (!p_psDBRunQueryF(config->dbh, query, data_state, warp_id, skycell_id, run_state)) { + + if (!p_psDBRunQueryF(config->dbh, query, data_state, warp_id, skycell_id)) { psError(PS_ERR_UNKNOWN, false, "database error"); // rollback @@ -1668,14 +1676,37 @@ PXOPT_LOOKUP_S64(warp_id, config->args, "-warp_id", true, false); PXOPT_LOOKUP_STR(skycell_id, config->args, "-skycell_id", true, false); + PXOPT_LOOKUP_STR(state, config->args, "-set_state", false, false); PXOPT_LOOKUP_S16(code, config->args, "-code", false, false); - psString query = pxDataGet("warptool_updateskyfile.sql"); - - if (!p_psDBRunQueryF(config->dbh, query, code, warp_id, skycell_id)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - return false; - } - psFree(query); - - return true; -} + if (state && code) { + psError(PS_ERR_UNKNOWN, true, "only one of -set_state and -code may be supplied"); + return false; + } + + if (state) { + // make sure that the state string is valid + if (!pxIsValidState(state)) { + psError(PXTOOLS_ERR_DATA, false, "%s is not a valid state", state); + return false; + } + if (!change_skyfile_data_state(config, state, "unknown")) { + psError(PS_ERR_UNKNOWN, false, "failed to set set fault flag"); + return false; + } + return true; + } + + if (code) { + psString query = pxDataGet("warptool_updateskyfile.sql"); + + if (!p_psDBRunQueryF(config->dbh, query, code, warp_id, skycell_id)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + return false; + } + psFree(query); + return true; + } + + psError(PS_ERR_UNKNOWN, true, "one of -set_state or -code must be supplied"); + return false; +} Index: trunk/ippTools/src/warptoolConfig.c =================================================================== --- trunk/ippTools/src/warptoolConfig.c (revision 23154) +++ trunk/ippTools/src/warptoolConfig.c (revision 23229) @@ -348,9 +348,10 @@ psMetadataAddStr(tofullskyfileArgs, PS_LIST_TAIL, "-skycell_id", 0, "skycell ID to update", NULL); - // -toupdateskyfile + // -updateskyfile psMetadata *updateskyfileArgs = psMetadataAlloc(); - psMetadataAddS64(updateskyfileArgs, PS_LIST_TAIL, "-warp_id", 0, "warptool ID to update", 0); + psMetadataAddS64(updateskyfileArgs, PS_LIST_TAIL, "-warp_id", 0, "warptool ID to update", 0); psMetadataAddStr(updateskyfileArgs, PS_LIST_TAIL, "-skycell_id", 0, "skycell ID to update", NULL); - psMetadataAddS16(updateskyfileArgs, PS_LIST_TAIL, "-code", 0, "new fault code", 0); + psMetadataAddS16(updateskyfileArgs, PS_LIST_TAIL, "-code", 0, "set fault code", 0); + psMetadataAddStr(updateskyfileArgs, PS_LIST_TAIL, "-set_state", 0, "set state", NULL); psFree(now);