Index: trunk/ippTools/src/addtool.c =================================================================== --- trunk/ippTools/src/addtool.c (revision 32711) +++ trunk/ippTools/src/addtool.c (revision 32832) @@ -143,5 +143,11 @@ pxAddLabelSearchArgs (config, where, "-filter", "stackRun.filter", "=="); // define using camRun label } - + if (strcmp(stage, "staticsky_multi")== 0) { + + pxAddLabelSearchArgs (config, where, "-label", "staticskyRun.label", "=="); // define using camRun label + pxAddLabelSearchArgs (config, where, "-data_group","staticskyRun.data_group", "=="); // define using camRun label + PXOPT_COPY_STR(config->args, where, "-reduction", "staticskyyRun.reduction", "=="); + //no filter here + } if (!psListLength(where->list)) { psFree(where); @@ -237,5 +243,19 @@ } - + if (strcmp(stage,"staticsky_multi") == 0) { + if (dvodb ) { + psTrace("addtool.c", PS_LOG_INFO, "dvodb argument found (%s) using addtool_find_sky_id_multi_dvo.sql\n%s\n", dvodb,stage); + // find the cam_id of all the exposures that we want to queue up. + bare_query = pxDataGet("addtool_find_sky_id_multi_dvo.sql"); + // user supplied dvodb + psStringAppend(&dvodb_string, "addRun.dvodb = '%s'", dvodb); + } else { + psTrace("addtool.c", PS_LOG_INFO, "dvodb argument not found using addtool_find_sky_id_multi.sql\n%s\n",stage); + // find the cam_id of all the exposures that we want to queue up. + bare_query = pxDataGet("addtool_find_sky_id_multi.sql"); + // inherit dvodb from camRun, avoid matching NULL + psStringAppend(&dvodb_string, "(staticskyRun.dvodb IS NOT NULL AND previous_dvodb = staticskyRun.dvodb)"); + } + } if (!bare_query) { @@ -292,5 +312,7 @@ psStringAppend(&query, " GROUP BY stack_id"); } - + if (strcmp(stage,"staticsky_multi") == 0) { + psStringAppend(&query, " GROUP BY sky_id"); //some reason it needs this + } @@ -405,4 +427,43 @@ } } + if (strcmp(stage,"staticsky_multi") == 0) { + for (long i = 0; i < psArrayLength(output); i++) { + psMetadata *md = output->data[i]; + bool status = false; + psS32 num_inputs = psMetadataLookupS32(&status, md, "num_inputs"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item num_inputs"); + return false; + } + if (num_inputs < 0) { + psError(PS_ERR_UNKNOWN, true, "invalid value for num_inputs"); + return false; + } + + staticskyRunRow *row = staticskyRunObjectFromMetadata(md); + + if (!row) { + psError(PS_ERR_UNKNOWN, false, "failed to convert metadata into camRun"); + psFree(output); + return false; + } + + if (!dvodb) { //there's no staticsky.dvodb + psError(PS_ERR_UNKNOWN, false, "cannot queue addstar run without a defined dvodb: label: %s, sky_id %" PRId64, row->label, row->sky_id); + psFree(output); + return false; + } + if (!workdir && !row->workdir) { + psError(PS_ERR_UNKNOWN, false, "cannot queue addstar run without a defined workdir: label: %s, sky_id %" PRId64, row->label, row->sky_id); + psFree(output); + return false; + } + + psFree(row); + } + } + + + // start a transaction so we don't end up with an exp without any associted @@ -438,4 +499,5 @@ stage, stage_id, + 0, workdir ? workdir : row->workdir, reduction ? reduction : row->reduction, @@ -479,4 +541,5 @@ stage, stage_id, + 0, workdir ? workdir : row->workdir, reduction ? reduction : row->reduction, @@ -520,4 +583,5 @@ stage, stage_id, + 0, workdir ? workdir : row->workdir, reduction ? reduction : row->reduction, @@ -544,4 +608,57 @@ } + if (strcmp(stage,"staticsky_multi") == 0) { + for (long i = 0; i < psArrayLength(output); i++) { + psMetadata *md = output->data[i]; + psS64 stage_id =0; + bool status = false; + psS32 num_inputs = psMetadataLookupS32(&status, md, "num_inputs"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item num_inputs"); + return false; + } + staticskyRunRow *row = staticskyRunObjectFromMetadata(md); + stage_id = row->sky_id; + + if (!row) { + psError(PS_ERR_UNKNOWN, false, "failed to convert metadata into camRun"); + psFree(output); + return false; + } + + // queue the exp + for (int filter_id = 0; filter_id < num_inputs; filter_id++) { + if (!pxaddQueueByCamID(config, + stage, + stage_id, + filter_id, + workdir ? workdir : row->workdir, + reduction ? reduction : row->reduction, + label ? label : row->label, + data_group ? data_group : (row->data_group ? row->data_group : (label ? label : row->label)), + dvodb ? dvodb : NULL, + note ? note : NULL, + image_only, + minidvodb, + minidvodb_group, + minidvodb_name + )) { + if (!psDBRollback(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error sfg"); + } + psError(PS_ERR_UNKNOWN, false, + "failed to trying to queue stage %s %" PRId64,stage, stage_id); + psFree(row); + psFree(output); + return false; + } + } + psFree(row); + } + } + + + + psFree(output); @@ -585,4 +702,7 @@ } if (strcmp(stage, "staticsky")==0) { + query = psStringCopy("UPDATE addRun JOIN staticskyRun on sky_id = stage_id"); + } + if (strcmp(stage, "staticsky_multi")==0) { query = psStringCopy("UPDATE addRun JOIN staticskyRun on sky_id = stage_id"); } @@ -626,5 +746,8 @@ query = pxDataGet("addtool_find_pendingexp_staticsky.sql"); } - + if (strcmp(stage, "staticsky_multi")==0) { + query = pxDataGet("addtool_find_pendingexp_staticsky_multi.sql"); + } + if (!query) { @@ -648,5 +771,8 @@ psStringAppend(&query, " GROUP BY %s", "sky_id"); } - + if (strcmp(stage, "staticsky_multi") == 0) { + //this group by is needed to join against all the warps (to get camera) + psStringAppend(&query, " GROUP BY %s", "sky_id, stage_extra1"); + } // treat limit == 0 as "no limit" if (limit) { @@ -838,4 +964,8 @@ query = pxDataGet("addtool_find_processedexp_staticsky.sql"); } + if (strcmp (stage,"staticsky_multi") == 0) { + query = pxDataGet("addtool_find_processedexp_staticsky_multi.sql"); + } + if (!query) { @@ -948,4 +1078,10 @@ query = pxDataGet("addtool_revertprocessedexp_staticsky.sql"); } + if (strcmp(stage, "staticsky_multi") == 0) { + query = pxDataGet("addtool_revertprocessedexp_staticsky_multi.sql"); + } + + + if (!query) { // rollback