Index: branches/eam_branches/ipp-20130711/ippTools/src/difftool.c =================================================================== --- branches/eam_branches/ipp-20130711/ippTools/src/difftool.c (revision 35801) +++ branches/eam_branches/ipp-20130711/ippTools/src/difftool.c (revision 36071) @@ -1253,4 +1253,5 @@ PXOPT_LOOKUP_STR(note, config->args, "-set_note", false, false); PXOPT_LOOKUP_TIME(registered, config->args, "-set_registered", false, false); + PXOPT_LOOKUP_STR(warp_data_group, config->args, "-data_group", false, false); PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); @@ -1260,4 +1261,10 @@ + if (!data_group) { + if (warp_data_group) { + data_group = warp_data_group; + } + } + // Get query file psString query = pxDataGet("difftool_definewarpstack.sql"); Index: branches/eam_branches/ipp-20130711/ippTools/src/disttool.c =================================================================== --- branches/eam_branches/ipp-20130711/ippTools/src/disttool.c (revision 35801) +++ branches/eam_branches/ipp-20130711/ippTools/src/disttool.c (revision 36071) @@ -375,7 +375,23 @@ } if (dist_group) { - psStringAppend(&query, " AND (sticskyRun.dist_group = '%s')", dist_group); + psStringAppend(&query, " AND (staticskyRun.dist_group = '%s')", dist_group); } // (static)sky stage doesn't require magic + magic = false; + } else if (!strcmp(stage, "skycal")) { + query = pxDataGet("disttool_definebyquery_skycal.sql"); + if (!query) { + psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); + psFree(where); + return false; + } + + if (label) { + psStringAppend(&query, " AND (skycalRun.label = '%s')", label); + } + if (dist_group) { + psStringAppend(&query, " AND (skycalRun.dist_group = '%s')", dist_group); + } + // skycal stage doesn't require magic magic = false; } else if (!strcmp(stage, "SSdiff")) { Index: branches/eam_branches/ipp-20130711/ippTools/src/pstamptool.c =================================================================== --- branches/eam_branches/ipp-20130711/ippTools/src/pstamptool.c (revision 35801) +++ branches/eam_branches/ipp-20130711/ippTools/src/pstamptool.c (revision 36071) @@ -1428,5 +1428,5 @@ psFree(where); - psStringAppend(&query, " ORDER BY priority DESC, req_id, dep_id"); + psStringAppend(&query, " GROUP BY dep_id ORDER BY priority DESC, MIN(req_id), dep_id"); // treat limit == 0 as "no limit" Index: branches/eam_branches/ipp-20130711/ippTools/src/releasetool.c =================================================================== --- branches/eam_branches/ipp-20130711/ippTools/src/releasetool.c (revision 35801) +++ branches/eam_branches/ipp-20130711/ippTools/src/releasetool.c (revision 36071) @@ -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); @@ -180,9 +182,11 @@ PS_ASSERT_PTR_NON_NULL(config, false); - PXOPT_LOOKUP_S32(surveyID, config->args, "-set_surveyID", true, false); - PXOPT_LOOKUP_STR(release_name, config->args, "-set_release_name", true, false); + PXOPT_LOOKUP_S32(surveyID, config->args, "-set_surveyID", true, false); + PXOPT_LOOKUP_STR(release_name, config->args, "-set_release_name", true, false); PXOPT_LOOKUP_STR(release_state, config->args, "-set_release_state", true, false); - PXOPT_LOOKUP_S32(dataRelease, config->args, "-set_dataRelease", false, false); - PXOPT_LOOKUP_S32(priority, config->args, "-set_priority", false, false); + PXOPT_LOOKUP_S32(dataRelease, config->args, "-set_dataRelease", false, false); + PXOPT_LOOKUP_S32(priority, config->args, "-set_priority", false, false); + PXOPT_LOOKUP_STR(dvodb, config->args, "-set_dvodb", false, false); + PXOPT_LOOKUP_STR(ubercal_file, config->args, "-set_ubercal_file", false, false); if (!ippReleaseInsert(config->dbh, @@ -192,5 +196,7 @@ release_state, dataRelease, - priority + priority, + dvodb, + ubercal_file )) { psError(PS_ERR_UNKNOWN, false, "failed to insert ippRelease"); @@ -215,6 +221,8 @@ PXOPT_LOOKUP_S32(priority, config->args, "-set_priority", false, false); PXOPT_LOOKUP_S32(dataRelease, config->args, "-set_dataRelease", false, false); - if (!release_state && priority == 0 && dataRelease == -1) { - psError(PXTOOLS_ERR_CONFIG, true, "at least one of -set_release_state -set_priority and -set_dataRelease is required\n"); + PXOPT_LOOKUP_STR(dvodb, config->args, "-set_dvodb", false, false); + PXOPT_LOOKUP_STR(ubercal_file, config->args, "-set_ubercal_file", false, false); + if (!release_state && priority == 0 && dataRelease == -1 && !dvodb && !ubercal_file) { + psError(PXTOOLS_ERR_CONFIG, true, "at least one of -set_release_state -set_priority -set_dvodb -set_ubercal_file and -set_dataRelease is required\n"); return false; } @@ -238,4 +246,12 @@ if (dataRelease != -1) { psStringAppend(&query, "%s dataRelease = %d", sep, dataRelease); + sep = comma; + } + if (dvodb) { + psStringAppend(&query, "%s dvodb = '%s'", sep, dvodb); + sep = comma; + } + if (ubercal_file) { + psStringAppend(&query, "%s ubercal_file = '%s'", sep, ubercal_file); sep = comma; } @@ -366,4 +382,6 @@ PXOPT_LOOKUP_F32(user_zpt_obs, config->args, "-set_zpt_obs", false, false); PXOPT_LOOKUP_F32(user_zpt_stdev, config->args, "-set_zpt_stdev", false, false); + PXOPT_LOOKUP_F32(mcal, config->args, "-set_mcal", false, false); + PXOPT_LOOKUP_S32(ubercal_dist, config->args, "-set_ubercal_dist", false, false); PXOPT_LOOKUP_STR(path_base, config->args, "-set_path_base", false, false); PXOPT_LOOKUP_S16(fault, config->args, "-set_fault", false, false); @@ -456,4 +474,6 @@ zpt_obs, zpt_stdev, + mcal, + ubercal_dist, path_base, fault, @@ -496,10 +516,13 @@ PXOPT_LOOKUP_STR(state, config->args, "-set_state", false, false); PXOPT_LOOKUP_U32(flags, config->args, "-set_flags", false, false); - PXOPT_LOOKUP_STR(path_base, config->args, "-set_path_base", false, false); + PXOPT_LOOKUP_STR(path_base,config->args, "-set_path_base", false, false); PXOPT_LOOKUP_F32(zpt_obs, config->args, "-set_zpt_obs", false, false); PXOPT_LOOKUP_F32(zpt_stdev,config->args, "-set_zpt_stdev", false, false); + PXOPT_LOOKUP_F32(mcal, config->args, "-set_mcal", false, false); PXOPT_LOOKUP_S16(fault, config->args, "-set_fault", false, false); + PXOPT_LOOKUP_S32(ubercal_dist, config->args, "-set_ubercal_dist", false, false); PXOPT_LOOKUP_BOOL(clearfault, config->args, "-clearfault", false); - if (!state && !flags && !path_base && !isfinite(zpt_obs) && !isfinite(zpt_stdev) && !fault && !clearfault) { + if (!state && !flags && !path_base && !isfinite(zpt_obs) && !isfinite(zpt_stdev) &&!isfinite(mcal) + && !fault && !clearfault && !ubercal_dist) { psError(PXTOOLS_ERR_CONFIG, true, "must set at least one column\n"); return false; @@ -557,4 +580,12 @@ sep = comma; } + if (isfinite(mcal)) { + psStringAppend(&query, "%s relExp.mcal = %f", sep, mcal); + sep = comma; + } + if (ubercal_dist) { + psStringAppend(&query, "%s relExp.ubercal_dist = %d", sep, ubercal_dist); + sep = comma; + } psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); @@ -569,5 +600,5 @@ psU64 affected = psDBAffectedRows(config->dbh); - psLogMsg("releasetool", PS_LOG_INFO, "Updated %" PRIu64 " ippReleases", affected); + psLogMsg("releasetool", PS_LOG_INFO, "Updated %" PRIu64 " relExp rows", affected); @@ -1049,5 +1080,98 @@ 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, "-data_group", "stackAssociation.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: branches/eam_branches/ipp-20130711/ippTools/src/releasetool.h =================================================================== --- branches/eam_branches/ipp-20130711/ippTools/src/releasetool.h (revision 35801) +++ branches/eam_branches/ipp-20130711/ippTools/src/releasetool.h (revision 36071) @@ -38,4 +38,5 @@ RELEASETOOL_MODE_TOCALIBSTACK, RELEASETOOL_MODE_LISTRELSTACK, + RELEASETOOL_MODE_SUMMARY, RELEASETOOL_MODE_DEFINERELGROUP, RELEASETOOL_MODE_PENDINGRELGROUP, Index: branches/eam_branches/ipp-20130711/ippTools/src/releasetoolConfig.c =================================================================== --- branches/eam_branches/ipp-20130711/ippTools/src/releasetoolConfig.c (revision 35801) +++ branches/eam_branches/ipp-20130711/ippTools/src/releasetoolConfig.c (revision 36071) @@ -64,4 +64,6 @@ psMetadataAddStr(definereleaseArgs, PS_LIST_TAIL, "-set_release_state", 0, "define release state", NULL); psMetadataAddS32(definereleaseArgs, PS_LIST_TAIL, "-set_priority", 0, "define release priority", 0); + psMetadataAddStr(definereleaseArgs, PS_LIST_TAIL, "-set_dvodb", 0, "define dvo db name", NULL); + psMetadataAddStr(definereleaseArgs, PS_LIST_TAIL, "-set_ubercal_file", 0, "define ubercal file name", NULL); // -uptdaterelease @@ -75,4 +77,6 @@ psMetadataAddS32(updatereleaseArgs, PS_LIST_TAIL, "-set_priority", 0, "define new release priority", 0); psMetadataAddS32(updatereleaseArgs, PS_LIST_TAIL, "-set_dataRelease", 0, "define data release", -1); + psMetadataAddStr(updatereleaseArgs, PS_LIST_TAIL, "-set_dvodb", 0, "define new dvo db name", NULL); + psMetadataAddStr(updatereleaseArgs, PS_LIST_TAIL, "-set_ubercal_file", 0, "define new ubercal file name", NULL); @@ -108,4 +112,6 @@ psMetadataAddF32(definerelexpArgs, PS_LIST_TAIL, "-set_zpt_obs", 0, "define zero point", NAN); psMetadataAddF32(definerelexpArgs, PS_LIST_TAIL, "-set_zpt_stdev", 0, "define zero point stdev", NAN); + psMetadataAddF32(definerelexpArgs, PS_LIST_TAIL, "-set_mcal", 0, "define mcal", NAN); + psMetadataAddS32(definerelexpArgs, PS_LIST_TAIL, "-set_ubercal_dist", 0, "define ubercal dist", 0); psMetadataAddStr(definerelexpArgs, PS_LIST_TAIL, "-set_path_base", 0, "define state", NULL); psMetadataAddS16(definerelexpArgs, PS_LIST_TAIL, "-set_fault", 0, "define fault", 0); @@ -126,4 +132,6 @@ psMetadataAddF32(updaterelexpArgs, PS_LIST_TAIL, "-set_zpt_obs", 0, "define new zero point", NAN); psMetadataAddF32(updaterelexpArgs, PS_LIST_TAIL, "-set_zpt_stdev", 0, "define new zero point stdev", NAN); + psMetadataAddF32(updaterelexpArgs, PS_LIST_TAIL, "-set_mcal", 0, "define mcal", NAN); + psMetadataAddS32(updaterelexpArgs, PS_LIST_TAIL, "-set_ubercal_dist", 0, "define new ubercal dist", 0); psMetadataAddStr(updaterelexpArgs, PS_LIST_TAIL, "-set_path_base", 0, "define path_base", NULL); psMetadataAddS16(updaterelexpArgs, PS_LIST_TAIL, "-set_fault", 0, "define new fault", 0); @@ -240,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, "-data_group", 0, "select by stackAsociation.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 @@ -314,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); Index: branches/eam_branches/ipp-20130711/ippTools/src/stacktool.c =================================================================== --- branches/eam_branches/ipp-20130711/ippTools/src/stacktool.c (revision 35801) +++ branches/eam_branches/ipp-20130711/ippTools/src/stacktool.c (revision 36071) @@ -44,4 +44,5 @@ static bool tosummaryMode(pxConfig *config); static bool addsummaryMode(pxConfig *config); +static bool summaryMode(pxConfig *config); static bool pendingcleanuprunMode(pxConfig *config); static bool pendingcleanupskyfileMode(pxConfig *config); @@ -84,4 +85,5 @@ MODECASE(STACKTOOL_MODE_TOSUMMARY, tosummaryMode); MODECASE(STACKTOOL_MODE_ADDSUMMARY, addsummaryMode); + MODECASE(STACKTOOL_MODE_SUMMARY, summaryMode); MODECASE(STACKTOOL_MODE_PENDINGCLEANUPRUN, pendingcleanuprunMode); MODECASE(STACKTOOL_MODE_PENDINGCLEANUPSKYFILE, pendingcleanupskyfileMode); @@ -748,4 +750,5 @@ PXOPT_COPY_S64(config->args, where, "-stack_id", "stackRun.stack_id", "=="); PXOPT_COPY_STR(config->args, where, "-label", "stackRun.label", "=="); + PXOPT_COPY_STR(config->args, where, "-data_group", "stackRun.data_group", "=="); PXOPT_COPY_STR(config->args, where, "-state", "stackRun.state", "=="); PXOPT_COPY_S64(config->args, where, "-sass_id", "stackAssociationMap.sass_id", "=="); @@ -1475,10 +1478,11 @@ // generate where strings for arguments that require extra processing // beyond PXOPT_COPY* + psString whereClause; if (psListLength(where->list)) { - psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); - psStringAppend(&query, " AND %s", whereClause); - psFree(whereClause); + whereClause = psDBGenerateWhereConditionSQL(where, NULL); + psStringPrepend(&whereClause, "\n AND "); } else if (!all) { psError(PXTOOLS_ERR_CONFIG, true, "search parameters or -all are required"); + psFree(whereClause); return false; } @@ -1493,9 +1497,11 @@ } - if (!p_psDBRunQuery(config->dbh, query)) { + if (!p_psDBRunQueryF(config->dbh, query, whereClause)) { psError(PS_ERR_UNKNOWN, false, "database error"); + psFree(whereClause); psFree(query); return false; } + psFree(whereClause); psFree(query); @@ -1564,4 +1570,92 @@ } +static bool summaryMode(pxConfig *config) +{ + PS_ASSERT_PTR_NON_NULL(config, false); + + psMetadata *where = psMetadataAlloc(); + PXOPT_COPY_S64(config->args, where, "-sass_id", "stackSummary.sass_id", "=="); + PXOPT_COPY_STR(config->args, where, "-projection_cell", "stackAssociation.projection_cell", "=="); + PXOPT_COPY_STR(config->args, where, "-tess_id", "stackAssociation.tess_id", "LIKE"); + PXOPT_COPY_STR(config->args, where, "-filter", "stackAssociation.filter", "LIKE"); + PXOPT_COPY_S64(config->args, where, "-stack_id", "stackSumSkyfile.stack_id", "=="); + pxAddLabelSearchArgs(config, where, "-data_group", "stackAssociation.data_group", "LIKE"); + PXOPT_COPY_STR(config->args, where, "-skycell_id", "stackRun.skycell_id", "LIKE"); +// PXOPT_COPY_STR(config->args, where, "-state", "stackRun.state", "=="); + pxAddLabelSearchArgs(config, where, "-label", "stackRun.label", "LIKE"); +// PXOPT_COPY_S16(config->args, where, "-fault", "stackSumSkyfile.fault", "=="); +// PXOPT_COPY_F64(config->args, where, "-mjd_obs_begin", "stackSumSkyfile.mjd_obs", ">="); +// PXOPT_COPY_F64(config->args, where, "-mjd_obs_end", "stackSumSkyfile.mjd_obs", "<="); +// PXOPT_COPY_S16(config->args, where, "-background_model","stackSumSkyfile.background_model", "=="); + +// PXOPT_LOOKUP_BOOL(all, config->args, "-all", false); + + PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); + PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); + + psString query = pxDataGet("stacktool_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, " WHERE %s", whereClause); + psFree(whereClause); + } else { + psError(PXTOOLS_ERR_CONFIG, true, "search parameters 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("stacktool", PS_LOG_INFO, "no rows found"); + psFree(output); + return true; + } + + if (psArrayLength(output)) { + if (!ippdbPrintMetadatas(stdout, output, "stackSummary", !simple)) { + psError(PS_ERR_UNKNOWN, false, "failed to print array"); + psFree(output); + return false; + } + } + + psFree(output); + + return true; +} + static bool pendingcleanuprunMode(pxConfig *config) { Index: branches/eam_branches/ipp-20130711/ippTools/src/stacktool.h =================================================================== --- branches/eam_branches/ipp-20130711/ippTools/src/stacktool.h (revision 35801) +++ branches/eam_branches/ipp-20130711/ippTools/src/stacktool.h (revision 36071) @@ -38,4 +38,5 @@ STACKTOOL_MODE_TOSUMMARY, STACKTOOL_MODE_ADDSUMMARY, + STACKTOOL_MODE_SUMMARY, STACKTOOL_MODE_PENDINGCLEANUPRUN, STACKTOOL_MODE_PENDINGCLEANUPSKYFILE, Index: branches/eam_branches/ipp-20130711/ippTools/src/stacktoolConfig.c =================================================================== --- branches/eam_branches/ipp-20130711/ippTools/src/stacktoolConfig.c (revision 35801) +++ branches/eam_branches/ipp-20130711/ippTools/src/stacktoolConfig.c (revision 36071) @@ -121,4 +121,5 @@ psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-state", 0, "search by state", NULL); psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-label", 0, "search by label", 0); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-data_group", 0, "search by data_group", 0); psMetadataAddS16(updaterunArgs, PS_LIST_TAIL, "-fault", 0, "search by fault code", 0); psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-sass_id", 0, "search by stack association ID", 0); @@ -264,4 +265,21 @@ psMetadataAddStr(addsummaryArgs, PS_LIST_TAIL, "-path_base", 0, "set summary path base", NULL); + // -summary + psMetadata *summaryArgs = psMetadataAlloc(); + psMetadataAddS64(summaryArgs, PS_LIST_TAIL, "-sass_id", 0, "search by stack association ID", 0); + psMetadataAddS64(summaryArgs, PS_LIST_TAIL, "-stack_id", 0, "search by stack ID", 0); + psMetadataAddStr(summaryArgs, PS_LIST_TAIL, "-tess_id", 0, "search by tessellation ID", NULL); + psMetadataAddStr(summaryArgs, PS_LIST_TAIL, "-projection_cell", 0, "search by projection cell ID", NULL); +// psMetadataAddStr(summaryArgs, PS_LIST_TAIL, "-state", 0, "search by state", NULL); + psMetadataAddStr(summaryArgs, PS_LIST_TAIL, "-filter", 0, "search by filter (LIKE comparison)", NULL); + psMetadataAddStr(summaryArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "search by stackRun label (LIKE comparison)", NULL); + psMetadataAddStr(summaryArgs, PS_LIST_TAIL, "-data_group", PS_META_DUPLICATE_OK, "search by stackAssociation data_group (LIKE comparison)", NULL); + psMetadataAddStr(summaryArgs, PS_LIST_TAIL, "-skycell_id", 0, "search by skycell ID", NULL); +// psMetadataAddStr(summaryArgs, PS_LIST_TAIL, "-dist_group", PS_META_DUPLICATE_OK, "search by stackRun dist_group (LIKE comparison)", NULL); + +// psMetadataAddBool(summaryArgs, PS_LIST_TAIL, "-all", 0, "search without arguments", 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); + // -pendingcleanuprun psMetadata *pendingcleanuprunArgs = psMetadataAlloc(); @@ -324,4 +342,5 @@ PXOPT_ADD_MODE("-updatesumskyfile", "update fault code for sumskyfile", STACKTOOL_MODE_UPDATESUMSKYFILE, updatesumskyfileArgs); PXOPT_ADD_MODE("-tosummary", "show runs that can be summarized", STACKTOOL_MODE_TOSUMMARY, tosummaryArgs); + PXOPT_ADD_MODE("-summary", "show runs that have been summarized", STACKTOOL_MODE_SUMMARY, summaryArgs); PXOPT_ADD_MODE("-addsummary", "add entry to the summary table", STACKTOOL_MODE_ADDSUMMARY, addsummaryArgs); PXOPT_ADD_MODE("-exportrun", "export run for import on other database", STACKTOOL_MODE_EXPORTRUN, exportrunArgs); Index: branches/eam_branches/ipp-20130711/ippTools/src/staticskytool.c =================================================================== --- branches/eam_branches/ipp-20130711/ippTools/src/staticskytool.c (revision 35801) +++ branches/eam_branches/ipp-20130711/ippTools/src/staticskytool.c (revision 36071) @@ -50,4 +50,6 @@ static bool revertskycalresultMode(pxConfig *config); static bool updateskycalresultMode(pxConfig *config); +static bool exportskycalrunMode(pxConfig *config); +static bool importskycalrunMode(pxConfig *config); static bool setstaticskyRunState(pxConfig *config, psS64 sky_id, const char *state); @@ -88,4 +90,6 @@ MODECASE(STATICSKYTOOL_MODE_REVERTSKYCALRESULT,revertskycalresultMode); MODECASE(STATICSKYTOOL_MODE_SKYCALRESULT, skycalresultMode); + MODECASE(STATICSKYTOOL_MODE_EXPORTSKYCALRUN, exportskycalrunMode); + MODECASE(STATICSKYTOOL_MODE_IMPORTSKYCALRUN, importskycalrunMode); default: psAbort("invalid option (this should not happen)"); @@ -895,75 +899,107 @@ bool importrunMode(pxConfig *config) { -# if (0) - unsigned int nFail; - - int numImportTables = 2; - - char tables[2] [80] = {"stackInputSkyfile", "stackSumSkyfile"}; + return false; +} + +bool exportskycalrunMode(pxConfig *config) +{ + typedef struct ExportTable { + char tableName[80]; + char sqlFilename[80]; + } ExportTable; + + int numExportTables = 2; PS_ASSERT_PTR_NON_NULL(config, NULL); - PXOPT_LOOKUP_STR(infile, config->args, "-infile", true, false); - - psMetadata *input = psMetadataConfigRead (NULL, &nFail, infile, false); - -#ifdef notdef - fprintf (stderr, "---- input ----\n"); - psMetadataPrint (stderr, input, 1); -#endif - - if (!pxCheckImportVersion(config, input)) { - psError(PS_ERR_UNKNOWN, false, "pxCheckImportVersion failed"); + // XXX unused PXOPT_LOOKUP_S64(det_id, config->args, "-sky_id", true, false); + PXOPT_LOOKUP_STR(outfile, config->args, "-outfile", true, false); + PXOPT_LOOKUP_BOOL(clean, config->args, "-clean", false); + PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); + + FILE *f = fopen (outfile, "w"); + if (f == NULL) { + psError(PS_ERR_UNKNOWN, false, "failed to open output file"); return false; } - psMetadataItem *item = psMetadataLookup (input, "stackRun"); - psAssert (item, "entry not in input?"); - psAssert (item->type == PS_DATA_METADATA_MULTI, "entry not multi?"); - - psMetadataItem *entry = psListGet (item->data.list, 0); - assert (entry); - assert (entry->type == PS_DATA_METADATA); - stackRunRow *stackRun = stackRunObjectFromMetadata (entry->data.md); - stackRunInsertObject (config->dbh, stackRun); - - // fprintf (stdout, "---- stack run ----\n"); - // psMetadataPrint (stderr, entry->data.md, 1); - - for (int i = 0; i < numImportTables; i++) { - psMetadataItem *item = psMetadataLookup (input, tables[i]); - psAssert (item, "entry not in input?"); - psAssert (item->type == PS_DATA_METADATA_MULTI, "entry not multi?"); - - switch (i) { - case 0: - for (int i = 0; i < item->data.list->n; i++) { - entry = psListGet (item->data.list, i); - assert (entry); - assert (entry->type == PS_DATA_METADATA); - stackInputSkyfileRow *stackInputSkyfile = stackInputSkyfileObjectFromMetadata (entry->data.md); - stackInputSkyfileInsertObject (config->dbh, stackInputSkyfile); - - // fprintf (stdout, "---- row %d ----\n", i); - // psMetadataPrint (stderr, entry->data.md, 1); - } - break; - - case 1: - for (int i = 0; i < item->data.list->n; i++) { - entry = psListGet (item->data.list, i); - assert (entry); - assert (entry->type == PS_DATA_METADATA); - stackSumSkyfileRow *stackSumSkyfile = stackSumSkyfileObjectFromMetadata (entry->data.md); - stackSumSkyfileInsertObject (config->dbh, stackSumSkyfile); - - // fprintf (stdout, "---- row %d ----\n", i); - // psMetadataPrint (stderr, entry->data.md, 1); - } - break; - } + + if (!pxExportVersion(config, f)) { + psError(PS_ERR_UNKNOWN, false, "failed to write dbversion output file"); + return false; } - -# endif - return true; + psMetadata *where = psMetadataAlloc(); + PXOPT_COPY_S64(config->args, where, "-skycal_id", "skycal_id", "=="); + + ExportTable tables [] = { + {"skycalRun", "staticskytool_export_skycalrun.sql"}, + {"skycalResult", "staticskytool_export_skycalresult.sql"}, + }; + + for (int i=0; i < numExportTables; i++) { + psString query = pxDataGet(tables[i].sqlFilename); + if (!query) { + psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); + return false; + } + + if (where && psListLength(where->list)) { + psString whereClause = psDBGenerateWhereSQL(where, NULL); + psStringAppend(&query, " %s", whereClause); + psFree(whereClause); + } + + // 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) { + psError(PS_ERR_UNKNOWN, false, "database error"); + return false; + } + if (!psArrayLength(output)) { + psError(PS_ERR_UNKNOWN, true, "no rows found"); + psFree(output); + return false; + } + + if (clean) { + if (!strcmp(tables[i].tableName, "skycalRun")) { + if (!pxSetStateCleaned("skycalRun", "state", output)) { + psFree(output); + psError(PS_ERR_UNKNOWN, false, "pxSetStateClean failed for table %s", tables[i].tableName); + return false; + } + } + } + + // we must write the export table in non-simple (true) format + if (!ippdbPrintMetadatas(f, output, tables[i].tableName, true)) { + psError(PS_ERR_UNKNOWN, false, "failed to print array"); + psFree(output); + return false; + } + + psFree(output); + } + + fclose (f); + + return true; +} + +bool importskycalrunMode(pxConfig *config) +{ + return false; } @@ -986,37 +1022,4 @@ } - -# if (0) - // now we need to loop over all requested filters and check that each is found - // XXX is this needed? haven't we required that we only match the requested filters - // and that N unique filters are found? - - psVector *found = psVectorAlloc(inputs->n, PS_TYPE_U8); - psVectorInit (found, 0); - - psMetadataItem *filter = NULL; - psListIterator *iter = psListIteratorAlloc (filters->data.list, PS_LIST_HEAD, false); - while ((filter = psListGetAndIncrement(iter))) { - - bool foundOne = false; - - psAssert (filter->type == PS_DATA_STR, "filter is not a string?"); - for (int j = 0; !foundOne && (j < inputs->n); j++) { - if (found->data.U8[j]) continue; - psMetadata *inputRow = inputs->data[j]; // Row from select - - // pull out the skycell_id, tess_id, filter - psString inFilter = psMetadataLookupStr(&status, row, "filter"); - psAssert (status); - - found->data.U8[j] = true; - foundOne = true; - } - if (!foundOne) { - // this required filter was not found in the inputs, skip the entry - skip(); - } - } -# endif static bool defineskycalrunMode(pxConfig *config) Index: branches/eam_branches/ipp-20130711/ippTools/src/staticskytool.h =================================================================== --- branches/eam_branches/ipp-20130711/ippTools/src/staticskytool.h (revision 35801) +++ branches/eam_branches/ipp-20130711/ippTools/src/staticskytool.h (revision 36071) @@ -43,4 +43,6 @@ STATICSKYTOOL_MODE_SKYCALRESULT, STATICSKYTOOL_MODE_REVERTSKYCALRESULT, + STATICSKYTOOL_MODE_EXPORTSKYCALRUN, + STATICSKYTOOL_MODE_IMPORTSKYCALRUN, } staticskytoolMode; Index: branches/eam_branches/ipp-20130711/ippTools/src/staticskytoolConfig.c =================================================================== --- branches/eam_branches/ipp-20130711/ippTools/src/staticskytoolConfig.c (revision 35801) +++ branches/eam_branches/ipp-20130711/ippTools/src/staticskytoolConfig.c (revision 36071) @@ -269,4 +269,16 @@ psMetadataAddBool(skycalresultArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); + // -exportskycalrun + psMetadata *exportskycalrunArgs = psMetadataAlloc(); + psMetadataAddS64(exportskycalrunArgs, PS_LIST_TAIL, "-skycal_id", 0, "export this skycal ID (required)", 0); + psMetadataAddStr(exportskycalrunArgs, PS_LIST_TAIL, "-outfile", 0, "export to this file (required)", NULL); + psMetadataAddU64(exportskycalrunArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + psMetadataAddBool(exportskycalrunArgs, PS_LIST_TAIL, "-clean", 0, "mark tables as cleaned", false); + + // -importrun + psMetadata *importskycalrunArgs = psMetadataAlloc(); + psMetadataAddStr(importskycalrunArgs, PS_LIST_TAIL, "-infile", 0, "import from this file (required)", NULL); + + psFree(now); @@ -291,4 +303,6 @@ PXOPT_ADD_MODE("-updateskycal", "revert faulted skycal run", STATICSKYTOOL_MODE_UPDATESKYCALRESULT, updateskycalresultArgs); PXOPT_ADD_MODE("-skycalresult", "Get result of skycal run", STATICSKYTOOL_MODE_SKYCALRESULT, skycalresultArgs); + PXOPT_ADD_MODE("-exportskycalrun", "Export skycal run", STATICSKYTOOL_MODE_EXPORTSKYCALRUN, exportskycalrunArgs); + PXOPT_ADD_MODE("-importskycalrun", "Import skycal run", STATICSKYTOOL_MODE_IMPORTSKYCALRUN, importskycalrunArgs); if (!pxGetOptions(stderr, argc, argv, config, modes, argSets)) {