Index: branches/eam_branches/ipp-20110505/ippTools/src/disttool.c =================================================================== --- branches/eam_branches/ipp-20110505/ippTools/src/disttool.c (revision 31458) +++ branches/eam_branches/ipp-20110505/ippTools/src/disttool.c (revision 31587) @@ -447,5 +447,5 @@ if (pretend) { - if (!ippdbPrintMetadatas(stdout, output, "newdistRuns", true)) { + if (!ippdbPrintMetadatas(stdout, output, "newdistRuns", !simple)) { psError(PS_ERR_UNKNOWN, false, "failed to print array"); psFree(output); Index: branches/eam_branches/ipp-20110505/ippTools/src/laptool.c =================================================================== --- branches/eam_branches/ipp-20110505/ippTools/src/laptool.c (revision 31458) +++ branches/eam_branches/ipp-20110505/ippTools/src/laptool.c (revision 31587) @@ -384,8 +384,10 @@ PXOPT_COPY_STR(config->args, where, "-projection_cell", "projection_cell", "=="); PXOPT_COPY_STR(config->args, where, "-filter", "filter", "=="); - PXOPT_COPY_STR(config->args, where, "-label", "label", "=="); + // PXOPT_COPY_STR(config->args, where, "-label", "label", "=="); PXOPT_COPY_STR(config->args, where, "-state", "state", "=="); PXOPT_COPY_STR(config->args, where, "-fault", "fault", "=="); + pxAddLabelSearchArgs(config, where, "-label", "lapRun.label", "=="); + psString query = pxDataGet("laptool_pendingrun.sql"); if (!query) { @@ -560,5 +562,5 @@ psMetadata *where = psMetadataAlloc(); PXOPT_COPY_S64(config->args, where, "-lap_id", "lap_id", "=="); - PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "=="); + PXOPT_COPY_S64(config->args, where, "-exp_id", "lapExp.exp_id", "=="); psString query = pxDataGet("laptool_exposures.sql"); Index: branches/eam_branches/ipp-20110505/ippTools/src/laptoolConfig.c =================================================================== --- branches/eam_branches/ipp-20110505/ippTools/src/laptoolConfig.c (revision 31458) +++ branches/eam_branches/ipp-20110505/ippTools/src/laptoolConfig.c (revision 31587) @@ -69,8 +69,21 @@ ADD_OPT(Str, pendingrunArgs, "-projection_cell", "search by projection cell", NULL); ADD_OPT(Str, pendingrunArgs, "-filter", "search by filter", NULL); - ADD_OPT(Str, pendingrunArgs, "-label", "search by LAP run label", NULL); + // ADD_OPT(Str, pendingrunArgs, "-label", "search by LAP run label", NULL); + psMetadataAddStr(pendingrunArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "search by LAP run label", NULL); ADD_OPT(Str, pendingrunArgs, "-state", "search by LAP run state", NULL); ADD_OPT(Str, pendingrunArgs, "-fault", "search by LAP run fault", NULL); ADD_OPT(Bool,pendingrunArgs, "-simple", "use the simple output format", false); + + // -listrun + psMetadata *listrunArgs = psMetadataAlloc(); + ADD_OPT(S64, listrunArgs, "-seq_id", "search by LAP sequence ID", 0); + ADD_OPT(S64, listrunArgs, "-lap_id", "search by LAP run ID", 0); + ADD_OPT(Str, listrunArgs, "-projection_cell", "search by projection cell", NULL); + ADD_OPT(Str, listrunArgs, "-filter", "search by filter", NULL); + // ADD_OPT(Str, listrunArgs, "-label", "search by LAP run label", NULL); + psMetadataAddStr(listrunArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "search by LAP run label", NULL); + ADD_OPT(Str, listrunArgs, "-state", "search by LAP run state", NULL); + ADD_OPT(Str, listrunArgs, "-fault", "search by LAP run fault", NULL); + ADD_OPT(Bool,listrunArgs, "-simple", "use the simple output format", false); // -updaterun @@ -128,9 +141,10 @@ psMetadata *argSets = psMetadataAlloc(); psMetadata *modes = psMetadataAlloc(); - + PXOPT_ADD_MODE("-definesequence", "", LAPTOOL_MODE_DEFINESEQUENCE, definesequenceArgs); PXOPT_ADD_MODE("-listsequence", "", LAPTOOL_MODE_LISTSEQUENCE, listsequenceArgs); PXOPT_ADD_MODE("-definerun", "", LAPTOOL_MODE_DEFINERUN, definerunArgs); PXOPT_ADD_MODE("-pendingrun", "", LAPTOOL_MODE_PENDINGRUN, pendingrunArgs); + PXOPT_ADD_MODE("-listrun", "", LAPTOOL_MODE_PENDINGRUN, listrunArgs); PXOPT_ADD_MODE("-updaterun", "", LAPTOOL_MODE_UPDATERUN, updaterunArgs); PXOPT_ADD_MODE("-pendingexp", "", LAPTOOL_MODE_PENDINGEXP, pendingexpArgs); Index: branches/eam_branches/ipp-20110505/ippTools/src/pstamptool.c =================================================================== --- branches/eam_branches/ipp-20110505/ippTools/src/pstamptool.c (revision 31458) +++ branches/eam_branches/ipp-20110505/ippTools/src/pstamptool.c (revision 31587) @@ -843,5 +843,5 @@ psFree(where); - psStringAppend(&query, " ORDER BY priority DESC, req_id"); + psStringAppend(&query, " ORDER BY priority DESC, req_id, job_id"); // treat limit == 0 as "no limit" @@ -1323,5 +1323,5 @@ psFree(where); - psStringAppend(&query, " ORDER BY priority DESC, req_id"); + psStringAppend(&query, " ORDER BY priority DESC, req_id, dep_id"); // treat limit == 0 as "no limit" Index: branches/eam_branches/ipp-20110505/ippTools/src/pubtoolConfig.c =================================================================== --- branches/eam_branches/ipp-20110505/ippTools/src/pubtoolConfig.c (revision 31458) +++ branches/eam_branches/ipp-20110505/ippTools/src/pubtoolConfig.c (revision 31587) @@ -48,5 +48,7 @@ psMetadataAddStr(defineclientArgs, PS_LIST_TAIL, "-product", 0, "define product (required)", NULL); psMetadataAddStr(defineclientArgs, PS_LIST_TAIL, "-workdir", 0, "define workdir (required)", NULL); + psMetadataAddS16(defineclientArgs, PS_LIST_TAIL, "-output_format", 0, "define output format", 2); psMetadataAddStr(defineclientArgs, PS_LIST_TAIL, "-comment", 0, "define comment", NULL); + psMetadataAddStr(defineclientArgs, PS_LIST_TAIL, "-name", 0, "define name", NULL); psMetadataAddBool(defineclientArgs, PS_LIST_TAIL, "-unmagicked", 0, "allow unmagicked data?", false); Index: branches/eam_branches/ipp-20110505/ippTools/src/stacktool.c =================================================================== --- branches/eam_branches/ipp-20110505/ippTools/src/stacktool.c (revision 31458) +++ branches/eam_branches/ipp-20110505/ippTools/src/stacktool.c (revision 31587) @@ -246,5 +246,6 @@ PXOPT_COPY_STR(config->args, where, "-select_data_group", "warpRun.data_group", "=="); pxAddLabelSearchArgs (config, where, "-select_label", "warpRun.label", "LIKE"); // define using warp label - + pxAddLabelSearchArgs (config, where, "-warp_id", "warpRun.warp_id", "=="); + // these are used to build the HAVING restriction PXOPT_COPY_S32(config->args, having, "-min_num", "num_warp", ">="); @@ -508,4 +509,7 @@ association->sass_id = sass_id; } + else { + sass_id = association->sass_id; + } // Insert the map entry for this row. stackAssociationMapRow *maprow = stackAssociationMapRowAlloc(sass_id,stack_id); Index: branches/eam_branches/ipp-20110505/ippTools/src/stacktoolConfig.c =================================================================== --- branches/eam_branches/ipp-20110505/ippTools/src/stacktoolConfig.c (revision 31458) +++ branches/eam_branches/ipp-20110505/ippTools/src/stacktoolConfig.c (revision 31587) @@ -91,4 +91,5 @@ psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_zpt_obs_max", 0, "define max zero point", NAN); psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_astrom", 0, "define max astrometry rms", NAN); + psMetadataAddS64(definebyqueryArgs, PS_LIST_TAIL, "-warp_id", PS_META_DUPLICATE_OK, "include this warp ID (multiple OK)", 0); psMetadataAddS32(definebyqueryArgs, PS_LIST_TAIL, "-random", 0, "use this number of random elements", 0); psMetadataAddS32(definebyqueryArgs, PS_LIST_TAIL, "-min_num", 0, "minimum number of inputs", 0);