Index: branches/eam_branches/ipp-20130307/ippTools/src/pstamptool.c =================================================================== --- branches/eam_branches/ipp-20130307/ippTools/src/pstamptool.c (revision 35350) +++ branches/eam_branches/ipp-20130307/ippTools/src/pstamptool.c (revision 35412) @@ -49,7 +49,4 @@ static bool revertjobMode(pxConfig *config); -# if (1) -// these are unused functions -- since they are 'static', this raises an warning -// XXX: They actually are used static bool addprojectMode(pxConfig *config); static bool projectMode(pxConfig *config); @@ -63,5 +60,4 @@ static bool listfileMode(pxConfig *config); static bool deletefileMode(pxConfig *config); -# endif # define MODECASE(caseName, func) \ @@ -103,5 +99,4 @@ MODECASE(PSTAMPTOOL_MODE_STOPDEPENDENTJOB, stopdependentjobMode); MODECASE(PSTAMPTOOL_MODE_REVERTJOB, revertjobMode); -# if (1) MODECASE(PSTAMPTOOL_MODE_ADDPROJECT, addprojectMode); MODECASE(PSTAMPTOOL_MODE_MODPROJECT, modprojectMode); @@ -115,5 +110,5 @@ MODECASE(PSTAMPTOOL_MODE_LISTFILE, listfileMode); MODECASE(PSTAMPTOOL_MODE_DELETEFILE, deletefileMode); -# endif + default: psAbort("invalid option (this should not happen)"); @@ -624,4 +619,7 @@ if (outdir) { psStringAppend(&query, ", outdir = '%s'", outdir); + } + if (username) { + psStringAppend(&query, ", username = '%s'", username); } if (clearfault) { @@ -1236,4 +1234,5 @@ PXOPT_LOOKUP_BOOL(need_magic, config->args, "-need_magic", false); PXOPT_LOOKUP_BOOL(no_create, config->args, "-no_create", false); + PXOPT_LOOKUP_BOOL(hold, config->args, "-hold", false); psMetadata *where = psMetadataAlloc(); @@ -1243,5 +1242,5 @@ PXOPT_COPY_STR(config->args, where, "-component", "component", "=="); - // start a transaction eraly so it will contain any row level locks + // start a transaction early so it will contain any row level locks if (!psDBTransaction(config->dbh)) { psError(PS_ERR_UNKNOWN, false, "database error"); @@ -1267,4 +1266,7 @@ psError(PS_ERR_UNKNOWN, false, "database error"); psFree(query); + if (!psDBRollback(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + } return false; } @@ -1274,4 +1276,7 @@ if (!output) { psError(PS_ERR_UNKNOWN, false, "database error"); + if (!psDBRollback(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + } return false; } @@ -1282,4 +1287,7 @@ psError(PS_ERR_UNKNOWN, false, "database error"); psFree(output); + if (!psDBRollback(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + } return false; } @@ -1287,10 +1295,51 @@ if (fault > 0) { fprintf(stderr, "existing dependent has fault %d\n", fault); + if (!psDBRollback(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + } + // return the fault to the client. This is used by the postage stamp parser exit (fault); } + bool commit = false; + // Check the state of the exisiting dependent. By query it is either + // new or hold + psString state = psMetadataLookupStr(NULL, dep, "state"); + if (!hold && !strcmp(state, "hold")) { + // There is a dependent for this component but it's state is hold. + // This client needs one that will run. + // Update the state + psString updateQuery = NULL; + psStringAppend(&updateQuery, "UPDATE pstampDependent SET state = 'new' " + "\nWHERE stage = '%s' AND imagedb = '%s' AND stage_id = %"PRId64 " AND component = '%s'", + stage, imagedb, stage_id, component); + + if (!p_psDBRunQuery(config->dbh, updateQuery)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + psFree(updateQuery); + if (!psDBRollback(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + } + return false; + } + // set flag to commit this change + commit = true; + psFree(updateQuery); + } + // print the dep_id for the user printf("%" PRId64 "\n", dep_id); psFree(output); - if (!psDBRollback(config->dbh)) { + // now either commit the change or rollback the transaction which releases the lock + if (commit) { + if (!psDBCommit(config->dbh)) { + // rollback + if (!psDBRollback(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + } psError(PS_ERR_UNKNOWN, false, "database error"); + return false; + } + } else if (!psDBRollback(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + return false; } return true; @@ -1310,5 +1359,5 @@ config->dbh, 0, // dep_id - "new", // state + hold ? "hold" : "new", // state stage, stage_id, Index: branches/eam_branches/ipp-20130307/ippTools/src/pstamptoolConfig.c =================================================================== --- branches/eam_branches/ipp-20130307/ippTools/src/pstamptoolConfig.c (revision 35350) +++ branches/eam_branches/ipp-20130307/ippTools/src/pstamptoolConfig.c (revision 35412) @@ -223,4 +223,5 @@ psMetadataAddBool(getdependentArgs,PS_LIST_TAIL, "-need_magic", 0, "define need_magic", false); psMetadataAddStr(getdependentArgs, PS_LIST_TAIL, "-outdir", 0, "define output directory for dependent (required)", NULL); + psMetadataAddBool(getdependentArgs,PS_LIST_TAIL, "-hold", 0, "if creating new dependent set it's state to hold", false); psMetadataAddBool(getdependentArgs,PS_LIST_TAIL, "-no_create", 0, "if no matching dependent do not create one", false); Index: branches/eam_branches/ipp-20130307/ippTools/src/releasetool.c =================================================================== --- branches/eam_branches/ipp-20130307/ippTools/src/releasetool.c (revision 35350) +++ branches/eam_branches/ipp-20130307/ippTools/src/releasetool.c (revision 35412) @@ -832,4 +832,5 @@ PXOPT_LOOKUP_BOOL(pretend, config->args, "-pretend", false); PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); + PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); // find the parameters of all the exposures that we want to add to the release @@ -852,4 +853,10 @@ psFree(where); + + if (limit) { + psString limitString = psDBGenerateLimitSQL(limit); + psStringAppend(&query, " %s", limitString); + psFree(limitString); + } if (!p_psDBRunQuery(config->dbh, query)) { @@ -968,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); @@ -993,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; } @@ -1009,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"); @@ -1017,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"); } @@ -1051,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); @@ -1331,5 +1326,10 @@ PS_ASSERT_PTR_NON_NULL(config, false); - PXOPT_LOOKUP_S32(group_id, config->args, "-group_id", true, false); + PXOPT_LOOKUP_S32(group_id, config->args, "-group_id", false, false); + PXOPT_LOOKUP_STR(group_name, config->args, "-group_name", false, false); + if (!group_id && !group_name) { + psError(PXTOOLS_ERR_CONFIG, true, "either group_id or group_name is required\n"); + return false; + } PXOPT_LOOKUP_STR(state, config->args, "-set_state", false, false); @@ -1352,4 +1352,5 @@ PXOPT_COPY_S64(config->args, where, "-group_id", "relGroup.group_id", "=="); + PXOPT_COPY_STR(config->args, where, "-group_name", "relGroup.group_name", "=="); // XXX TODO if label is enabled (for changing label or state for a block) we should // disallow setting some parameters such as exp_list_path Index: branches/eam_branches/ipp-20130307/ippTools/src/releasetoolConfig.c =================================================================== --- branches/eam_branches/ipp-20130307/ippTools/src/releasetoolConfig.c (revision 35350) +++ branches/eam_branches/ipp-20130307/ippTools/src/releasetoolConfig.c (revision 35412) @@ -195,9 +195,43 @@ psMetadataAddF32(definerelstackArgs, PS_LIST_TAIL, "-set_zpt_stdev", 0, "define zero point stdev", NAN); psMetadataAddF32(definerelstackArgs, PS_LIST_TAIL, "-set_fwhm_major", 0, "define fwhm_major", NAN); - psMetadataAddStr(definerelstackArgs, PS_LIST_TAIL, "-set_path_base", 0, "define state (required)", NULL); + psMetadataAddStr(definerelstackArgs, PS_LIST_TAIL, "-set_path_base", 0, "define state", NULL); psMetadataAddS16(definerelstackArgs, PS_LIST_TAIL, "-set_fault", 0, "define fault", 0); - psMetadataAddBool(definerelstackArgs, PS_LIST_TAIL, "-pretend", 0, "do not actually modify the database", false); + psMetadataAddBool(definerelstackArgs, PS_LIST_TAIL, "-pretend", 0, "do not actually modify the database", false); psMetadataAddBool(definerelstackArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); + 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 @@ -240,5 +274,6 @@ psMetadata *updaterelgroupArgs = psMetadataAlloc(); - psMetadataAddS32(updaterelgroupArgs, PS_LIST_TAIL, "-group_id", 0, "select by group ID (required)", 0); + psMetadataAddS32(updaterelgroupArgs, PS_LIST_TAIL, "-group_id", 0, "select by group ID", 0); + psMetadataAddStr(updaterelgroupArgs, PS_LIST_TAIL, "-group_name", 0, "select by group name", 0); // parameters of the relGroup @@ -272,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);