Index: trunk/ippTools/share/addtool_find_pendingexp_cam.sql =================================================================== --- trunk/ippTools/share/addtool_find_pendingexp_cam.sql (revision 41177) +++ trunk/ippTools/share/addtool_find_pendingexp_cam.sql (revision 41213) @@ -7,6 +7,9 @@ rawExp.camera, rawExp.telescope, - rawExp.filelevel + rawExp.filelevel, + minidvodbRun.minidvodb_host as dvodbhost FROM addRun +JOIN minidvodbRun + on addRun.minidvodb_group = minidvodbRun.minidvodb_group JOIN camRun on cam_id = stage_id @@ -28,3 +31,4 @@ AND addRun.workdir IS NOT NULL AND addMask.label IS NULL + AND minidvodbRun.state = 'active' Index: trunk/ippTools/share/addtool_queue_cam_id.sql =================================================================== --- trunk/ippTools/share/addtool_queue_cam_id.sql (revision 41177) +++ trunk/ippTools/share/addtool_queue_cam_id.sql (revision 41213) @@ -16,5 +16,6 @@ %d, -- minidvodb '%s', -- minidvodb_group - '%s' -- minidvodb_name + '%s', -- minidvodb_name + '%s' -- minidvodb_host FROM camRun WHERE Index: trunk/ippTools/share/addtool_queue_ff_id.sql =================================================================== --- trunk/ippTools/share/addtool_queue_ff_id.sql (revision 41177) +++ trunk/ippTools/share/addtool_queue_ff_id.sql (revision 41213) @@ -16,5 +16,6 @@ %d, -- minidvodb '%s', -- minidvodb_group - '%s' -- minidvodb_name + '%s', -- minidvodb_name + '%s' -- minidvodb_host FROM fullForceRun WHERE Index: trunk/ippTools/share/addtool_queue_ffsummary.sql =================================================================== --- trunk/ippTools/share/addtool_queue_ffsummary.sql (revision 41177) +++ trunk/ippTools/share/addtool_queue_ffsummary.sql (revision 41213) @@ -16,5 +16,6 @@ %d, -- minidvodb '%s', -- minidvodb_group - '%s' -- minidvodb_name + '%s', -- minidvodb_name + '%s' -- minidvodb_host FROM fullForceRun WHERE Index: trunk/ippTools/share/addtool_queue_sky_id.sql =================================================================== --- trunk/ippTools/share/addtool_queue_sky_id.sql (revision 41177) +++ trunk/ippTools/share/addtool_queue_sky_id.sql (revision 41213) @@ -16,5 +16,6 @@ %d, -- minidvodb '%s', -- minidvodb_group - '%s' -- minidvodb_name + '%s', -- minidvodb_name + '%s' -- minidvodb_host FROM staticskyRun WHERE Index: trunk/ippTools/share/addtool_queue_skycal_id.sql =================================================================== --- trunk/ippTools/share/addtool_queue_skycal_id.sql (revision 41177) +++ trunk/ippTools/share/addtool_queue_skycal_id.sql (revision 41213) @@ -16,5 +16,6 @@ %d, -- minidvodb '%s', -- minidvodb_group - '%s' -- minidvodb_name + '%s', -- minidvodb_name + '%s' -- minidvodb_host FROM skycalRun WHERE Index: trunk/ippTools/share/addtool_queue_stack_id.sql =================================================================== --- trunk/ippTools/share/addtool_queue_stack_id.sql (revision 41177) +++ trunk/ippTools/share/addtool_queue_stack_id.sql (revision 41213) @@ -16,5 +16,6 @@ %d, -- minidvodb '%s', -- minidvodb_group - '%s' -- minidvodb_name + '%s', -- minidvodb_name + '%s' -- minidvodb_host FROM stackRun WHERE Index: trunk/ippTools/src/addtool.c =================================================================== --- trunk/ippTools/src/addtool.c (revision 41177) +++ trunk/ippTools/src/addtool.c (revision 41213) @@ -134,9 +134,9 @@ PXOPT_LOOKUP_STR(minidvodb_name, config->args, "-set_minidvodb_name", false, false); PXOPT_LOOKUP_STR(minidvodb_group, config->args, "-set_minidvodb_group", false, false); + PXOPT_LOOKUP_STR(minidvodb_host, config->args, "-set_minidvodb_host", false, false); PXOPT_LOOKUP_BOOL(image_only, config->args, "-image_only", false); PXOPT_LOOKUP_BOOL(minidvodb, config->args, "-set_minidvodb", false); PXOPT_LOOKUP_BOOL(destreaked, config->args, "-destreaked", false); PXOPT_LOOKUP_BOOL(uncensored, config->args, "-uncensored", false); - PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); @@ -155,4 +155,5 @@ pxAddLabelSearchArgs (config, where, "-label", "camRun.label", "=="); // define using camRun label pxAddLabelSearchArgs (config, where, "-data_group","camRun.data_group", "=="); // define using camRun label + pxAddLabelSearchArgs (config, where, "-filter", "rawExp.filter", "LIKE"); // define using camRun label PXOPT_COPY_STR(config->args, where, "-reduction", "camRun.reduction", "=="); } @@ -703,5 +704,6 @@ minidvodb, minidvodb_group, - minidvodb_name + minidvodb_name, + minidvodb_host )) { if (!psDBRollback(config->dbh)) { @@ -745,5 +747,6 @@ minidvodb, minidvodb_group, - minidvodb_name + minidvodb_name, + minidvodb_host )) { if (!psDBRollback(config->dbh)) { @@ -779,5 +782,4 @@ return false; } - // queue the exp //for (int filter_id = 0; filter_id < num_inputs; filter_id++) { @@ -795,5 +797,6 @@ minidvodb, minidvodb_group, - minidvodb_name + minidvodb_name, + minidvodb_host )) { if (!psDBRollback(config->dbh)) { @@ -838,5 +841,6 @@ minidvodb, minidvodb_group, - minidvodb_name + minidvodb_name, + minidvodb_host )) { if (!psDBRollback(config->dbh)) { @@ -886,5 +890,6 @@ minidvodb, minidvodb_group, - minidvodb_name + minidvodb_name, + minidvodb_host )) { if (!psDBRollback(config->dbh)) { @@ -934,5 +939,6 @@ minidvodb, minidvodb_group, - minidvodb_name + minidvodb_name, + minidvodb_host )) { if (!psDBRollback(config->dbh)) { @@ -976,5 +982,6 @@ minidvodb, minidvodb_group, - minidvodb_name + minidvodb_name, + minidvodb_host )) { if (!psDBRollback(config->dbh)) { @@ -1203,4 +1210,5 @@ PXOPT_LOOKUP_STR(dvodb_path, config->args, "-dvodb_path", false, false); PXOPT_LOOKUP_STR(minidvodb_name, config->args, "-minidvodb_name", false, false); + PXOPT_LOOKUP_STR(minidvodb_host, config->args, "-minidvodb_host", false, false); PXOPT_LOOKUP_S16(fault, config->args, "-fault", false, false); PXOPT_LOOKUP_S64(stage_extra1, config->args, "-stage_extra1", false, false); @@ -1317,4 +1325,19 @@ } } + + //if there is a minidvodb_host, set it in addRun (it's not known until it is processed) + if (minidvodb_host) { + psString setName = NULL; + psStringAppend (&setName, "UPDATE addRun set minidvodb_host = '%s' where add_id = %" PRId64, minidvodb_host, row->add_id); + if (!p_psDBRunQuery(config->dbh, setName)) { + if (!psDBRollback(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + } + psError(PS_ERR_UNKNOWN, false, "database error"); + + return false; + } + } + //if there is a stage_extra1, set it in addRun (it's not known until it is processed) if (stage_extra1) { @@ -1332,7 +1355,4 @@ } } - - - // since there is only one exp per 'new' set addRun.state = 'full' @@ -1663,10 +1683,10 @@ // required PXOPT_LOOKUP_STR(minidvodb_group, config->args, "-set_minidvodb_group", true, false); - + PXOPT_LOOKUP_STR(minidvodb_path, config->args, "-set_minidvodb_path", false, false); + PXOPT_LOOKUP_STR(minidvodb_host, config->args, "-set_minidvodb_host", false, false); //optional PXOPT_LOOKUP_STR(minidvodb_name, config->args, "-set_minidvodb_name", false, false); - PXOPT_LOOKUP_STR(minidvodb_path, config->args, "-set_minidvodb_path", false, false); PXOPT_LOOKUP_STR(state, config->args, "-set_state", false, false); - + PXOPT_LOOKUP_STR(note, config->args, "-set_note", false, false); if (!psDBTransaction(config->dbh)) { @@ -1675,13 +1695,13 @@ } - psString minidvodbpath = "NULL"; +// psString minidvodbpath = "NULL"; // I don't know how to get around the complaints of minidvodb_path can't be null. this 'fixes' it, but someone smarter can fix it properly. - if (minidvodb_path) { - minidvodbpath = minidvodb_path; - } else { - psError(PS_ERR_UNKNOWN, false, "require minidvodb_path"); - return false; - } +// if (minidvodb_path) { +// minidvodbpath = minidvodb_path; +// } else { +// psError(PS_ERR_UNKNOWN, false, "require minidvodb_path"); +// return false; +// } if (!minidvodbRunInsert(config->dbh, @@ -1689,6 +1709,8 @@ minidvodb_name, minidvodb_group, - minidvodbpath, + minidvodb_path, + minidvodb_host, "new", + note, 0 )) { @@ -1746,4 +1768,5 @@ PXOPT_LOOKUP_STR(minidvodb_name, config->args, "-set_minidvodb_name", false, false); PXOPT_LOOKUP_STR(minidvodb_path, config->args, "-set_minidvodb_path", false, false); + PXOPT_LOOKUP_STR(minidvodb_host, config->args, "-set_minidvodb_host", false, false); PXOPT_LOOKUP_STR(state, config->args, "-set_state", false, false); PXOPT_LOOKUP_STR(minidvodb_group, config->args, "-set_minidvodb_group", false, false); @@ -1770,4 +1793,13 @@ psStringAppend(&query, " minidvodb_path = '%s'", minidvodb_path); + cnt++; + } + + if (minidvodb_host) { + if (cnt) { + psStringAppend(&query, "%s", comma); + } + + psStringAppend(&query, " minidvodb_host = '%s'", minidvodb_host); cnt++; } Index: trunk/ippTools/src/addtoolConfig.c =================================================================== --- trunk/ippTools/src/addtoolConfig.c (revision 41177) +++ trunk/ippTools/src/addtoolConfig.c (revision 41213) @@ -59,5 +59,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, "-filter", PS_META_DUPLICATE_OK, "search by rawExp filter", NULL); psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-reduction", 0, "search by camRun reduction class", NULL); psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-destreaked", 0, "queue destreaked runs", false); @@ -75,4 +75,5 @@ psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_minidvodb_group", 0, "define minidvodb_group", NULL); psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_minidvodb_name", 0, "define minidvodb_bname", NULL); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_minidvodb_host", 0, "define minidvodb_host", NULL); psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_data_group", 0, "define new data_group", NULL); psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_dist_group", 0, "define new dist_group", NULL); @@ -103,5 +104,5 @@ psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_state", 0, "set state", NULL); psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_label", 0, "set label", NULL); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_dvodb", 0, "set dvodb", NULL); +// psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_dvodb", 0, "set dvodb", NULL); psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_data_group", 0, "define new data_group", NULL); psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_dist_group", 0, "define new dist_group", NULL); @@ -133,4 +134,5 @@ psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-dvodb_path", 0, "define base output location", NULL); psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-minidvodb_name", 0, "define minidvodb_name", NULL); + psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-minidvodb_host", 0, "define minidvodb_name", NULL); psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-dtime_addstar", 0, "define elapsed time for DVO insertion (seconds)", NAN); psMetadataAddS16(addprocessedexpArgs, PS_LIST_TAIL, "-fault", 0, "set fault code", 0); @@ -190,5 +192,7 @@ psMetadataAddStr(addminidvodbrunArgs, PS_LIST_TAIL, "-set_minidvodb_group", 0, "define minidvodb_group (required)", NULL); psMetadataAddStr(addminidvodbrunArgs, PS_LIST_TAIL, "-set_minidvodb_path", 0, "define path for minidvodb", NULL); + psMetadataAddStr(addminidvodbrunArgs, PS_LIST_TAIL, "-set_minidvodb_host", 0, "define host for minidvodb (required)", NULL); psMetadataAddStr(addminidvodbrunArgs, PS_LIST_TAIL, "-set_state", 0, "define state", NULL); + psMetadataAddStr(addminidvodbrunArgs, PS_LIST_TAIL, "-set_note", 0, "define note", NULL); // -updateminidvodbruns @@ -202,4 +206,5 @@ psMetadataAddStr(updateminidvodbrunArgs, PS_LIST_TAIL, "-set_minidvodb_path", 0, "define path for minidvodb", NULL); psMetadataAddStr(updateminidvodbrunArgs, PS_LIST_TAIL, "-set_minidvodb_group", 0, "define path for the merged dvodb", NULL); + psMetadataAddStr(updateminidvodbrunArgs, PS_LIST_TAIL, "-set_minidvodb_host", 0, "define host for the merged dvodb", NULL); psMetadataAddStr(updateminidvodbrunArgs, PS_LIST_TAIL, "-set_state", 0, "define state", NULL); Index: trunk/ippTools/src/flatcorr.c =================================================================== --- trunk/ippTools/src/flatcorr.c (revision 41177) +++ trunk/ippTools/src/flatcorr.c (revision 41213) @@ -676,4 +676,5 @@ 0, //The minidvodb stuff is off NULL, + NULL, NULL)) { if (!psDBRollback(config->dbh)) { Index: trunk/ippTools/src/pxadd.c =================================================================== --- trunk/ippTools/src/pxadd.c (revision 41177) +++ trunk/ippTools/src/pxadd.c (revision 41213) @@ -141,5 +141,6 @@ bool minidvodb, char *minidvodb_group, - char *minidvodb_name) + char *minidvodb_name, + char *minidvodb_host) { PS_ASSERT_PTR_NON_NULL(config, false); @@ -208,4 +209,5 @@ minidvodb_group, minidvodb_name, + minidvodb_host, (long long) stage_id )) { Index: trunk/ippTools/src/pxadd.h =================================================================== --- trunk/ippTools/src/pxadd.h (revision 41177) +++ trunk/ippTools/src/pxadd.h (revision 41213) @@ -43,5 +43,6 @@ bool minidvodb, char *minidvodb_group, - char *minidvodb_name); + char *minidvodb_name, + char *minidvodb_host); #endif // PXADD_H Index: trunk/ippTools/src/pxcam.c =================================================================== --- trunk/ippTools/src/pxcam.c (revision 41177) +++ trunk/ippTools/src/pxcam.c (revision 41213) @@ -42,5 +42,5 @@ psMetadataAddStr(md, PS_LIST_TAIL, "-comment", 0, "search by comment", NULL); psMetadataAddStr(md, PS_LIST_TAIL, "-filelevel", 0, "search by filelevel", NULL); - psMetadataAddStr(md, PS_LIST_TAIL, "-filter", 0, "search for filter", NULL); +// psMetadataAddStr(md, PS_LIST_TAIL, "-filter", 0, "search for filter", NULL); psMetadataAddF64(md, PS_LIST_TAIL, "-airmass_min", 0, "define min airmass", NAN); psMetadataAddF64(md, PS_LIST_TAIL, "-airmass_max", 0, "define max airmass", NAN); @@ -87,5 +87,5 @@ PXOPT_COPY_STR(config->args, where, "-comment", "rawExp.comment", "LIKE"); PXOPT_COPY_STR(config->args, where, "-filelevel", "rawExp.filelevel", "=="); - PXOPT_COPY_STR(config->args, where, "-filter", "rawExp.filter", "LIKE"); +// PXOPT_COPY_STR(config->args, where, "-filter", "rawExp.filter", "LIKE"); PXOPT_COPY_F64(config->args, where, "-airmass_min", "rawExp.airmass", ">="); PXOPT_COPY_F64(config->args, where, "-airmass_max", "rawExp.airmass", "<");