Index: trunk/ippTools/src/releasetool.c =================================================================== --- trunk/ippTools/src/releasetool.c (revision 35365) +++ trunk/ippTools/src/releasetool.c (revision 35397) @@ -975,23 +975,24 @@ psMetadata *where = psMetadataAlloc(); + 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", "relExp.state", "=="); - PXOPT_COPY_STR(config->args, where, "-filter", "rawExp.filter", "LIKE"); - PXOPT_COPY_TIME(config->args, where, "-dateobs_begin","rawExp.dateobs", ">="); - PXOPT_COPY_TIME(config->args, where, "-dateobs_end", "rawExp.dateobs", "<="); - PXOPT_COPY_F32(config->args, where, "-fwhm_min", "skycalResult.fwhm_major", ">="); + 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_F32(config->args, where, "-fwhm_min", "skycalResult.fwhm_minor", ">="); PXOPT_COPY_F32(config->args, where, "-fwhm_max", "skycalresult.fwhm_major", "<="); - PXOPT_COPY_STR(config->args, where, "-exp_name", "rawExp.exp_ame", "=="); - PXOPT_COPY_S64(config->args, where, "-exp_id", "relExp.exp_id", "=="); - PXOPT_COPY_S64(config->args, where, "-chip_id", "relExp.chip_id", "=="); - PXOPT_COPY_S64(config->args, where, "-cam_id", "relExp.cam_id", "=="); - PXOPT_COPY_S64(config->args, where, "-warp_id", "warpRun.warp_id", "=="); - PXOPT_COPY_STR(config->args, where, "-chip_data_group", "chipRun.data_group", "LIKE"); - PXOPT_COPY_STR(config->args, where, "-cam_data_group", "camRun.data_group", "LIKE"); - PXOPT_COPY_STR(config->args, where, "-warp_data_group", "warpRun.data_group", "LIKE"); + 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, "-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_LOOKUP_BOOL(priority_order, config->args, "-priority_order", false); @@ -1000,13 +1001,7 @@ PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); - psString query = pxDataGet("releasetool_listrelexp.sql"); + psString query = pxDataGet("releasetool_listrelstack.sql"); if (!query) { psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); - return false; - } - - psString where2 = NULL; - if (!pxspaceAddWhere(config, &where2, "rawExp")) { - psError(psErrorCodeLast(), false, "pxspaceAddWhere failed"); return false; } @@ -1016,6 +1011,4 @@ psStringAppend(&query, "\nWHERE %s", whereClause); psFree(whereClause); - } else if (where2) { - psStringAppend(&query, "\nWHERE "); } else { psError(PXTOOLS_ERR_CONFIG, false, "search parameters are required\n"); @@ -1024,11 +1017,6 @@ } - if (where2) { - psStringAppend(&query, "\n%s", where2); - psFree(where2); - } - if (priority_order) { - psStringAppend(&query, "\nAND priority > 0 order by exp_id, priority"); + psStringAppend(&query, "\nAND priority > 0 order by stack_id, priority"); } @@ -1058,5 +1046,5 @@ } - if (!ippdbPrintMetadatas(stdout, output, "relExp", !simple)) { + if (!ippdbPrintMetadatas(stdout, output, "relStack", !simple)) { psError(PS_ERR_UNKNOWN, false, "failed to print array"); psFree(output); Index: trunk/ippTools/src/releasetoolConfig.c =================================================================== --- trunk/ippTools/src/releasetoolConfig.c (revision 35365) +++ trunk/ippTools/src/releasetoolConfig.c (revision 35397) @@ -202,4 +202,37 @@ psMetadataAddU64(definerelstackArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + // -listrelstack + psMetadata *listrelstackArgs = psMetadataAlloc(); + psMetadataAddS64(listrelstackArgs, PS_LIST_TAIL, "-relstack_id", 0, "select by released exposure ID", 0); + psMetadataAddS64(listrelstackArgs, PS_LIST_TAIL, "-stack_id", 0, "select by stack ID", 0); + psMetadataAddS64(listrelstackArgs, PS_LIST_TAIL, "-skycal_id", 0, "select by skycal ID", 0); + psMetadataAddStr(listrelstackArgs, PS_LIST_TAIL, "-release_name", 0, "select by release name (LIKE comparision)", NULL); + psMetadataAddStr(listrelstackArgs, PS_LIST_TAIL, "-release_state", PS_META_DUPLICATE_OK, "select by release state", NULL); + psMetadataAddStr(listrelstackArgs, PS_LIST_TAIL, "-state", 0, "select by released stack state", NULL); + + psMetadataAddStr(listrelstackArgs, PS_LIST_TAIL, "-filter", 0, "select by filter name (LIKE comparison)", NULL); + // psMetadataAddTime(listrelstackArgs, PS_LIST_TAIL, "-dateobs_begin", 0,"search for exposures by time (>=)", NULL); + // psMetadataAddTime(listrelstackArgs, PS_LIST_TAIL, "-dateobs_end", 0, "search for exposures by time (<=)", NULL); + + pxskycellAddArguments(listrelstackArgs); + + psMetadataAddF32(listrelstackArgs, PS_LIST_TAIL, "-fwhm_min", 0, "search by measured seeing (>=)", NAN); + psMetadataAddF32(listrelstackArgs, PS_LIST_TAIL, "-fwhm_max", 0, "search by seeing (<=)", NAN); + + psMetadataAddStr(listrelstackArgs, PS_LIST_TAIL, "-tess_id", 0, "select by tess_id", NULL); + psMetadataAddStr(listrelstackArgs, PS_LIST_TAIL, "-skycell_id", 0, "select by skycell_id (LIKE comparision)", NULL); + + psMetadataAddStr(listrelstackArgs, PS_LIST_TAIL, "-stack_data_group", 0, "select by stackRun.data_group (LIKE comparison)", NULL); + psMetadataAddStr(listrelstackArgs, PS_LIST_TAIL, "-skycal_data_group", 0, "select by skycalRun.data_group (LIKE comparison)", NULL); + + psMetadataAddStr(listrelstackArgs, PS_LIST_TAIL, "-surveyName", 0, "select by survey name (LIKE comparision)", NULL); + psMetadataAddS64(listrelstackArgs, PS_LIST_TAIL, "-rel_id", 0, "select by release ID", 0); + + psMetadataAddBool(listrelstackArgs, PS_LIST_TAIL, "-priority_order", 0, "order by release priority", false); + + psMetadataAddU64(listrelstackArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + psMetadataAddBool(listrelstackArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); + + // -definerelgroup psMetadata *definerelgroupArgs = psMetadataAlloc(); @@ -274,4 +307,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("-definerelgroup", "define a group of exposures", RELEASETOOL_MODE_DEFINERELGROUP, definerelgroupArgs);