Index: trunk/ippTools/share/Makefile.am =================================================================== --- trunk/ippTools/share/Makefile.am (revision 34798) +++ trunk/ippTools/share/Makefile.am (revision 34800) @@ -393,4 +393,5 @@ stacktool_sassskyfile.sql \ stacktool_tosum.sql \ + stacktool_tobkg.sql \ stacktool_tosummary.sql \ stacktool_addsummary.sql \ Index: trunk/ippTools/share/stacktool_inputskyfile.sql =================================================================== --- trunk/ippTools/share/stacktool_inputskyfile.sql (revision 34798) +++ trunk/ippTools/share/stacktool_inputskyfile.sql (revision 34800) @@ -4,4 +4,5 @@ rawExp.exp_id, rawExp.exp_name, + rawExp.exp_time, rawExp.object, rawExp.dateobs, Index: trunk/ippTools/share/stacktool_tobkg.sql =================================================================== --- trunk/ippTools/share/stacktool_tobkg.sql (revision 34800) +++ trunk/ippTools/share/stacktool_tobkg.sql (revision 34800) @@ -0,0 +1,29 @@ +SELECT + stackRun.stack_id, + stackRun.tess_id, + stackRun.skycell_id, + stackRun.workdir, + stackRun.reduction, + stackRun.label, + stackRun.state, + stackSumSkyfile.path_base, + rawExp.camera, + IFNULL(Label.priority, 10000) AS priority +FROM stackRun +JOIN stackInputSkyfile USING(stack_id) +JOIN warpRun USING(warp_id) +JOIN warpSkyfile USING(warp_id,skycell_id) +JOIN fakeRun USING(fake_id) +JOIN camRun USING(cam_id) +JOIN chipRun USING(chip_id) +JOIN rawExp USING(exp_id) +LEFT JOIN stackSumSkyfile USING(stack_id) +LEFT JOIN Label ON Label.label = stackRun.label +WHERE + ((stackRun.state = 'full' AND stackSumSkyfile.fault = 0 AND stackSumSkyfile.quality = 0 AND stackSumSkyfile.background_model != 1)) + AND (Label.active OR Label.active IS NULL) + -- WHERE hook %s +GROUP BY stack_id +HAVING (SUM(IF(warpRun.state = 'full', 1, 0)) = COUNT(stackInputSkyfile.warp_id) AND + SUM(IF(warpSkyfile.background_model = 1, 1, 0)) = COUNT(stackInputSkyfile.warp_id)) + Index: trunk/ippTools/src/stacktool.c =================================================================== --- trunk/ippTools/src/stacktool.c (revision 34798) +++ trunk/ippTools/src/stacktool.c (revision 34800) @@ -37,4 +37,5 @@ static bool inputskyfileMode(pxConfig *config); static bool tosumMode(pxConfig *config); +static bool tobkgMode(pxConfig *config); static bool addsumskyfileMode(pxConfig *config); static bool sumskyfileMode(pxConfig *config); @@ -76,4 +77,5 @@ MODECASE(STACKTOOL_MODE_INPUTSKYFILE, inputskyfileMode); MODECASE(STACKTOOL_MODE_TOSUM, tosumMode); + MODECASE(STACKTOOL_MODE_TOBKG, tobkgMode); MODECASE(STACKTOOL_MODE_ADDSUMSKYFILE, addsumskyfileMode); MODECASE(STACKTOOL_MODE_SUMSKYFILE, sumskyfileMode); @@ -952,4 +954,79 @@ // negative simple so the default is true if (!ippdbPrintMetadatas(stdout, output, "stackSumSkyfile", !simple)) { + psError(PS_ERR_UNKNOWN, false, "failed to print array"); + psFree(output); + return false; + } + } + + psFree(output); + + return true; +} + +static bool tobkgMode(pxConfig *config) +{ + PS_ASSERT_PTR_NON_NULL(config, false); + + psMetadata *where = psMetadataAlloc(); + PXOPT_COPY_S64(config->args, where, "-stack_id", "stack_id", "=="); + pxAddLabelSearchArgs (config, where, "-label", "stackRun.label", "=="); + + PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); + PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); + + psString query = pxDataGet("stacktool_tobkg.sql"); + if (!query) { + psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); + return false; + } + + psString whereClause = psStringCopy(""); // WHERE conditions to add + if (psListLength(where->list)) { + psString new = psDBGenerateWhereConditionSQL(where, NULL); + psStringAppend(&whereClause, "\nAND %s", new); + psFree(new); + } + psFree(where); + + psStringAppend(&query, "\nORDER by priority DESC, stack_id"); + + // treat limit == 0 as "no limit" + if (limit) { + psString limitString = psDBGenerateLimitSQL(limit); + psStringAppend(&query, " %s", limitString); + psFree(limitString); + } + + if (!p_psDBRunQueryF(config->dbh, query, whereClause)) { + 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("stacktool", PS_LOG_INFO, "no rows found"); + psFree(output); + return true; + } + + if (psArrayLength(output)) { + // negative simple so the default is true + if (!ippdbPrintMetadatas(stdout, output, "stackBkgSkyfile", !simple)) { psError(PS_ERR_UNKNOWN, false, "failed to print array"); psFree(output); @@ -1681,12 +1758,26 @@ PXOPT_LOOKUP_S16(fault, config->args, "-fault", true, false); PXOPT_LOOKUP_S16(quality, config->args, "-set_quality", false, false); + PXOPT_LOOKUP_S16(background_model, config->args, "-set_background_model", false, false); psMetadata *where = psMetadataAlloc(); PXOPT_COPY_S64(config->args, where, "-stack_id", "stack_id", "=="); - if (!pxSetFaultCode(config->dbh, "stackSumSkyfile", where, fault, quality)) { + if (background_model) { + psMetadata *values = psMetadataAlloc(); + PXOPT_COPY_S16(config->args, values, "-set_background_model", "background_model", "=="); + long rows = psDBUpdateRows(config->dbh,"stackSumSkyfile", where, values); + psFree(values); + if (!rows) { + // This maybe should rollback and error if rows != 1 + psError(PS_ERR_UNKNOWN, true, "no rows changed"); + return false; + } + } + else { + if (!pxSetFaultCode(config->dbh, "stackSumSkyfile", where, fault, quality)) { psError(PS_ERR_UNKNOWN, false, "failed to set set fault flag"); psFree (where); return false; + } } psFree (where); Index: trunk/ippTools/src/stacktool.h =================================================================== --- trunk/ippTools/src/stacktool.h (revision 34798) +++ trunk/ippTools/src/stacktool.h (revision 34800) @@ -31,4 +31,5 @@ STACKTOOL_MODE_INPUTSKYFILE, STACKTOOL_MODE_TOSUM, + STACKTOOL_MODE_TOBKG, STACKTOOL_MODE_ADDSUMSKYFILE, STACKTOOL_MODE_SUMSKYFILE, Index: trunk/ippTools/src/stacktoolConfig.c =================================================================== --- trunk/ippTools/src/stacktoolConfig.c (revision 34798) +++ trunk/ippTools/src/stacktoolConfig.c (revision 34800) @@ -150,4 +150,11 @@ psMetadataAddBool(tosumArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); + // -tobkg + psMetadata *tobkgArgs = psMetadataAlloc(); + psMetadataAddS64(tobkgArgs, PS_LIST_TAIL, "-stack_id", 0, "search by stack ID", 0); + psMetadataAddStr(tobkgArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "search by label", NULL); + psMetadataAddU64(tobkgArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + psMetadataAddBool(tobkgArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); + // -addsumskyfile psMetadata *addsumskyfileArgs = psMetadataAlloc(); @@ -280,5 +287,6 @@ psMetadataAddS16(updatesumskyfileArgs, PS_LIST_TAIL, "-fault", 0, "set fault code (required)", 0); psMetadataAddS16(updatesumskyfileArgs, PS_LIST_TAIL, "-set_quality", 0, "set quality", 0); - + psMetadataAddS16(updatesumskyfileArgs, PS_LIST_TAIL, "-set_background_model", 0, "set background model", 0); + // -exportrun psMetadata *exportrunArgs = psMetadataAlloc(); @@ -304,4 +312,5 @@ PXOPT_ADD_MODE("-inputskyfile", "", STACKTOOL_MODE_INPUTSKYFILE, inputskyfileArgs); PXOPT_ADD_MODE("-tosum", "", STACKTOOL_MODE_TOSUM, tosumArgs); + PXOPT_ADD_MODE("-tobkg", "", STACKTOOL_MODE_TOBKG, tobkgArgs); PXOPT_ADD_MODE("-addsumskyfile", "", STACKTOOL_MODE_ADDSUMSKYFILE, addsumskyfileArgs); PXOPT_ADD_MODE("-sumskyfile", "list results of stackRun", STACKTOOL_MODE_SUMSKYFILE, sumskyfileArgs); Index: trunk/ippTools/src/warptool.c =================================================================== --- trunk/ippTools/src/warptool.c (revision 34798) +++ trunk/ippTools/src/warptool.c (revision 34800) @@ -2059,4 +2059,5 @@ PXOPT_LOOKUP_S64(magicked, config->args, "-set_magicked", false, false); PXOPT_LOOKUP_S16(quality, config->args, "-set_quality", false, false); + if (magicked) { psStringAppend(&set_magicked_skyfile, "\n , warpSkyfile.magicked = %" PRId64, magicked); @@ -2065,4 +2066,8 @@ if (quality) { psStringAppend(&set_magicked_skyfile, "\n , warpSkyfile.quality = %"PRId16, quality); + } + PXOPT_LOOKUP_S16(background_model, config->args, "-set_background_model", false, false); + if (background_model) { + psStringAppend(&set_magicked_skyfile, "\n , warpSkyfile.background_model = %"PRId16, background_model); } } else if (!strcmp(data_state, "cleaned") || !strcmp(data_state, "purged")) { @@ -2125,6 +2130,22 @@ // warp_id, skycell_id, fault are required PXOPT_LOOKUP_STR(state, config->args, "-set_state", false, false); - - if (!state) { + PXOPT_LOOKUP_S16(background_model, config->args, "-set_background_model", false, false); + if (background_model) { + // CZW 2012-12-06: I'm unclear why we don't use this form for all updates? + psMetadata *where = psMetadataAlloc(); + psMetadata *values = psMetadataAlloc(); + PXOPT_COPY_S64(config->args, where, "-warp_id", "warp_id", "=="); + PXOPT_COPY_STR(config->args, where, "-skycell_id", "skycell_id", "=="); + PXOPT_COPY_S16(config->args, values, "-set_background_model", "background_model", "=="); + long rows = psDBUpdateRows(config->dbh,"warpSkyfile", where, values); + psFree(values); + psFree(where); + if (!rows) { + // This maybe should rollback and error if rows != 1 + psError(PS_ERR_UNKNOWN, true, "no rows changed"); + return false; + } + } + else if (!state) { psMetadata *where = psMetadataAlloc(); PXOPT_COPY_S64(config->args, where, "-warp_id", "warp_id", "=="); Index: trunk/ippTools/src/warptoolConfig.c =================================================================== --- trunk/ippTools/src/warptoolConfig.c (revision 34798) +++ trunk/ippTools/src/warptoolConfig.c (revision 34800) @@ -410,5 +410,5 @@ psMetadataAddS16(updateskyfileArgs, PS_LIST_TAIL, "-set_quality", 0,"new quality value", 0); psMetadataAddStr(updateskyfileArgs, PS_LIST_TAIL, "-set_state", 0, "set state", 0); - + psMetadataAddS16(updateskyfileArgs, PS_LIST_TAIL, "-set_background_model", 0, "set the background_model value", 0); // -exportrun psMetadata *exportrunArgs = psMetadataAlloc();