Index: branches/czw_branch/20110406/ippTools/src/addtool.c =================================================================== --- branches/czw_branch/20110406/ippTools/src/addtool.c (revision 31434) +++ branches/czw_branch/20110406/ippTools/src/addtool.c (revision 31606) @@ -117,5 +117,5 @@ psMetadata *where = psMetadataAlloc(); - pxcamGetSearchArgs (config, where); + // pxcamGetSearchArgs (config, where); PXOPT_COPY_S64(config->args, where, "-cam_id", "camRun.cam_id", "=="); PXOPT_COPY_S64(config->args, where, "-stack_id", "stackRun.stack_id", "=="); @@ -123,7 +123,8 @@ PXOPT_LOOKUP_STR(stage, config->args, "-stage", false, false); if (strcmp(stage, "cam")== 0) { - + pxcamGetSearchArgs (config, where); pxAddLabelSearchArgs (config, where, "-label", "camRun.label", "=="); // define using camRun label pxAddLabelSearchArgs (config, where, "-data_group","camRun.data_group", "=="); // define using camRun label + PXOPT_COPY_STR(config->args, where, "-reduction", "camRun.reduction", "=="); } @@ -133,4 +134,5 @@ pxAddLabelSearchArgs (config, where, "-data_group","stackRun.data_group", "=="); // define using camRun label PXOPT_COPY_STR(config->args, where, "-reduction", "stackRun.reduction", "=="); + pxAddLabelSearchArgs (config, where, "-filter", "stackRun.filter", "=="); // define using camRun label } if (strcmp(stage, "staticsky")== 0) { @@ -139,4 +141,5 @@ pxAddLabelSearchArgs (config, where, "-data_group","staticskyRun.data_group", "=="); // define using camRun label PXOPT_COPY_STR(config->args, where, "-reduction", "staticskyyRun.reduction", "=="); + pxAddLabelSearchArgs (config, where, "-filter", "stackRun.filter", "=="); // define using camRun label } Index: branches/czw_branch/20110406/ippTools/src/addtoolConfig.c =================================================================== --- branches/czw_branch/20110406/ippTools/src/addtoolConfig.c (revision 31434) +++ branches/czw_branch/20110406/ippTools/src/addtoolConfig.c (revision 31606) @@ -56,4 +56,5 @@ psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "search by camRun label", NULL); psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-data_group", PS_META_DUPLICATE_OK, "search by camRun data_group", NULL); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-filter", PS_META_DUPLICATE_OK, "search by filter", NULL); psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-reduction", 0, "search by camRun reduction class", NULL); psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-destreaked", 0, "only queue destreaked runs", false); Index: branches/czw_branch/20110406/ippTools/src/disttool.c =================================================================== --- branches/czw_branch/20110406/ippTools/src/disttool.c (revision 31434) +++ branches/czw_branch/20110406/ippTools/src/disttool.c (revision 31606) @@ -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/czw_branch/20110406/ippTools/src/magictool.c =================================================================== --- branches/czw_branch/20110406/ippTools/src/magictool.c (revision 31434) +++ branches/czw_branch/20110406/ippTools/src/magictool.c (revision 31606) @@ -404,5 +404,6 @@ PXOPT_LOOKUP_STR(note, config->args, "-set_note", false, false); PXOPT_LOOKUP_BOOL(clearfault, config->args, "-clearfault", false); - + PXOPT_LOOKUP_STR(label, config->args, "-set_label", false, false); + psString setString = NULL; if (fault || clearfault) { @@ -411,4 +412,7 @@ if (note) { psStringAppend(&setString, ", note = '%s'", note); + } + if (label) { + psStringAppend(&setString, ", label = '%s'", label); } Index: branches/czw_branch/20110406/ippTools/src/magictoolConfig.c =================================================================== --- branches/czw_branch/20110406/ippTools/src/magictoolConfig.c (revision 31434) +++ branches/czw_branch/20110406/ippTools/src/magictoolConfig.c (revision 31606) @@ -81,4 +81,5 @@ psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_state", 0, "set state (required)", NULL); psMetadataAddS16(updaterunArgs, PS_LIST_TAIL, "-set_fault", 0, "set fault code", 0); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_label", 0, "define label", 0); psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_note", 0, "define note", NULL); psMetadataAddBool(updaterunArgs, PS_LIST_TAIL, "-clearfault", 0, "set fault to zero", NULL); Index: branches/czw_branch/20110406/ippTools/src/pstamptool.c =================================================================== --- branches/czw_branch/20110406/ippTools/src/pstamptool.c (revision 31434) +++ branches/czw_branch/20110406/ippTools/src/pstamptool.c (revision 31606) @@ -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/czw_branch/20110406/ippTools/src/pubtoolConfig.c =================================================================== --- branches/czw_branch/20110406/ippTools/src/pubtoolConfig.c (revision 31434) +++ branches/czw_branch/20110406/ippTools/src/pubtoolConfig.c (revision 31606) @@ -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/czw_branch/20110406/ippTools/src/pzgetimfiles.c =================================================================== --- branches/czw_branch/20110406/ippTools/src/pzgetimfiles.c (revision 31434) +++ branches/czw_branch/20110406/ippTools/src/pzgetimfiles.c (revision 31606) @@ -125,5 +125,5 @@ if (status != 0) { // mark the summitExp row as faulted - if (!p_psDBRunQueryF(config->dbh, "UPDATE summitExp SET fault = %d WHERE summit_id = %ld", WEXITSTATUS(status), summit_id)) { + if (!p_psDBRunQueryF(config->dbh, "UPDATE summitExp SET fault = %d WHERE summit_id = %lld", WEXITSTATUS(status), (long long) summit_id)) { psError(PS_ERR_UNKNOWN, false, "database error"); } @@ -141,5 +141,5 @@ // download an "empty" fileset. // mark the summitExp row as faulted - if (!p_psDBRunQueryF(config->dbh, "UPDATE summitExp SET fault = %d WHERE summit_id = %ld", 250, summit_id)) { + if (!p_psDBRunQueryF(config->dbh, "UPDATE summitExp SET fault = %d WHERE summit_id = %lld", 250, (long long) summit_id)) { psError(PS_ERR_UNKNOWN, false, "database error"); } Index: branches/czw_branch/20110406/ippTools/src/pztool.c =================================================================== --- branches/czw_branch/20110406/ippTools/src/pztool.c (revision 31434) +++ branches/czw_branch/20110406/ippTools/src/pztool.c (revision 31606) @@ -638,5 +638,5 @@ // set pzDownloadExp.state to 'stop' if (!pzDownloadExpSetState(config, summit_id, "stop")) { - psError(PS_ERR_UNKNOWN, false, "failed to change pzDownloadExp.state for %ld", summit_id); + psError(PS_ERR_UNKNOWN, false, "failed to change pzDownloadExp.state for %lld", (long long) summit_id); return false; } @@ -913,5 +913,5 @@ char *query = "UPDATE pzDownloadExp SET state = '%s' WHERE summit_id = %ld"; if (!p_psDBRunQueryF(config->dbh, query, state, summit_id)) { - psError(PS_ERR_UNKNOWN, false, "failed to change state for %ld", summit_id); + psError(PS_ERR_UNKNOWN, false, "failed to change state for %lld", (long long) summit_id); return false; } @@ -927,5 +927,5 @@ if (!pzDownloadExpSetState(config,summit_id, state)) { - psError(PS_ERR_UNKNOWN, false, "failed to change state for %ld", summit_id); + psError(PS_ERR_UNKNOWN, false, "failed to change state for %lld", (long long) summit_id); return false; } Index: branches/czw_branch/20110406/ippTools/src/stacktool.c =================================================================== --- branches/czw_branch/20110406/ippTools/src/stacktool.c (revision 31434) +++ branches/czw_branch/20110406/ippTools/src/stacktool.c (revision 31606) @@ -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", ">="); @@ -487,5 +488,5 @@ // Define the requested association, and insert it if it doesn't already exist stackAssociationRow *association = pxStackAssociationDefine(config,stack_id); - psS64 sass_id; + psS64 sass_id=-1; if (!association->sass_id) { psTrace("stacktool.association",2,"No required Association found. Adding."); @@ -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/czw_branch/20110406/ippTools/src/stacktoolConfig.c =================================================================== --- branches/czw_branch/20110406/ippTools/src/stacktoolConfig.c (revision 31434) +++ branches/czw_branch/20110406/ippTools/src/stacktoolConfig.c (revision 31606) @@ -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);