Index: /trunk/ippTools/src/camtool.c =================================================================== --- /trunk/ippTools/src/camtool.c (revision 12199) +++ /trunk/ippTools/src/camtool.c (revision 12200) @@ -23,8 +23,10 @@ #include +#include #include "pxtools.h" #include "camtool.h" +static bool queueMode(pxConfig *config); static bool pendingexpMode(pxConfig *config); static bool pendingimfileMode(pxConfig *config); @@ -54,12 +56,13 @@ switch (config->mode) { - MODECASE(CAMTOOL_MODE_PENDINGEXP, pendingexpMode); - MODECASE(CAMTOOL_MODE_PENDINGIMFILE, pendingimfileMode); - MODECASE(CAMTOOL_MODE_ADDPROCESSEDEXP, addprocessedexpMode); - MODECASE(CAMTOOL_MODE_PROCESSEDEXP, processedexpMode); - MODECASE(CAMTOOL_MODE_UPDATEPROCESSEDEXP,updateprocessedexpMode); - MODECASE(CAMTOOL_MODE_BLOCK, blockMode); - MODECASE(CAMTOOL_MODE_MASKED, maskedMode); - MODECASE(CAMTOOL_MODE_UNBLOCK, unblockMode); + MODECASE(CAMTOOL_MODE_QUEUE, queueMode); + MODECASE(CAMTOOL_MODE_PENDINGEXP, pendingexpMode); + MODECASE(CAMTOOL_MODE_PENDINGIMFILE, pendingimfileMode); + MODECASE(CAMTOOL_MODE_ADDPROCESSEDEXP, addprocessedexpMode); + MODECASE(CAMTOOL_MODE_PROCESSEDEXP, processedexpMode); + MODECASE(CAMTOOL_MODE_UPDATEPROCESSEDEXP, updateprocessedexpMode); + MODECASE(CAMTOOL_MODE_BLOCK, blockMode); + MODECASE(CAMTOOL_MODE_MASKED, maskedMode); + MODECASE(CAMTOOL_MODE_UNBLOCK, unblockMode); default: psAbort("invalid option (this should not happen)"); @@ -81,4 +84,192 @@ exit(exit_status); +} + + +#define ADDPARAMSTR(from, to, name) \ +{ \ + bool status = false; \ + psString str = psMetadataLookupStr(&status, from, "-" name); \ + if (!status) { \ + psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -" name); \ + return false; \ + } \ + if (str) { \ + if (!psMetadataAddStr(to, PS_LIST_TAIL, name, 0, "==", str)) { \ + psError(PS_ERR_UNKNOWN, false, "failed to add item " name); \ + psFree(to); \ + return false; \ + } \ + } \ +} + + +#define ADDPARAMF(from, to, type, name) \ +{ \ + bool status = false; \ + ps##type var = psMetadataLookup##type(&status, from, "-" name); \ + if (!status) { \ + psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -" name); \ + return false; \ + } \ + if (!isnan(var)) { \ + if (!psMetadataAdd##type(to, PS_LIST_TAIL, #name, 0, "==", var)) { \ + psError(PS_ERR_UNKNOWN, false, "failed to add item " name); \ + psFree(to); \ + return false; \ + } \ + } \ +} + +static bool queueMode(pxConfig *config) +{ + PS_ASSERT_PTR_NON_NULL(config, NULL); + + psMetadata *where = psMetadataAlloc(); +{ + bool status = false; + psString var = psMetadataLookupStr(&status, config->args, "-chip_id"); + if (!status) { + psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -chip_id"); + return false; + } + if (var) { + if (!psMetadataAddS64(where, PS_LIST_TAIL, "chip_id", 0, "==", (psS64)atoll(var))) { + psError(PS_ERR_UNKNOWN, false, "failed to add item chip_id"); + psFree(where); + return false; + } + } +} + + ADDPARAMSTR(config->args, where, "exp_tag"); + ADDPARAMSTR(config->args, where, "exp_id"); + ADDPARAMSTR(config->args, where, "inst"); + ADDPARAMSTR(config->args, where, "telescope"); + ADDPARAMSTR(config->args, where, "dateobs"); + ADDPARAMSTR(config->args, where, "exp_type"); + ADDPARAMSTR(config->args, where, "imfiles"); + ADDPARAMSTR(config->args, where, "workdir"); + ADDPARAMSTR(config->args, where, "filter"); + ADDPARAMF(config->args, where, F32, "airmass"); + ADDPARAMF(config->args, where, F32, "ra"); + ADDPARAMF(config->args, where, F32, "decl"); + ADDPARAMF(config->args, where, F32, "exp_time"); + ADDPARAMF(config->args, where, F64, "bg"); + ADDPARAMF(config->args, where, F64, "bg_stdev"); + ADDPARAMF(config->args, where, F64, "bg_mean_stdev"); + ADDPARAMF(config->args, where, F64, "alt"); + ADDPARAMF(config->args, where, F64, "az"); + ADDPARAMF(config->args, where, F32, "ccd_temp"); + ADDPARAMF(config->args, where, F64, "posang"); + ADDPARAMSTR(config->args, where, "object"); + + if (where->list->n < 1) { + psFree(where); + where = NULL; + } + + bool status = false; + psString label = psMetadataLookupStr(&status, config->args, "-set_label"); + if (!status) { + psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -set_label"); + return false; + } + + psString recipe = psMetadataLookupStr(&status, config->args, "-set_recipe"); + if (!status) { + psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -set_recipe"); + return false; + } + + psString expgroup = psMetadataLookupStr(&status, config->args, "-set_expgroup"); + if (!status) { + psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -set_expgroup"); + return false; + } + + psString dvodb = psMetadataLookupStr(&status, config->args, "-set_dvodb"); + if (!status) { + psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -set_dvodb"); + return false; + } + + // find the chipProcessedExp exposures that we want to queue up. + psString query = psStringCopy("SELECT * FROM chipProcessedExp"); + + if (where) { + psString whereClause = psDBGenerateWhereSQL(where, "chipProcessedExp"); + psFree(where); + psStringAppend(&query, " %s", whereClause); + psFree(whereClause); + } + + if (!p_psDBRunQuery(config->dbh, query)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + psFree(query); + return false; + } + psFree(query); + + psArray *output = p_psDBFetchResult(config->dbh); + if (!output) { + psError(PS_ERR_UNKNOWN, false, "database error"); + return false; + } + if (!psArrayLength(output)) { + psTrace("chiptool", PS_LOG_INFO, "no rows found"); + psFree(output); + return true; + } + + if (!psDBTransaction(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + psFree(output); + return false; + } + + // would could do this "all in the database" if we didn't want the option + // of changing the label/recipe/expgroup/dvodb/etc. So we're pulling the + // data out so we have the option of changing these values or leaving the + // old values in place (i.e., passing the values through). + + // loop over our list of chipProcessedExp rows + for (long i = 0; i < psArrayLength(output); i++) { + psMetadata *md = output->data[i]; + + chipProcessedExpRow *row = chipProcessedExpObjectFromMetadata(md); + if (!row) { + psError(PS_ERR_UNKNOWN, false, "failed to convert metadata into chipProcessedExp"); + psFree(output); + return false; + } + + // queue the exp + if (!camQueueChipID(config, + row->chip_id, + label ? label : row->label, + recipe ? recipe : row->recipe, + expgroup ? expgroup : row->expgroup, + dvodb ? dvodb : row->dvodb + )) { + if (!psDBRollback(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + } + psError(PS_ERR_UNKNOWN, false, + "failed to trying to queue chip_id: %" PRId64, row->chip_id); + psFree(row); + psFree(output); + return false; + } + psFree(row); + } + psFree(output); + + if (!psDBCommit(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + return false; + } + + return true; } Index: /trunk/ippTools/src/camtool.h =================================================================== --- /trunk/ippTools/src/camtool.h (revision 12199) +++ /trunk/ippTools/src/camtool.h (revision 12200) @@ -25,4 +25,5 @@ typedef enum { CAMTOOL_MODE_NONE = 0x0, + CAMTOOL_MODE_QUEUE, CAMTOOL_MODE_PENDINGEXP, CAMTOOL_MODE_PENDINGIMFILE, Index: /trunk/ippTools/src/camtoolConfig.c =================================================================== --- /trunk/ippTools/src/camtoolConfig.c (revision 12199) +++ /trunk/ippTools/src/camtoolConfig.c (revision 12200) @@ -43,4 +43,59 @@ return NULL; } + + // -queue + psMetadata *queueArgs = psMetadataAlloc(); + psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-chip_id", 0, + "search by chip_id", NULL); + psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-exp_tag", 0, + "search by exp_tag", NULL); + psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-exp_id", 0, + "search by exp_id", NULL); + psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-inst", 0, + "search by camera", NULL); + psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-telescope", 0, + "search by telescope", NULL); + psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-dateobs", 0, + "search by observation time", NULL); + psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-exp_type", 0, + "search by exposure type", NULL); + psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-imfiles", 0, + "search by number of imfiles", NULL); + psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-workdir", 0, + "search by workdir", NULL); + psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-filter", 0, + "search by filter ", NULL); + psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-airmass", 0, + "search by airmass", NAN); + psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-ra", 0, + "search by RA", NAN); + psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-decl", 0, + "search by DEC", NAN); + psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-exp_time", 0, + "search by exposure time", NAN); + psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg", 0, + "search by exposue background", NAN); + psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg_stdev", 0, + "search by exposue background stdev", NAN); + psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, + "search by exposue background mean stdev", NAN); + psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-alt", 0, + "search by altitute", NAN); + psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-az", 0, + "search by azimuth", NAN); + psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-ccd_temp", 0, + "search by ccd tempature", NAN); + psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-posang", 0, + "search by rotator position angle", NAN); + psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-object", 0, + "search by exposure object", NULL); + psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-set_label", 0, + "define label", NULL); + psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-set_recipe", 0, + "define recipe", NULL); + psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-set_expgroup", 0, + "define exposure group", NULL); + psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-set_dvodb", 0, + "define DVO db", NULL); // -pendingexp @@ -163,12 +218,13 @@ psMetadata *argSets = psMetadataAlloc(); // find which mode we're running under - PXTOOL_MODE("-pendingexp", CAMTOOL_MODE_PENDINGEXP, pendingexpArgs); + PXTOOL_MODE("-queue", CAMTOOL_MODE_QUEUE, queueArgs); + PXTOOL_MODE("-pendingexp", CAMTOOL_MODE_PENDINGEXP, pendingexpArgs); PXTOOL_MODE("-pendingimfile",CAMTOOL_MODE_PENDINGIMFILE, pendingimfileArgs); PXTOOL_MODE("-addprocessedexp", CAMTOOL_MODE_ADDPROCESSEDEXP, addprocessedexpArgs); PXTOOL_MODE("-processedexp", CAMTOOL_MODE_PROCESSEDEXP, processedexpArgs); PXTOOL_MODE("-updateprocessedexp", CAMTOOL_MODE_UPDATEPROCESSEDEXP,updateprocessedexpArgs); - PXTOOL_MODE("-block", CAMTOOL_MODE_BLOCK, blockArgs); - PXTOOL_MODE("-masked", CAMTOOL_MODE_MASKED, maskedArgs); - PXTOOL_MODE("-unblock", CAMTOOL_MODE_UNBLOCK, unblockArgs); + PXTOOL_MODE("-block", CAMTOOL_MODE_BLOCK, blockArgs); + PXTOOL_MODE("-masked", CAMTOOL_MODE_MASKED, maskedArgs); + PXTOOL_MODE("-unblock", CAMTOOL_MODE_UNBLOCK, unblockArgs); bool argErr = false; Index: /trunk/ippTools/src/chiptool.c =================================================================== --- /trunk/ippTools/src/chiptool.c (revision 12199) +++ /trunk/ippTools/src/chiptool.c (revision 12200) @@ -124,5 +124,4 @@ } \ } - static bool queueMode(pxConfig *config)