Index: branches/czw_branch/20110406/ippTools/src/laptool.c =================================================================== --- branches/czw_branch/20110406/ippTools/src/laptool.c (revision 31338) +++ branches/czw_branch/20110406/ippTools/src/laptool.c (revision 31385) @@ -1,4 +1,4 @@ /* - * reproctool.c + * laptool.c */ @@ -13,5 +13,5 @@ #include "pxtools.h" #include "pxdata.h" -#include "reproctool.h" +#include "laptool.h" @@ -38,5 +38,5 @@ psLibInit(NULL); - pxConfig *config = reproctoolConfig(NULL, argc, argv); + pxConfig *config = laptoolConfig(NULL, argc, argv); if (!config) { psError(PXTOOLS_ERR_CONFIG, false, "failed to configure"); @@ -45,17 +45,17 @@ switch (config->mode) { - MODECASE(REPROCTOOL_MODE_DEFINERUN, definerunMode); - MODECASE(REPROCTOOL_MODE_PENDINGRUN, pendingrunMode); - MODECASE(REPROCTOOL_MODE_UPDATERUN, updaterunMode); - - MODECASE(REPROCTOOL_MODE_PENDINGCHIPEXP, pendingchipexpMode); - MODECASE(REPROCTOOL_MODE_PENDINGQUICKSTACK,pendingquickstackMode); - MODECASE(REPROCTOOL_MODE_PENDINGDIFF, pendingdiffMode); - MODECASE(REPROCTOOL_MODE_PENDINGFINALSTACK,pendingfinalstackMode); - MODECASE(REPROCTOOL_MODE_UPDATEEXP, updateexpMode); + MODECASE(LAPTOOL_MODE_DEFINERUN, definerunMode); + MODECASE(LAPTOOL_MODE_PENDINGRUN, pendingrunMode); + MODECASE(LAPTOOL_MODE_UPDATERUN, updaterunMode); + + MODECASE(LAPTOOL_MODE_PENDINGCHIPEXP, pendingchipexpMode); + MODECASE(LAPTOOL_MODE_PENDINGQUICKSTACK,pendingquickstackMode); + MODECASE(LAPTOOL_MODE_PENDINGDIFF, pendingdiffMode); + MODECASE(LAPTOOL_MODE_PENDINGFINALSTACK,pendingfinalstackMode); + MODECASE(LAPTOOL_MODE_UPDATEEXP, updateexpMode); default: psAbort("invalid option (this should not happen)"); } - psTrace("reproctool", 9, "Attempting to free config\n"); + psTrace("laptool", 9, "Attempting to free config\n"); psFree(config); pmConfigDone(); @@ -86,6 +86,6 @@ // Insert the run - if (!reprocRunInsert(config->dbh, - NULL, // re_id + if (!lapRunInsert(config->dbh, + NULL, // lap_id projection_cell, tess_id, @@ -105,9 +105,9 @@ return false; } - psS64 re_id = psDBLastInsertID(config->dbh); + psS64 lap_id = psDBLastInsertID(config->dbh); // Find the input exposures - psString query = pxDataGet("reproctool_definerun.sql"); + psString query = pxDataGet("laptool_definerun.sql"); if (!query) { psError(PXTOOL_ERR_SYS, false, "failed to retrieve SQL statement"); @@ -135,5 +135,5 @@ } if (!psArrayLength(output)) { - psTrace("reproctool", PS_LOG_INFO, "no rows found"); + psTrace("laptool", PS_LOG_INFO, "no rows found"); psFree(output); return(true); @@ -145,8 +145,8 @@ psMetadata *row = output->data[i]; // Row from select bool status; - reprocExpRow *reExp = reprocExpObjectFromMetadata(row); - reExp->re_id = re_id; - - if (!reprocExpInsertObject(config->dbh,reExp)) { + lapExpRow *reExp = lapExpObjectFromMetadata(row); + reExp->lap_id = lap_id; + + if (!lapExpInsertObject(config->dbh,reExp)) { if (!psDBRollback(config->dbh)) { psError(PS_ERR_UNKNOWN, false, "database error"); @@ -169,8 +169,8 @@ psmetadata *where = psMetadataAlloc(); - PXOPT_COPY_S64(config->args, where, "-re_id", "re_id", "=="); + PXOPT_COPY_S64(config->args, where, "-lap_id", "lap_id", "=="); PXOPT_COPY_STR(config->args, where, "-projection_cell", "projection_cell", "=="); - psString query = pxDataGet("reproctool_pendingrun.sql"); + psString query = pxDataGet("laptool_pendingrun.sql"); if (!query) { psError(PXTOOL_ERR_SYS, false, "failed to retrieve SQL statement"); @@ -205,10 +205,10 @@ } if (!psArrayLength(output)) { - psTrace("reproctool", PS_LOG_INFO, "no rows found"); - psFree(output); - return(true); - } - - if (!ippdbPrintMetadatas(stdout, output, "reprocExp", !simple)) { + psTrace("laptool", PS_LOG_INFO, "no rows found"); + psFree(output); + return(true); + } + + if (!ippdbPrintMetadatas(stdout, output, "lapExp", !simple)) { psError(PS_ERR_UNKNOWN, false, "failed to print array"); psFree(output); @@ -225,5 +225,5 @@ psMetadata *where = psMetadataAlloc(); - PXOPT_LOOKUP_S64(re_id, config->args, "-re_id", true, false); + PXOPT_LOOKUP_S64(lap_id, config->args, "-lap_id", true, false); PXOPT_LOOKUP_S16(fault, config->args, "-fault", false, false); PXOPT_LOOKUP_STR(set_state, config->args, "-set_state", false, false); @@ -235,10 +235,10 @@ psMetadata *where = psMetadataAlloc(); - PXOPT_COPY_S64(config->args, where, "-re_id", "re_id", "=="); + PXOPT_COPY_S64(config->args, where, "-lap_id", "lap_id", "=="); // Set a fault if (fault != INT16_MAX) { // this is fairly dangerous : can set all if the where is not set... - if (!pxSetFaultCode(config->dbh, "reprocRun", where, fault, 0)) { + if (!pxSetFaultCode(config->dbh, "lapRun", where, fault, 0)) { psError(PS_ERR_UNKNOWN, false, "failed to set set fault flag"); psFree (where); @@ -255,5 +255,5 @@ // Deactivate exposures - psString query = pxDataGet("reproctool_updaterun_deactivate.sql"); + psString query = pxDataGet("laptool_updaterun_deactivate.sql"); if (!query) { psError(PXTOOL_ERR_SYS, false, "failed to retrieve SQL statement"); @@ -270,8 +270,8 @@ } - char *query = "UPDATE reprocRun SET state = '%s' WHERE re_id = %"PRId64; - if (!p_psDBRunQueryF(config->dbh, query, state, re_id)) { + char *query = "UPDATE lapRun SET state = '%s' WHERE lap_id = %"PRId64; + if (!p_psDBRunQueryF(config->dbh, query, state, lap_id)) { psError(PS_ERR_UNKNOWN, false, - "failed to change state for re_id %"PRId64, re_id); + "failed to change state for lap_id %"PRId64, lap_id); return(false); } @@ -280,15 +280,14 @@ } // Exposure level -static bool pendingchipexpMode(pxConfig *config) -{ - PS_ASSERT_PTR_NON_NULL(config, false); - + +static bool exposuresMode(pxConfig *config) +{ + PS_ASSERT_PTR_NON_NULL(config, false); PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); psmetadata *where = psMetadataAlloc(); - PXOPT_COPY_S64(config->args, where, "-re_id", "re_id", "=="); - PXOPT_COPY_STR(config->args, where, "-filter", "filter", "=="); - - psString query = pxDataGet("reproctool_pendingchipexp.sql"); + PXOPT_COPY_S64(config->args, where, "-lap_id", "lap_id", "=="); + + psString query = pxDataGet("laptool_exposures.sql"); if (!query) { psError(PXTOOL_ERR_SYS, false, "failed to retrieve SQL statement"); @@ -323,10 +322,10 @@ } if (!psArrayLength(output)) { - psTrace("reproctool", PS_LOG_INFO, "no rows found"); - psFree(output); - return(true); - } - - if (!ippdbPrintMetadatas(stdout, output, "reprocExp", !simple)) { + psTrace("laptool", PS_LOG_INFO, "no rows found"); + psFree(output); + return(true); + } + + if (!ippdbPrintMetadatas(stdout, output, "lapExp", !simple)) { psError(PS_ERR_UNKNOWN, false, "failed to print array"); psFree(output); @@ -337,16 +336,18 @@ return(true); - -} -static bool pendingquickstackMode(pxConfig *config) -{ - PS_ASSERT_PTR_NON_NULL(config, false); +} + + +static bool pendingchipexpMode(pxConfig *config) +{ + PS_ASSERT_PTR_NON_NULL(config, false); + PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); psmetadata *where = psMetadataAlloc(); - PXOPT_COPY_S64(config->args, where, "-re_id", "re_id", "=="); + PXOPT_COPY_S64(config->args, where, "-lap_id", "lap_id", "=="); PXOPT_COPY_STR(config->args, where, "-filter", "filter", "=="); - psString query = pxDataGet("reproctool_pendingquickstack.sql"); + psString query = pxDataGet("laptool_pendingchipexp.sql"); if (!query) { psError(PXTOOL_ERR_SYS, false, "failed to retrieve SQL statement"); @@ -381,10 +382,10 @@ } if (!psArrayLength(output)) { - psTrace("reproctool", PS_LOG_INFO, "no rows found"); - psFree(output); - return(true); - } - - if (!ippdbPrintMetadatas(stdout, output, "reprocExp", !simple)) { + psTrace("laptool", PS_LOG_INFO, "no rows found"); + psFree(output); + return(true); + } + + if (!ippdbPrintMetadatas(stdout, output, "lapExp", !simple)) { psError(PS_ERR_UNKNOWN, false, "failed to print array"); psFree(output); @@ -397,5 +398,5 @@ } -static bool pendingdiffMode(pxConfig *config) +static bool pendingquickstackMode(pxConfig *config) { PS_ASSERT_PTR_NON_NULL(config, false); @@ -403,8 +404,8 @@ psmetadata *where = psMetadataAlloc(); - PXOPT_COPY_S64(config->args, where, "-re_id", "re_id", "=="); + PXOPT_COPY_S64(config->args, where, "-lap_id", "lap_id", "=="); PXOPT_COPY_STR(config->args, where, "-filter", "filter", "=="); - psString query = pxDataGet("reproctool_pendingdiff.sql"); + psString query = pxDataGet("laptool_pendingquickstack.sql"); if (!query) { psError(PXTOOL_ERR_SYS, false, "failed to retrieve SQL statement"); @@ -439,10 +440,10 @@ } if (!psArrayLength(output)) { - psTrace("reproctool", PS_LOG_INFO, "no rows found"); - psFree(output); - return(true); - } - - if (!ippdbPrintMetadatas(stdout, output, "reprocExp", !simple)) { + psTrace("laptool", PS_LOG_INFO, "no rows found"); + psFree(output); + return(true); + } + + if (!ippdbPrintMetadatas(stdout, output, "lapExp", !simple)) { psError(PS_ERR_UNKNOWN, false, "failed to print array"); psFree(output); @@ -455,5 +456,5 @@ } -static bool pendingfinalstackMode(pxConfig *config) +static bool pendingdiffMode(pxConfig *config) { PS_ASSERT_PTR_NON_NULL(config, false); @@ -461,8 +462,8 @@ psmetadata *where = psMetadataAlloc(); - PXOPT_COPY_S64(config->args, where, "-re_id", "re_id", "=="); + PXOPT_COPY_S64(config->args, where, "-lap_id", "lap_id", "=="); PXOPT_COPY_STR(config->args, where, "-filter", "filter", "=="); - psString query = pxDataGet("reproctool_pendingfinalstack.sql"); + psString query = pxDataGet("laptool_pendingdiff.sql"); if (!query) { psError(PXTOOL_ERR_SYS, false, "failed to retrieve SQL statement"); @@ -497,10 +498,10 @@ } if (!psArrayLength(output)) { - psTrace("reproctool", PS_LOG_INFO, "no rows found"); - psFree(output); - return(true); - } - - if (!ippdbPrintMetadatas(stdout, output, "reprocExp", !simple)) { + psTrace("laptool", PS_LOG_INFO, "no rows found"); + psFree(output); + return(true); + } + + if (!ippdbPrintMetadatas(stdout, output, "lapExp", !simple)) { psError(PS_ERR_UNKNOWN, false, "failed to print array"); psFree(output); @@ -513,4 +514,62 @@ } +static bool pendingfinalstackMode(pxConfig *config) +{ + PS_ASSERT_PTR_NON_NULL(config, false); + PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); + + psmetadata *where = psMetadataAlloc(); + PXOPT_COPY_S64(config->args, where, "-lap_id", "lap_id", "=="); + PXOPT_COPY_STR(config->args, where, "-filter", "filter", "=="); + + psString query = pxDataGet("laptool_pendingfinalstack.sql"); + if (!query) { + psError(PXTOOL_ERR_SYS, false, "failed to retrieve SQL statement"); + return(false); + } + psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); + if (whereClause) { + psStringPrepend(&whereClause, "\n AND "); + } + + psString limitString = NULL; + if (limit) { + limitString = psDBGenerateLimitSQL(limit); + psStringPrepend(&limitString, "\n"); + } + + if (!p_psDBRunQueryF(config->dbh, query, whereClause, limitString ? limitString : "")) { + psError(PXTOOLS_ERR_PROG, false, "database error"); + psFree(limitString); + psFree(query); + psFree(whereClause); + return(false); + } + psFree(limitString); + psFree(query); + psFree(whereClause); + + psArray *output = p_psDBFetchResult(config->dbh); + if (!output) { + psError(PS_ERR_UNKNOWN, false, "database error"); + return(false); + } + if (!psArrayLength(output)) { + psTrace("laptool", PS_LOG_INFO, "no rows found"); + psFree(output); + return(true); + } + + if (!ippdbPrintMetadatas(stdout, output, "lapExp", !simple)) { + psError(PS_ERR_UNKNOWN, false, "failed to print array"); + psFree(output); + return(false); + } + + psFree(output); + return(true); + + +} static bool updateexpMode(pxConfig *config) { @@ -518,5 +577,5 @@ psMetadata *where = psMetadataAlloc(); - PXOPT_LOOKUP_S64(re_id, config->args, "-re_id", true, false); + PXOPT_LOOKUP_S64(lap_id, config->args, "-lap_id", true, false); PXOPT_LOOKUP_S64(exp_id, config->args, "-exp_id", true, false); PXOPT_LOOKUP_S64(chip_id, config->args, "-chip_id", false, false); @@ -532,5 +591,5 @@ psMetadata *where = psMetadataAlloc(); - PXOPT_COPY_S64(config->args, where, "-re_id", "re_id", "=="); + PXOPT_COPY_S64(config->args, where, "-lap_id", "lap_id", "=="); PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "=="); PXOPT_COPY_S64(config->args, where, "-chip_id", "chip_id", "=="); @@ -550,5 +609,5 @@ } - long rows = psDBUpdateRows(config->dbh,"reprocExp",where,values); + long rows = psDBUpdateRows(config->dbh,"lapExp",where,values); if (rows) { return(true); Index: branches/czw_branch/20110406/ippTools/src/laptool.h =================================================================== --- branches/czw_branch/20110406/ippTools/src/laptool.h (revision 31338) +++ branches/czw_branch/20110406/ippTools/src/laptool.h (revision 31385) @@ -1,25 +1,26 @@ /* - * reproctool.h + * laptool.h */ -#ifndef REPROCTOOL_H -#define REPROCTOOL_H 1 +#ifndef LAPTOOL_H +#define LAPTOOL_H 1 #include "pxtools.h" typedef enum { - REPROCTOOL_MODE_DEFINERUN = 0x0, - REPROCTOOL_MODE_PENDINGRUN, - REPROCTOOL_MODE_PENDINGCHIPEXP, - REPROCTOOL_MODE_PENDINGQUICKSTACK, - REPROCTOOL_MODE_PENDINGDIFF, - REPROCTOOL_MODE_PENDINGFINALSTACK, - REPROCTOOL_MODE_UPDATERUN, - REPROCTOOL_MODE_UPDATEEXP -} reproctoolMode; + LAPTOOL_MODE_DEFINERUN = 0x0, + LAPTOOL_MODE_PENDINGRUN, + LAPTOOL_MODE_EXPOSURES, + LAPTOOL_MODE_PENDINGCHIPEXP, + LAPTOOL_MODE_PENDINGQUICKSTACK, + LAPTOOL_MODE_PENDINGDIFF, + LAPTOOL_MODE_PENDINGFINALSTACK, + LAPTOOL_MODE_UPDATERUN, + LAPTOOL_MODE_UPDATEEXP +} laptoolMode; -pxConfig *reproctoolConfig(pxConfig *config, int argc, char **argv); +pxConfig *laptoolConfig(pxConfig *config, int argc, char **argv); -#endif // REPROCTOOL_H +#endif // LAPTOOL_H Index: branches/czw_branch/20110406/ippTools/src/laptoolConfig.c =================================================================== --- branches/czw_branch/20110406/ippTools/src/laptoolConfig.c (revision 31338) +++ branches/czw_branch/20110406/ippTools/src/laptoolConfig.c (revision 31385) @@ -1,4 +1,4 @@ /* - * reproctoolConfig.c + * laptoolConfig.c */ @@ -16,5 +16,5 @@ #define ADD_OPT(TYPE,TARG,NAME,COMMENT,DEFAULT) psMetadataAdd##TYPE(TARG, PS_LIST_TAIL, NAME, 0, COMMENT, DEFAULT) -pxConfig *reproctoolConfig(pxConfig *config, int argc, char **argv) +pxConfig *laptoolConfig(pxConfig *config, int argc, char **argv) { if (!config) { @@ -43,17 +43,23 @@ psMetadata *pendingrunArgs = psMetadataAlloc(); ADD_OPT(Str, pendingrunArgs, "-projection_cell", "projection cell to consider", NULL); - ADD_OPT(S64, pendingrunArgs, "-re_id", "reprocessing run ID", 0); + ADD_OPT(S64, pendingrunArgs, "-lap_id", "lap run ID", 0); ADD_OPT(U64, pendingrunArgs, "-limit", "limit result set to N items", 0); ADD_OPT(Bool,pendingrunArgs, "-simple", "use the simple output format", false); - - // -pendingchipexp + + // -exposures + psMetadata *exposuresArgs = psMetadataAlloc(); + ADD_OPT(S64, exposuresArgs, "-lap_id", "search by lap run ID", 0); + ADD_OPT(Bool,exposuresArgs, "-simple", "use the simple output format", false); + + // -pendingexp psMetadata *pendingchipexpArgs = psMetadataAlloc(); - ADD_OPT(S64, pendingchipexpArgs, "-re_id", "search by reprocessing run ID", 0); + ADD_OPT(S64, pendingchipexpArgs, "-lap_id", "search by lap run ID", 0); ADD_OPT(Str, pendingchipexpArgs, "-filter", "search by filter", 0); ADD_OPT(Bool,pendingchipexpArgs, "-simple", "use the simple output format", false); + // -pendingquickstack psMetadata *pendingquickstackArgs = psMetadataAlloc(); - ADD_OPT(S64, pendingquickstackArgs, "-re_id", "search by reprocessing run ID", 0); + ADD_OPT(S64, pendingquickstackArgs, "-lap_id", "search by lap run ID", 0); ADD_OPT(Str, pendingquickstackArgs, "-filter", "search by filter", 0); ADD_OPT(Bool,pendingquickstackArgs, "-simple", "use the simple output format", false); @@ -61,5 +67,5 @@ // -pendingdiff psMetadata *pendingdiffArgs = psMetadataAlloc(); - ADD_OPT(S64, pendingdiffArgs, "-re_id", "search by reprocessing run ID", 0); + ADD_OPT(S64, pendingdiffArgs, "-lap_id", "search by lap run ID", 0); ADD_OPT(Str, pendingdiffArgs, "-filter", "search by filter", 0); ADD_OPT(Bool,pendingdiffArgs, "-simple", "use the simple output format", false); @@ -67,5 +73,5 @@ // -pendingfinalstack psMetadata *pendingfinalstackArgs = psMetadataAlloc(); - ADD_OPT(S64, pendingfinalstackArgs, "-re_id", "search by reprocessing run ID", 0); + ADD_OPT(S64, pendingfinalstackArgs, "-lap_id", "search by lap run ID", 0); ADD_OPT(Str, pendingfinalstackArgs, "-filter", "search by filter", 0); ADD_OPT(Bool,pendingfinalstackArgs, "-simple", "use the simple output format", false); @@ -73,5 +79,5 @@ // -updaterun psMetadata *updaterunArgs = psMetadataAlloc(); - ADD_OPT(S64, updaterunArgs, "-re_id", "search by reprocessing run ID", 0); + ADD_OPT(S64, updaterunArgs, "-lap_id", "search by lap run ID", 0); ADD_OPT(Str, updaterunArgs, "-set_state", "set state", NULL); ADD_OPT(S16, updaterunArgs, "-fault", "set fault code", INT16_MAX); @@ -79,5 +85,5 @@ // -updateexp psMetadata *updateexpArgs = psMetadataAlloc(); - ADD_OPT(S64, updateexpArgs, "-re_id", "search by reprocessing run ID", 0); + ADD_OPT(S64, updateexpArgs, "-lap_id", "search by lap run ID", 0); ADD_OPT(S64, updateexpArgs, "-exp_id", "search by exposure ID", 0); ADD_OPT(S64, updateexpArgs, "-chip_id", "search by chip ID", 0); @@ -92,12 +98,13 @@ psMetadata *modes = psMetadataAlloc(); - PXOPT_ADD_MODE("-definerun", "", REPROCTOOL_MODE_DEFINERUN, definerunArgs); - PXOPT_ADD_MODE("-pendingrun", "", REPROCTOOL_MODE_PENDINGRUN, pendingrunArgs); - PXOPT_ADD_MODE("-pendingchipexp", "", REPROCTOOL_MODE_PENDINGCHIPEXP, pendingchipexpArgs); - PXOPT_ADD_MODE("-pendingquickstack", "", REPROCTOOL_MODE_PENDINGQUICKSTACK,pendingquickstackArgs); - PXOPT_ADD_MODE("-pendingdiff", "", REPROCTOOL_MODE_PENDINGDIFF, pendingdiffArgs); - PXOPT_ADD_MODE("-pendingfinalstack", "", REPROCTOOL_MODE_PENDINGFINALSTACK,pendingfinalstackArgs); - PXOPT_ADD_MODE("-updaterun", "", REPROCTOOL_MODE_UPDATERUN, updaterunArgs); - PXOPT_ADD_MODE("-updateexp", "", REPROCTOOL_MODE_UPDATEEXP, updateexpArgs); + PXOPT_ADD_MODE("-definerun", "", LAPTOOL_MODE_DEFINERUN, definerunArgs); + PXOPT_ADD_MODE("-pendingrun", "", LAPTOOL_MODE_PENDINGRUN, pendingrunArgs); + PXOPT_ADD_MODE("-exposures", "", LAPTOOL_MODE_EXPOSURES, exposuresArgs); + PXOPT_ADD_MODE("-pendingchipexp", "", LAPTOOL_MODE_PENDINGCHIPEXP, pendingchipexpArgs); + PXOPT_ADD_MODE("-pendingquickstack", "", LAPTOOL_MODE_PENDINGQUICKSTACK,pendingquickstackArgs); + PXOPT_ADD_MODE("-pendingdiff", "", LAPTOOL_MODE_PENDINGDIFF, pendingdiffArgs); + PXOPT_ADD_MODE("-pendingfinalstack", "", LAPTOOL_MODE_PENDINGFINALSTACK,pendingfinalstackArgs); + PXOPT_ADD_MODE("-updaterun", "", LAPTOOL_MODE_UPDATERUN, updaterunArgs); + PXOPT_ADD_MODE("-updateexp", "", LAPTOOL_MODE_UPDATEEXP, updateexpArgs); if (!pxGetOptions(stderr, argc, argv, config, modes, argSets)) {