Index: trunk/ippTools/share/Makefile.am =================================================================== --- trunk/ippTools/share/Makefile.am (revision 29570) +++ trunk/ippTools/share/Makefile.am (revision 29611) @@ -251,6 +251,8 @@ magicdstool_definecopy_chip.sql \ magicdstool_definecopy_warp.sql \ + magicdstool_destreakedfile.sql \ magicdstool_getrunids.sql \ magicdstool_getskycells.sql \ + magicdstool_listrun.sql \ magicdstool_revertdestreakedfile.sql \ magicdstool_revertupdated.sql \ Index: trunk/ippTools/share/magicdstool_destreakedfile.sql =================================================================== --- trunk/ippTools/share/magicdstool_destreakedfile.sql (revision 29611) +++ trunk/ippTools/share/magicdstool_destreakedfile.sql (revision 29611) @@ -0,0 +1,17 @@ +SELECT + magicDSFile.*, + CONCAT_WS('.', CONCAT(outroot, '/', exp_id), 'mds', magic_ds_id, stage_id, component) AS path_base, + magicDSRun.magic_id, + magicDSRun.inv_magic_id, + magicDSRun.state, + magicDSRun.stage, + magicDSRun.stage_id, + magicDSRun.cam_id, + magicDSRun.label, + magicDSRun.data_group, + magicDSRun.outroot, + magicDSRun.re_place, + magicDSRun.fault as run_fault, + magicDSRun.note +FROM + magicDSRun JOIN magicDSFile USING(magic_ds_id) JOIN magicRun USING(magic_id) Index: trunk/ippTools/share/magicdstool_listrun.sql =================================================================== --- trunk/ippTools/share/magicdstool_listrun.sql (revision 29611) +++ trunk/ippTools/share/magicdstool_listrun.sql (revision 29611) @@ -0,0 +1,4 @@ +SELECT + magicDSRun.* +FROM + magicDSRun Index: trunk/ippTools/src/magicdstool.c =================================================================== --- trunk/ippTools/src/magicdstool.c (revision 29570) +++ trunk/ippTools/src/magicdstool.c (revision 29611) @@ -49,4 +49,6 @@ static bool tocleanedfileMode(pxConfig *config); static bool setfiletoupdateMode(pxConfig *config); +static bool destreakedfileMode(pxConfig *config); +static bool listrunMode(pxConfig *config); static bool setmagicDSRunState(pxConfig *config, psS64 magic_id, psString extraSetString, psMetadata *where, const char *state); @@ -87,4 +89,6 @@ MODECASE(MAGICDSTOOL_MODE_TOCLEANEDFILE, tocleanedfileMode); MODECASE(MAGICDSTOOL_MODE_SETFILETOUPDATE, setfiletoupdateMode); + MODECASE(MAGICDSTOOL_MODE_DESTREAKEDFILE, destreakedfileMode); + MODECASE(MAGICDSTOOL_MODE_LISTRUN, listrunMode); default: psAbort("invalid option (this should not happen)"); @@ -1748,2 +1752,168 @@ +static bool destreakedfileMode(pxConfig *config) +{ + PS_ASSERT_PTR_NON_NULL(config, false); + + psMetadata *where = psMetadataAlloc(); + + PXOPT_COPY_S64(config->args, where, "-magic_ds_id", "magic_ds_id", "=="); + PXOPT_COPY_STR(config->args, where, "-component", "component", "=="); + PXOPT_COPY_STR(config->args, where, "-label", "label", "=="); + PXOPT_COPY_STR(config->args, where, "-stage", "stage", "=="); + PXOPT_COPY_S64(config->args, where, "-stage_id", "stage_id", "=="); + PXOPT_COPY_S64(config->args, where, "-magic_id", "magic_id", "=="); + pxAddLabelSearchArgs (config, where, "-label", "magicDSRun.label", "=="); + 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); + + + psString query = pxDataGet("magicdstool_destreakedfile.sql"); + if (!query) { + psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); + return false; + } + + if (psListLength(where->list)) { + psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); + psStringAppend(&query, "\nWHERE %s", whereClause); + psFree(whereClause); + } else { + psError(PS_ERR_UNKNOWN, true, "search arguments are required"); + return false; + } + psFree(where); + + if (faulted) { + psStringAppend(&query, " AND magicDSFile.fault > 0"); + } + + // 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"); + psFree(query); + return false; + } + psFree(query); + + psArray *output = p_psDBFetchResult(config->dbh); + if (!output) { + psErrorCode err = psErrorCodeLast(); + switch (err) { + case PS_ERR_DB_CLIENT: + psError(PXTOOLS_ERR_SYS, false, "database error"); + case PS_ERR_DB_SERVER: + psError(PXTOOLS_ERR_PROG, false, "database error"); + default: + psError(PXTOOLS_ERR_PROG, false, "unknown error"); + } + + return false; + } + if (!psArrayLength(output)) { + psTrace("magicdstool", PS_LOG_INFO, "no rows found"); + psFree(output); + return true; + } + + if (psArrayLength(output)) { + // negative simple so the default is true + if (!ippdbPrintMetadatas(stdout, output, "magicDSFile", !simple)) { + psError(PS_ERR_UNKNOWN, false, "failed to print array"); + psFree(output); + return false; + } + } + + psFree(output); + + return true; +} +static bool listrunMode(pxConfig *config) +{ + PS_ASSERT_PTR_NON_NULL(config, false); + + psMetadata *where = psMetadataAlloc(); + + PXOPT_COPY_S64(config->args, where, "-magic_ds_id", "magic_ds_id", "=="); + PXOPT_COPY_STR(config->args, where, "-label", "label", "=="); + PXOPT_COPY_STR(config->args, where, "-stage", "stage", "=="); + PXOPT_COPY_S64(config->args, where, "-stage_id", "stage_id", "=="); + PXOPT_COPY_S64(config->args, where, "-magic_id", "magic_id", "=="); + pxAddLabelSearchArgs (config, where, "-label", "magicDSRun.label", "=="); + + PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); + PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); + + + psString query = pxDataGet("magicdstool_listrun.sql"); + if (!query) { + psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); + return false; + } + + if (psListLength(where->list)) { + psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); + psStringAppend(&query, "\nWHERE %s", whereClause); + psFree(whereClause); + } else { + psError(PS_ERR_UNKNOWN, true, "search arguments are required"); + return false; + } + 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"); + psFree(query); + return false; + } + psFree(query); + + psArray *output = p_psDBFetchResult(config->dbh); + if (!output) { + psErrorCode err = psErrorCodeLast(); + switch (err) { + case PS_ERR_DB_CLIENT: + psError(PXTOOLS_ERR_SYS, false, "database error"); + case PS_ERR_DB_SERVER: + psError(PXTOOLS_ERR_PROG, false, "database error"); + default: + psError(PXTOOLS_ERR_PROG, false, "unknown error"); + } + + return false; + } + if (!psArrayLength(output)) { + psTrace("magicdstool", PS_LOG_INFO, "no rows found"); + psFree(output); + return true; + } + + if (psArrayLength(output)) { + // negative simple so the default is true + if (!ippdbPrintMetadatas(stdout, output, "magicDSRun", !simple)) { + psError(PS_ERR_UNKNOWN, false, "failed to print array"); + psFree(output); + return false; + } + } + + psFree(output); + + return true; +} Index: trunk/ippTools/src/magicdstool.h =================================================================== --- trunk/ippTools/src/magicdstool.h (revision 29570) +++ trunk/ippTools/src/magicdstool.h (revision 29611) @@ -42,4 +42,6 @@ MAGICDSTOOL_MODE_SETFILETOUPDATE, MAGICDSTOOL_MODE_UPDATEDESTREAKEDFILE, + MAGICDSTOOL_MODE_LISTRUN, + MAGICDSTOOL_MODE_DESTREAKEDFILE, } MAGICDStoolMode; Index: trunk/ippTools/src/magicdstoolConfig.c =================================================================== --- trunk/ippTools/src/magicdstoolConfig.c (revision 29570) +++ trunk/ippTools/src/magicdstoolConfig.c (revision 29611) @@ -231,4 +231,32 @@ psMetadataAddStr(setfiletoupdateArgs, PS_LIST_TAIL, "-set_label", 0, "set new label", NULL); + // -destreakedfile + psMetadata *destreakedfileArgs = psMetadataAlloc(); + psMetadataAddS64(destreakedfileArgs, PS_LIST_TAIL, "-magic_ds_id", 0, "search by magic_ds_id", 0); + psMetadataAddStr(destreakedfileArgs, PS_LIST_TAIL, "-component", 0, "search by component", NULL); + psMetadataAddStr(destreakedfileArgs, PS_LIST_TAIL, "-stage", 0, "search by stage", NULL); + psMetadataAddS64(destreakedfileArgs, PS_LIST_TAIL, "-stage_id", 0, "search by magic_id", 0); + + psMetadataAddStr(destreakedfileArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "search by magicRun.label", NULL); + psMetadataAddS64(destreakedfileArgs, PS_LIST_TAIL, "-magic_id", 0, "search by magic_id", 0); + + psMetadataAddBool(destreakedfileArgs, PS_LIST_TAIL, "-faulted", 0, "list only faulted components", false); + psMetadataAddBool(destreakedfileArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); + psMetadataAddU64(destreakedfileArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + + // -listrun + psMetadata *listrunArgs = psMetadataAlloc(); + psMetadataAddS64(listrunArgs, PS_LIST_TAIL, "-magic_ds_id", 0, "search by magic_ds_id", 0); + psMetadataAddStr(listrunArgs, PS_LIST_TAIL, "-stage", 0, "define stage", NULL); + psMetadataAddS64(listrunArgs, PS_LIST_TAIL, "-stage_id", 0, "search by magic_id", 0); + psMetadataAddS64(listrunArgs, PS_LIST_TAIL, "-magic_id", 0, "search by magic_id", 0); + + psMetadataAddStr(listrunArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "search by magicRun.label", NULL); + + psMetadataAddBool(listrunArgs, PS_LIST_TAIL, "-faulted", 0, "list faulted components", false); + + psMetadataAddBool(listrunArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); + psMetadataAddU64(listrunArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + psFree(now); @@ -272,4 +300,8 @@ PXOPT_ADD_MODE("-updatedestreakedfile", "update parameters of destreaked file", MAGICDSTOOL_MODE_UPDATEDESTREAKEDFILE, updatedestreakedfileArgs); + PXOPT_ADD_MODE("-destreakedfile", "list destreaked file", + MAGICDSTOOL_MODE_DESTREAKEDFILE, destreakedfileArgs); + PXOPT_ADD_MODE("-listrun", "list parameters of destreak run", + MAGICDSTOOL_MODE_LISTRUN, listrunArgs);