Index: /trunk/ippTools/src/Makefile.am =================================================================== --- /trunk/ippTools/src/Makefile.am (revision 12189) +++ /trunk/ippTools/src/Makefile.am (revision 12190) @@ -51,5 +51,5 @@ pxio.c \ pxtag.c \ - chipqueuerawexp.c \ + chipqueue.c \ camqueue.c Index: /trunk/ippTools/src/chipqueue.c =================================================================== --- /trunk/ippTools/src/chipqueue.c (revision 12189) +++ /trunk/ippTools/src/chipqueue.c (revision 12190) @@ -1,4 +1,4 @@ /* - * chipqueuerawexp.c + * chipqueue.c * * Copyright (C) 2007 Joshua Hoblitt @@ -26,5 +26,5 @@ #include "chiptool.h" -bool chipQueueRawExp(pxConfig *config, +bool chipQueueExpTag(pxConfig *config, psString exp_tag, psString label, Index: /trunk/ippTools/src/chiptool.c =================================================================== --- /trunk/ippTools/src/chiptool.c (revision 12189) +++ /trunk/ippTools/src/chiptool.c (revision 12190) @@ -31,5 +31,5 @@ #include "camtool.h" -static bool queuerawexpMode(pxConfig *config); +static bool queueMode(pxConfig *config); static bool pendingimfileMode(pxConfig *config); static bool addprocessedimfileMode(pxConfig *config); @@ -61,12 +61,12 @@ switch (config->mode) { - MODECASE(CHIPTOOL_MODE_QUEUERAWEXP, queuerawexpMode); - MODECASE(CHIPTOOL_MODE_PENDINGIMFILE, pendingimfileMode); - MODECASE(CHIPTOOL_MODE_ADDPROCESSEDIMFILE, addprocessedimfileMode); - MODECASE(CHIPTOOL_MODE_PROCESSEDIMFILE, processedimfileMode); - MODECASE(CHIPTOOL_MODE_UPDATEPROCESSEDIMFILE, updateprocessedimfileMode); - MODECASE(CHIPTOOL_MODE_BLOCK, blockMode); - MODECASE(CHIPTOOL_MODE_MASKED, maskedMode); - MODECASE(CHIPTOOL_MODE_UNBLOCK, unblockMode); + MODECASE(CHIPTOOL_MODE_QUEUE, queueMode); + MODECASE(CHIPTOOL_MODE_PENDINGIMFILE, pendingimfileMode); + MODECASE(CHIPTOOL_MODE_ADDPROCESSEDIMFILE, addprocessedimfileMode); + MODECASE(CHIPTOOL_MODE_PROCESSEDIMFILE, processedimfileMode); + MODECASE(CHIPTOOL_MODE_UPDATEPROCESSEDIMFILE,updateprocessedimfileMode); + MODECASE(CHIPTOOL_MODE_BLOCK, blockMode); + MODECASE(CHIPTOOL_MODE_MASKED, maskedMode); + MODECASE(CHIPTOOL_MODE_UNBLOCK, unblockMode); default: psAbort("invalid option (this should not happen)"); @@ -126,5 +126,5 @@ -static bool queuerawexpMode(pxConfig *config) +static bool queueMode(pxConfig *config) { PS_ASSERT_PTR_NON_NULL(config, NULL); @@ -235,5 +235,5 @@ // queue the exp - if (!chipQueueRawExp(config, exp_tag, label, recipe, expgroup, dvodb)) { + if (!chipQueueExpTag(config, exp_tag, label, recipe, expgroup, dvodb)) { if (!psDBRollback(config->dbh)) { psError(PS_ERR_UNKNOWN, false, "database error"); Index: /trunk/ippTools/src/chiptool.h =================================================================== --- /trunk/ippTools/src/chiptool.h (revision 12189) +++ /trunk/ippTools/src/chiptool.h (revision 12190) @@ -25,5 +25,5 @@ typedef enum { CHIPTOOL_MODE_NONE = 0x0, - CHIPTOOL_MODE_QUEUERAWEXP, + CHIPTOOL_MODE_QUEUE, CHIPTOOL_MODE_PENDINGIMFILE, CHIPTOOL_MODE_ADDPROCESSEDIMFILE, @@ -37,5 +37,5 @@ pxConfig *chiptoolConfig(pxConfig *config, int argc, char **argv); -bool chipQueueRawExp(pxConfig *config, psString exp_tag, psString label, psString recipe, psString expgroup, psString dvodb); +bool chipQueueExpTag(pxConfig *config, psString exp_tag, psString label, psString recipe, psString expgroup, psString dvodb); #endif // CHIPTOOL_H Index: /trunk/ippTools/src/chiptoolConfig.c =================================================================== --- /trunk/ippTools/src/chiptoolConfig.c (revision 12189) +++ /trunk/ippTools/src/chiptoolConfig.c (revision 12190) @@ -41,55 +41,55 @@ } - // -queuerawexp - psMetadata *queuerawexpArgs = psMetadataAlloc(); - psMetadataAddStr(queuerawexpArgs, PS_LIST_TAIL, "-exp_tag", 0, + // -queue + psMetadata *queueArgs = psMetadataAlloc(); + psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-exp_tag", 0, "search by exp_tag", NULL); - psMetadataAddStr(queuerawexpArgs, PS_LIST_TAIL, "-exp_id", 0, + psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-exp_id", 0, "search by exp_id", NULL); - psMetadataAddStr(queuerawexpArgs, PS_LIST_TAIL, "-inst", 0, + psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-inst", 0, "search by camera", NULL); - psMetadataAddStr(queuerawexpArgs, PS_LIST_TAIL, "-telescope", 0, + psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-telescope", 0, "search by telescope", NULL); - psMetadataAddStr(queuerawexpArgs, PS_LIST_TAIL, "-dateobs", 0, + psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-dateobs", 0, "search by observation time", NULL); - psMetadataAddStr(queuerawexpArgs, PS_LIST_TAIL, "-exp_type", 0, + psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-exp_type", 0, "search by exposure type", NULL); - psMetadataAddStr(queuerawexpArgs, PS_LIST_TAIL, "-imfiles", 0, + psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-imfiles", 0, "search by number of imfiles", NULL); - psMetadataAddStr(queuerawexpArgs, PS_LIST_TAIL, "-workdir", 0, + psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-workdir", 0, "search by workdir", NULL); - psMetadataAddStr(queuerawexpArgs, PS_LIST_TAIL, "-filter", 0, + psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-filter", 0, "search by filter ", NULL); - psMetadataAddF32(queuerawexpArgs, PS_LIST_TAIL, "-airmass", 0, + psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-airmass", 0, "search by airmass", NAN); - psMetadataAddF64(queuerawexpArgs, PS_LIST_TAIL, "-ra", 0, + psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-ra", 0, "search by RA", NAN); - psMetadataAddF64(queuerawexpArgs, PS_LIST_TAIL, "-decl", 0, + psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-decl", 0, "search by DEC", NAN); - psMetadataAddF32(queuerawexpArgs, PS_LIST_TAIL, "-exp_time", 0, + psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-exp_time", 0, "search by exposure time", NAN); - psMetadataAddF64(queuerawexpArgs, PS_LIST_TAIL, "-bg", 0, + psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg", 0, "search by exposue background", NAN); - psMetadataAddF64(queuerawexpArgs, PS_LIST_TAIL, "-bg_stdev", 0, + psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg_stdev", 0, "search by exposue background stdev", NAN); - psMetadataAddF64(queuerawexpArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, + psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, "search by exposue background mean stdev", NAN); - psMetadataAddF64(queuerawexpArgs, PS_LIST_TAIL, "-alt", 0, + psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-alt", 0, "search by altitute", NAN); - psMetadataAddF64(queuerawexpArgs, PS_LIST_TAIL, "-az", 0, + psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-az", 0, "search by azimuth", NAN); - psMetadataAddF32(queuerawexpArgs, PS_LIST_TAIL, "-ccd_temp", 0, + psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-ccd_temp", 0, "search by ccd tempature", NAN); - psMetadataAddF64(queuerawexpArgs, PS_LIST_TAIL, "-posang", 0, + psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-posang", 0, "search by rotator position angle", NAN); - psMetadataAddStr(queuerawexpArgs, PS_LIST_TAIL, "-object", 0, + psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-object", 0, "search by exposure object", NULL); - psMetadataAddStr(queuerawexpArgs, PS_LIST_TAIL, "-set_label", 0, + psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-set_label", 0, "define label", NULL); - psMetadataAddStr(queuerawexpArgs, PS_LIST_TAIL, "-set_recipe", 0, + psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-set_recipe", 0, "define recipe", NULL); - psMetadataAddStr(queuerawexpArgs, PS_LIST_TAIL, "-set_expgroup", 0, + psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-set_expgroup", 0, "define exposure group", NULL); - psMetadataAddStr(queuerawexpArgs, PS_LIST_TAIL, "-set_dvodb", 0, + psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-set_dvodb", 0, "define DBO db", NULL); @@ -207,5 +207,5 @@ psMetadata *argSets = psMetadataAlloc(); - PXTOOL_MODE("-queuerawexp", CHIPTOOL_MODE_QUEUERAWEXP, queuerawexpArgs); + PXTOOL_MODE("-queue", CHIPTOOL_MODE_QUEUE, queueArgs); PXTOOL_MODE("-pendingimfile", CHIPTOOL_MODE_PENDINGIMFILE, pendingimfileArgs); PXTOOL_MODE("-addprocessedimfile",CHIPTOOL_MODE_ADDPROCESSEDIMFILE,addprocessedimfileArgs); Index: /trunk/ippTools/src/regtool.c =================================================================== --- /trunk/ippTools/src/regtool.c (revision 12189) +++ /trunk/ippTools/src/regtool.c (revision 12190) @@ -646,5 +646,5 @@ // insert an entry into the chipPendingExp table - if (!chipQueueRawExp(config, exp_tag, NULL, NULL, NULL, NULL)) { + if (!chipQueueExpTag(config, exp_tag, NULL, NULL, NULL, NULL)) { // rollback if (!psDBRollback(config->dbh)) {