Index: branches/czw_branch/20100519/ippTools/src/difftool.c =================================================================== --- branches/czw_branch/20100519/ippTools/src/difftool.c (revision 28164) +++ branches/czw_branch/20100519/ippTools/src/difftool.c (revision 28245) @@ -2356,5 +2356,5 @@ PXOPT_LOOKUP_S64(diff_id, config->args, "-diff_id", true, false); - PXOPT_LOOKUP_STR(tangent_plane, config->args, "-tangent_plane", true, false); + PXOPT_LOOKUP_STR(projection_cell, config->args, "-projection_cell", true, false); PXOPT_LOOKUP_STR(path_base, config->args, "-path_base", true, false); @@ -2364,5 +2364,5 @@ return(false); } - if (!p_psDBRunQueryF(config->dbh, query, diff_id, tangent_plane, path_base)) { + if (!p_psDBRunQueryF(config->dbh, query, diff_id, projection_cell, path_base)) { psError(PS_ERR_UNKNOWN, false, "database error"); psFree(query); Index: branches/czw_branch/20100519/ippTools/src/difftoolConfig.c =================================================================== --- branches/czw_branch/20100519/ippTools/src/difftoolConfig.c (revision 28164) +++ branches/czw_branch/20100519/ippTools/src/difftoolConfig.c (revision 28245) @@ -327,15 +327,19 @@ psMetadataAddS64(tosummaryArgs, PS_LIST_TAIL, "-diff_id", 0, "search by diff ID", 0); psMetadataAddStr(tosummaryArgs, PS_LIST_TAIL, "-tess_id", 0, "search by tessellation ID", NULL); - psMetadataAddStr(tosummaryArgs , PS_LIST_TAIL, "-warp_id", 0, "search by warp_id", NULL); - psMetadataAddBool(tosummaryArgs, PS_LIST_TAIL, "-template", 0, "apply exposure args to template of bothways diff", false); + psMetadataAddStr(tosummaryArgs, PS_LIST_TAIL, "-state", 0, "search by state", NULL); psMetadataAddS64(tosummaryArgs, PS_LIST_TAIL, "-exp_id", 0, "search by exposure ID", 0); psMetadataAddStr(tosummaryArgs , PS_LIST_TAIL, "-exp_name", 0, "search by exposure name", NULL); + psMetadataAddS64(tosummaryArgs, PS_LIST_TAIL, "-warp_id", 0, "search by warp ID", 0); + psMetadataAddTime(tosummaryArgs, PS_LIST_TAIL, "-dateobs_begin", 0, "search for exposures by time (>=)", NULL); psMetadataAddTime(tosummaryArgs, PS_LIST_TAIL, "-dateobs_end", 0, "search for exposures by time (<=)", NULL); psMetadataAddStr(tosummaryArgs, PS_LIST_TAIL, "-filter", 0, "search for filter", NULL); + psMetadataAddS64(tosummaryArgs, PS_LIST_TAIL, "-magicked", 0, "search by magic id", 0); psMetadataAddStr(tosummaryArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "search by diffRun label (LIKE comparison)", NULL); psMetadataAddStr(tosummaryArgs, PS_LIST_TAIL, "-data_group", PS_META_DUPLICATE_OK, "search by diffRun data_group (LIKE comparison)", NULL); psMetadataAddStr(tosummaryArgs, PS_LIST_TAIL, "-dist_group", PS_META_DUPLICATE_OK, "search by diffRun dist_group (LIKE comparison)", NULL); - + psMetadataAddBool(tosummaryArgs, PS_LIST_TAIL, "-destreaked", 0, "search for runs that have been destreaked", false); + psMetadataAddBool(tosummaryArgs, PS_LIST_TAIL, "-not_destreaked", 0, "search for runs that have not been destreaked", false); + psMetadataAddBool(tosummaryArgs, PS_LIST_TAIL, "-all", 0, "search without arguments", false); psMetadataAddU64(tosummaryArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); @@ -345,5 +349,5 @@ psMetadata *addsummaryArgs = psMetadataAlloc(); psMetadataAddS64(addsummaryArgs, PS_LIST_TAIL, "-diff_id", 0, "search by diff ID", 0); - psMetadataAddStr(addsummaryArgs, PS_LIST_TAIL, "-tangent_plane", 0, "set tangent plane", NULL); + psMetadataAddStr(addsummaryArgs, PS_LIST_TAIL, "-projection_cell", 0, "set projection cell", NULL); psMetadataAddStr(addsummaryArgs, PS_LIST_TAIL, "-path_base", 0, "set summary path base", NULL); Index: branches/czw_branch/20100519/ippTools/src/stacktool.c =================================================================== --- branches/czw_branch/20100519/ippTools/src/stacktool.c (revision 28164) +++ branches/czw_branch/20100519/ippTools/src/stacktool.c (revision 28245) @@ -106,4 +106,58 @@ exit(exit_status); } +//stackAssociationRow *association = pxStackAssociationDefine(data_group,tess_id,filter,skycell_id); +stackAssociationRow *pxStackAssociationDefine(pxConfig *config, psS64 stack_id) { + psString select = pxDataGet("stacktool_associationdefine_select.sql"); + if (!select) { + psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); + return false; + } + + psString idString = NULL; + psStringAppend(&idString, "%" PRId64, stack_id); + psStringSubstitute(&select,idString, "@STACK_ID@"); + psFree(idString); + + if (!p_psDBRunQuery(config->dbh, select)) { + psError(PS_ERR_UNKNOWN,false, "database error"); + psFree(select); + return(NULL); + } + psFree(select); + 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(NULL); + } + if (psArrayLength(output) != 1) { + psWarning("stacktool: incorrect number of rows found"); + psFree(output); + return(NULL); + } + psMetadata *outrow = NULL; + for (long i = 0; i < output->n; i++) { + psMetadata *row = output->data[i]; + if (!psMetadataCopy(row,outrow)) { + psError(PS_ERR_UNKNOWN, false, "Failed to copy row to return"); + return(NULL); + } + } + psFree(output); + stackAssociationRow *sassRow = stackAssociationObjectFromMetadata(outrow); + psFree(outrow); + return(sassRow); +} + + + + @@ -399,4 +453,48 @@ psFree(run); + //CZW Add an association entry here. + // Define the requested association, and insert it if it doesn't already exist + stackAssociationRow *association = pxStackAssociationDefine(config,stack_id); + psS64 sass_id; + if (!association->sass_id) { + psTrace("stacktool.association",2,"No required Association found. Adding."); + + if (!stackAssociationInsertObject(config->dbh,association)) { + if (!psDBRollback(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + } + psError(PS_ERR_UNKNOWN, false, "database error"); + psFree(output); + psFree(run); + psFree(insert); + psFree(list); + psFree(association); + if (!psDBRollback(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + } + return(false); + } + sass_id = psDBLastInsertID(config->dbh); + association->sass_id = sass_id; + } + // Insert the map entry for this row. + stackAssociationMapRow *maprow = stackAssociationMapRowAlloc(sass_id,stack_id); + if (!stackAssociationMapInsertObject(config->dbh,maprow)) { + if (!psDBRollback(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + } + psError(PS_ERR_UNKNOWN, false, "database error"); + psFree(output); + psFree(run); + psFree(insert); + psFree(list); + psFree(association); + if (!psDBRollback(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + } + return(false); + } + + // Create a suitable insertion query for this run psString thisInsert = psStringCopy(insert); @@ -556,4 +654,6 @@ run->stack_id = psDBLastInsertID(config->dbh); + //CZW Add an association entry here. + // insert the stackInputSkyfile rows psListIterator *iter = psListIteratorAlloc(warp_ids->data.list, 0, false); @@ -607,7 +707,8 @@ #endif psMetadata *where = psMetadataAlloc(); - PXOPT_COPY_S64(config->args, where, "-stack_id", "stack_id", "=="); - PXOPT_COPY_STR(config->args, where, "-label", "label", "=="); - PXOPT_COPY_STR(config->args, where, "-state", "state", "=="); + 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, "-state", "stackRun.state", "=="); + PXOPT_COPY_STR(config->args, where, "-sass_id", "stackAssociationMap.sass_id", "=="); if (!psListLength(where->list)) { psFree(where); @@ -616,4 +717,5 @@ } + //CZW join against stackAssociationMap psString query = psStringCopy("UPDATE stackRun"); @@ -961,4 +1063,5 @@ psMetadata *where = psMetadataAlloc(); PXOPT_COPY_S64(config->args, where, "-stack_id", "stackSumSkyfile.stack_id", "=="); + PXOPT_COPY_S64(config->args, where, "-sass_id", "stackAssociationMap.sass_id", "=="); PXOPT_COPY_STR(config->args, where, "-tess_id", "stackRun.tess_id", "=="); PXOPT_COPY_STR(config->args, where, "-skycell_id", "stackRun.skycell_id", "=="); @@ -1134,4 +1237,5 @@ psMetadata *where = psMetadataAlloc(); PXOPT_COPY_S64(config->args, where, "-stack_id", "stackSumSkyfile.warp_id", "=="); + PXOPT_COPY_S64(config->args, where, "-sass_id", "stackAssociationMap.sass_id", "=="); PXOPT_COPY_STR(config->args, where, "-tess_id", "stackSumSkyfile.tess_id", "=="); PXOPT_COPY_STR(config->args, where, "-state", "stackRun.state", "=="); @@ -1215,5 +1319,5 @@ PXOPT_LOOKUP_S64(stack_id, config->args, "-stack_id", true, false); - PXOPT_LOOKUP_STR(tangent_plane, config->args, "-tangent_plane", true, false); + PXOPT_LOOKUP_STR(projection_cell, config->args, "-projection_cell", true, false); PXOPT_LOOKUP_STR(path_base, config->args, "-path_base", true, false); @@ -1223,5 +1327,5 @@ return(false); } - if (!p_psDBRunQueryF(config->dbh, query, stack_id, tangent_plane, path_base)) { + if (!p_psDBRunQueryF(config->dbh, query, stack_id, projection_cell, path_base)) { psError(PS_ERR_UNKNOWN, false, "database error"); psFree(query); @@ -1251,4 +1355,7 @@ psMetadata *where = psMetadataAlloc(); + PXOPT_COPY_S64(config->args, where, "-stack_id", "stackRun.stack_id", "=="); + PXOPT_COPY_S64(config->args, where, "-sass_id", "stackAssociationMap.sass_id", "=="); + pxAddLabelSearchArgs (config, where, "-label", "stackRun.label", "=="); @@ -1377,4 +1484,5 @@ psMetadata *where = psMetadataAlloc(); PXOPT_COPY_STR(config->args, where, "-label", "label", "=="); + PXOPT_COPY_STR(config->args, where, "-sass_id", "sass_id", "=="); psString query = pxDataGet("stacktool_donecleanup.sql"); @@ -1446,4 +1554,5 @@ } +//CZW I have not added sass information to the export/import run modes yet. bool exportrunMode(pxConfig *config) { Index: branches/czw_branch/20100519/ippTools/src/stacktoolConfig.c =================================================================== --- branches/czw_branch/20100519/ippTools/src/stacktoolConfig.c (revision 28164) +++ branches/czw_branch/20100519/ippTools/src/stacktoolConfig.c (revision 28245) @@ -207,4 +207,5 @@ psMetadata *tosummaryArgs = psMetadataAlloc(); psMetadataAddS64(tosummaryArgs, PS_LIST_TAIL, "-stack_id", 0, "search by stack ID", 0); + psMetadataAddS64(tosummaryArgs, PS_LIST_TAIL, "-sass_id", 0, "search by stack association ID", 0); psMetadataAddStr(tosummaryArgs, PS_LIST_TAIL, "-tess_id", 0, "search by tessellation ID", NULL); psMetadataAddStr(tosummaryArgs, PS_LIST_TAIL, "-state", 0, "search by state", NULL); @@ -221,5 +222,5 @@ psMetadata *addsummaryArgs = psMetadataAlloc(); psMetadataAddS64(addsummaryArgs, PS_LIST_TAIL, "-stack_id", 0, "set stack ID", 0); - psMetadataAddStr(addsummaryArgs, PS_LIST_TAIL, "-tangent_plane", 0, "set tangent plane", NULL); + psMetadataAddStr(addsummaryArgs, PS_LIST_TAIL, "-projection_cell", 0, "set projection cell", NULL); psMetadataAddStr(addsummaryArgs, PS_LIST_TAIL, "-path_base", 0, "set summary path base", NULL); Index: branches/czw_branch/20100519/ippTools/src/warptool.c =================================================================== --- branches/czw_branch/20100519/ippTools/src/warptool.c (revision 28164) +++ branches/czw_branch/20100519/ippTools/src/warptool.c (revision 28245) @@ -1653,5 +1653,5 @@ PXOPT_LOOKUP_S64(warp_id, config->args, "-warp_id", true, false); - PXOPT_LOOKUP_STR(tangent_plane, config->args, "-tangent_plane", true, false); + PXOPT_LOOKUP_STR(projection_cell, config->args, "-projection_cell", true, false); PXOPT_LOOKUP_STR(path_base, config->args, "-path_base", true, false); @@ -1661,5 +1661,5 @@ return(false); } - if (!p_psDBRunQueryF(config->dbh, query, warp_id, tangent_plane, path_base)) { + if (!p_psDBRunQueryF(config->dbh, query, warp_id, projection_cell, path_base)) { psError(PS_ERR_UNKNOWN, false, "database error"); psFree(query); Index: branches/czw_branch/20100519/ippTools/src/warptoolConfig.c =================================================================== --- branches/czw_branch/20100519/ippTools/src/warptoolConfig.c (revision 28164) +++ branches/czw_branch/20100519/ippTools/src/warptoolConfig.c (revision 28245) @@ -336,6 +336,6 @@ psMetadataAddStr(tosummaryArgs, PS_LIST_TAIL, "-data_group", PS_META_DUPLICATE_OK, "search by warpRun data_group", NULL); psMetadataAddStr(tosummaryArgs, PS_LIST_TAIL, "-dist_group", PS_META_DUPLICATE_OK, "search by warpRun dist_group", NULL); - psMetadataAddBool(updaterunArgs, PS_LIST_TAIL, "-destreaked", 0, "search for runs that have been destreaked", false); - psMetadataAddBool(updaterunArgs, PS_LIST_TAIL, "-not_destreaked", 0, "search for runs that have not been destreaked", false); + psMetadataAddBool(tosummaryArgs, PS_LIST_TAIL, "-destreaked", 0, "search for runs that have been destreaked", false); + psMetadataAddBool(tosummaryArgs, PS_LIST_TAIL, "-not_destreaked", 0, "search for runs that have not been destreaked", false); psMetadataAddBool(tosummaryArgs, PS_LIST_TAIL, "-all", 0, "search without arguments", false); @@ -346,5 +346,5 @@ psMetadata *addsummaryArgs = psMetadataAlloc(); psMetadataAddS64(addsummaryArgs, PS_LIST_TAIL, "-warp_id", 0, "set warp ID", 0); - psMetadataAddStr(addsummaryArgs, PS_LIST_TAIL, "-tangent_plane", 0, "set tangent plane", NULL); + psMetadataAddStr(addsummaryArgs, PS_LIST_TAIL, "-projection_cell", 0, "set projection cell", NULL); psMetadataAddStr(addsummaryArgs, PS_LIST_TAIL, "-path_base", 0, "set summary path base", NULL);