Index: trunk/ippTools/share/Makefile.am =================================================================== --- trunk/ippTools/share/Makefile.am (revision 36040) +++ trunk/ippTools/share/Makefile.am (revision 36041) @@ -481,4 +481,5 @@ releasetool_definerelstack_with_skycal.sql \ releasetool_listrelstack.sql \ + releasetool_summary.sql \ releasetool_definerelgroup_select_lap.sql \ releasetool_definerelgroup_select_data_group.sql \ Index: trunk/ippTools/share/releasetool_summary.sql =================================================================== --- trunk/ippTools/share/releasetool_summary.sql (revision 36041) +++ trunk/ippTools/share/releasetool_summary.sql (revision 36041) @@ -0,0 +1,23 @@ +SELECT DISTINCT + release_name, + surveyName, + sass_id, + stackAssociation.tess_id, + stackAssociation.projection_cell, + stackAssociation.filter, + stackSummary.path_base, + stackAssociation.data_group, + rawExp.camera +FROM relStack + JOIN ippRelease USING(rel_id) + JOIN survey USING(surveyID) + JOIN stackRun USING(stack_id, filter, tess_id, skycell_id) + JOIN stackAssociationMap USING(stack_id) + JOIN stackAssociation USING(sass_id, filter) + JOIN stackSummary using(sass_id, projection_cell) + JOIN stackInputSkyfile using(stack_id) + JOIN warpRun USING(warp_id) + JOIN fakeRun USING(fake_id) + JOIN camRun USING(cam_id) + JOIN chipRun USING(chip_id) + JOIN rawExp USING(exp_id) Index: trunk/ippTools/src/releasetool.c =================================================================== --- trunk/ippTools/src/releasetool.c (revision 36040) +++ trunk/ippTools/src/releasetool.c (revision 36041) @@ -47,4 +47,5 @@ static bool updaterelstackMode(pxConfig *config); static bool listrelstackMode(pxConfig *config); +static bool summaryMode(pxConfig *config); static bool definerelgroupMode(pxConfig *config); static bool pendingrelgroupMode(pxConfig *config); @@ -84,4 +85,5 @@ MODECASE(RELEASETOOL_MODE_UPDATERELSTACK, updaterelstackMode); MODECASE(RELEASETOOL_MODE_LISTRELSTACK, listrelstackMode); + MODECASE(RELEASETOOL_MODE_SUMMARY, summaryMode); MODECASE(RELEASETOOL_MODE_DEFINERELGROUP, definerelgroupMode); @@ -1078,5 +1080,97 @@ if (priority_order) { - psStringAppend(&query, "\nAND priority > 0 order by stack_id, priority DESC"); + psStringAppend(&query, "\nAND priority > 0 order by priority DESC, stack_id"); + } + + 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) { + psError(PS_ERR_UNKNOWN, false, "database error"); + return false; + } + + if (!psArrayLength(output)) { + psTrace("releasetool", PS_LOG_INFO, "no rows found"); + psFree(output); + return true; + } + + if (!ippdbPrintMetadatas(stdout, output, "relStack", !simple)) { + psError(PS_ERR_UNKNOWN, false, "failed to print array"); + psFree(output); + return false; + } + + psFree(output); + + return true; +} +static bool summaryMode(pxConfig *config) +{ + PS_ASSERT_PTR_NON_NULL(config, NULL); + + psMetadata *where = psMetadataAlloc(); + + PXOPT_COPY_S64(config->args, where, "-sass_id", "stackAssociation.sass_id", "=="); + PXOPT_COPY_S64(config->args, where, "-relstack_id", "relStack.relstack_id", "=="); + PXOPT_COPY_S64(config->args, where, "-stack_id", "relStack.stack_id", "=="); +// PXOPT_COPY_S64(config->args, where, "-skycal_id", "relStack.skycal_id", "=="); + PXOPT_COPY_S64(config->args, where, "-relstack_id", "relStack.relstack_id", "=="); + PXOPT_COPY_STR(config->args, where, "-release_name", "ippRelease.release_name", "LIKE"); + pxAddLabelSearchArgs(config, where, "-release_state","ippRelease.state", "=="); +// PXOPT_COPY_STR(config->args, where, "-state", "relStack.state", "=="); + PXOPT_COPY_STR(config->args, where, "-filter", "relStack.filter", "LIKE"); +// PXOPT_COPY_F32(config->args, where, "-mjd_min", "stackSumSkyfile.mjd_obs", ">="); +// PXOPT_COPY_F32(config->args, where, "-mjd_max", "stackSumSkyfile.mjd_obs", "<="); + PXOPT_COPY_STR(config->args, where, "-tess_id", "relStack.tess_id", "=="); + PXOPT_COPY_STR(config->args, where, "-skycell_id", "relStack.skycell_id", "LIKE"); + PXOPT_COPY_STR(config->args, where, "-projection_cell", "stackAssociation.projection_cell", "LIKE"); + PXOPT_COPY_STR(config->args, where, "-stack_data_group", "stackRun.data_group", "LIKE"); +// PXOPT_COPY_STR(config->args, where, "-skycal_data_group", "skycalRun.data_group", "LIKE"); + + PXOPT_COPY_STR(config->args, where, "-surveyName", "survey.surveyName", "LIKE"); + PXOPT_COPY_S32(config->args, where, "-rel_id", "relExp.rel_id", "=="); + pxskycellAddWhere(config, where); + +// PXOPT_COPY_F32(config->args, where, "-fwhm_min", "IFNULL(skycalResult.fwhm_major, 999)", ">="); +// PXOPT_COPY_F32(config->args, where, "-fwhm_max", "IFNULL(skycalResult.fwhm_major, 0)", "<="); + + PXOPT_LOOKUP_BOOL(priority_order, config->args, "-priority_order", false); + + PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); + PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); + + pxAddLabelSearchArgs (config, where, "-stack_type", "relStack.stack_type", "=="); + + psString query = pxDataGet("releasetool_summary.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(PXTOOLS_ERR_CONFIG, false, "search parameters are required\n"); + psFree(where); + return false; + } + + if (priority_order) { + psStringAppend(&query, "\nAND priority > 0 order by priority DESC, stack_id"); } Index: trunk/ippTools/src/releasetool.h =================================================================== --- trunk/ippTools/src/releasetool.h (revision 36040) +++ trunk/ippTools/src/releasetool.h (revision 36041) @@ -38,4 +38,5 @@ RELEASETOOL_MODE_TOCALIBSTACK, RELEASETOOL_MODE_LISTRELSTACK, + RELEASETOOL_MODE_SUMMARY, RELEASETOOL_MODE_DEFINERELGROUP, RELEASETOOL_MODE_PENDINGRELGROUP, Index: trunk/ippTools/src/releasetoolConfig.c =================================================================== --- trunk/ippTools/src/releasetoolConfig.c (revision 36040) +++ trunk/ippTools/src/releasetoolConfig.c (revision 36041) @@ -248,4 +248,33 @@ psMetadataAddBool(listrelstackArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); + // -summary + psMetadata *summaryArgs = psMetadataAlloc(); + psMetadataAddS64(summaryArgs, PS_LIST_TAIL, "-sass_id", 0, "select by released SASS ID", 0); + psMetadataAddS64(summaryArgs, PS_LIST_TAIL, "-relstack_id", 0, "select by released exposure ID", 0); + psMetadataAddS64(summaryArgs, PS_LIST_TAIL, "-stack_id", 0, "select by stack ID", 0); +// psMetadataAddS64(summaryArgs, PS_LIST_TAIL, "-skycal_id", 0, "select by skycal ID", 0); + psMetadataAddStr(summaryArgs, PS_LIST_TAIL, "-release_name", 0, "select by release name (LIKE comparision)", NULL); + psMetadataAddStr(summaryArgs, PS_LIST_TAIL, "-release_state", PS_META_DUPLICATE_OK, "select by release state", NULL); +// psMetadataAddStr(summaryArgs, PS_LIST_TAIL, "-state", 0, "select by released stack state", NULL); + + psMetadataAddStr(summaryArgs, PS_LIST_TAIL, "-filter", 0, "select by filter name (LIKE comparison)", NULL); + + pxskycellAddArguments(summaryArgs); + + psMetadataAddStr(summaryArgs, PS_LIST_TAIL, "-tess_id", 0, "select by tess_id", NULL); + psMetadataAddStr(summaryArgs, PS_LIST_TAIL, "-skycell_id", 0, "select by skycell_id (LIKE comparision)", NULL); + psMetadataAddStr(summaryArgs, PS_LIST_TAIL, "-projection_cell", 0, "select by projection_cell (LIKE comparision)", NULL); + psMetadataAddStr(summaryArgs, PS_LIST_TAIL, "-stack_type", PS_META_DUPLICATE_OK, "select by stack_type", NULL); + + psMetadataAddStr(summaryArgs, PS_LIST_TAIL, "-stack_data_group", 0, "select by stackRun.data_group (LIKE comparison)", NULL); +// psMetadataAddStr(summaryArgs, PS_LIST_TAIL, "-skycal_data_group", 0, "select by skycalRun.data_group (LIKE comparison)", NULL); + + psMetadataAddStr(summaryArgs, PS_LIST_TAIL, "-surveyName", 0, "select by survey name (LIKE comparision)", NULL); + psMetadataAddS64(summaryArgs, PS_LIST_TAIL, "-rel_id", 0, "select by release ID", 0); + + psMetadataAddBool(summaryArgs, PS_LIST_TAIL, "-priority_order", 0, "order by release priority", false); + + psMetadataAddU64(summaryArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + psMetadataAddBool(summaryArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); // -definerelgroup @@ -322,4 +351,5 @@ PXOPT_ADD_MODE("-definerelstack", "define a released stack", RELEASETOOL_MODE_DEFINERELSTACK, definerelstackArgs); PXOPT_ADD_MODE("-listrelstack", "list released stacks", RELEASETOOL_MODE_LISTRELSTACK, listrelstackArgs); + PXOPT_ADD_MODE("-summary", "list stackSummaryes for released stacks", RELEASETOOL_MODE_SUMMARY, summaryArgs); PXOPT_ADD_MODE("-definerelgroup", "define a group of exposures", RELEASETOOL_MODE_DEFINERELGROUP, definerelgroupArgs);