Index: /trunk/ippTools/src/camtoolConfig.c =================================================================== --- /trunk/ippTools/src/camtoolConfig.c (revision 13577) +++ /trunk/ippTools/src/camtoolConfig.c (revision 13578) @@ -154,5 +154,5 @@ "define banana 1", NULL); psMetadataAddS16(addprocessedexpArgs, PS_LIST_TAIL, "-code", 0, - "set fault code (required)", 0); + "set fault code", 0); psMetadataAddBool(addprocessedexpArgs, PS_LIST_TAIL, "-faulted", 0, "only return imfiles with a fault status set", false); @@ -199,61 +199,21 @@ "name of a label to unmask", NULL); -#define PXTOOL_MODE(option, modeval, argset) \ -{ \ - int N = 0; \ - if ((N = psArgumentGet (argc, argv, option))) { \ - psArgumentRemove (N, &argc, argv); \ - if (config->mode) { \ - psError(PS_ERR_UNKNOWN, true, "only one mode selection is allowed"); \ - psFree(config); \ - return NULL; \ - } \ - config->mode = modeval; \ - config->args = psMemIncrRefCounter(argset); \ - } \ - if (!psMetadataAddMetadata(argSets, PS_LIST_TAIL, option, 0, NULL, argset)) {;\ - psError(PS_ERR_UNKNOWN, false, "failed to add argset for %s", option);\ - } \ - psFree(argset); \ -} - psMetadata *argSets = psMetadataAlloc(); - // find which mode we're running under - 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); - - bool argErr = false; - if (config->mode == CAMTOOL_MODE_NONE) { - argErr = true; - fprintf (stderr, "mode argument is required\n"); - } else if (! psArgumentParse(config->args, &argc, argv) || argc != 1) { - argErr = true; - fprintf (stderr, "error parsing arguments\n"); - } - - if (argErr) { - printf("\nPan-STARRS Camera Tool\n"); - printf("Usage: %s []\n\n", argv[0]); - printf(" :\n\n"); - - psMetadataIterator *iter = psMetadataIteratorAlloc(argSets, 0, NULL); - psMetadataItem *item = NULL; - while ((item = psMetadataGetAndIncrement(iter))) { - if (!item->type == PS_DATA_METADATA) { - psAbort("all options must be specified as a metadata"); } - - fprintf(stdout, "%s ", item->name); - psArgumentHelp(item->data.md); - } - psFree(iter); - + psMetadata *modes = psMetadataAlloc(); + + PXTOOL_ADD_MODE("-queue", "", CAMTOOL_MODE_QUEUE, queueArgs); + PXTOOL_ADD_MODE("-pendingexp", "", CAMTOOL_MODE_PENDINGEXP, pendingexpArgs); + PXTOOL_ADD_MODE("-pendingimfile", "", CAMTOOL_MODE_PENDINGIMFILE, pendingimfileArgs); + PXTOOL_ADD_MODE("-addprocessedexp", "", CAMTOOL_MODE_ADDPROCESSEDEXP, addprocessedexpArgs); + PXTOOL_ADD_MODE("-processedexp", "", CAMTOOL_MODE_PROCESSEDEXP, processedexpArgs); + PXTOOL_ADD_MODE("-updateprocessedexp", "", CAMTOOL_MODE_UPDATEPROCESSEDEXP,updateprocessedexpArgs); + PXTOOL_ADD_MODE("-block", "", CAMTOOL_MODE_BLOCK, blockArgs); + PXTOOL_ADD_MODE("-masked", "", CAMTOOL_MODE_MASKED, maskedArgs); + PXTOOL_ADD_MODE("-unblock", "", CAMTOOL_MODE_UNBLOCK, unblockArgs); + + if (!pxGetOptions(stderr, argc, argv, config, modes, argSets)) { + psError(PS_ERR_UNKNOWN, true, "option parsing failed"); psFree(argSets); + psFree(modes); psFree(config); return NULL; @@ -261,4 +221,5 @@ psFree(argSets); + psFree(modes); // setup search criterion @@ -346,8 +307,4 @@ } - // save argv/argc - config->argv = argv; - config->argc = argc; - return config; } Index: /trunk/ippTools/src/chiptool.h =================================================================== --- /trunk/ippTools/src/chiptool.h (revision 13577) +++ /trunk/ippTools/src/chiptool.h (revision 13578) @@ -32,5 +32,6 @@ CHIPTOOL_MODE_BLOCK, CHIPTOOL_MODE_MASKED, - CHIPTOOL_MODE_UNBLOCK + CHIPTOOL_MODE_UNBLOCK, + CHIPTOOL_MODE_RETRYPROCESSEDIMFILE } chiptoolMode; Index: /trunk/ippTools/src/chiptoolConfig.c =================================================================== --- /trunk/ippTools/src/chiptoolConfig.c (revision 13577) +++ /trunk/ippTools/src/chiptoolConfig.c (revision 13578) @@ -27,5 +27,6 @@ #include "chiptool.h" -pxConfig *chiptoolConfig(pxConfig *config, int argc, char **argv) { +pxConfig *chiptoolConfig(pxConfig *config, int argc, char **argv) +{ if (!config) { config = pxConfigAlloc(); @@ -135,5 +136,5 @@ "define banana 1", NULL); psMetadataAddS8(addprocessedimfileArgs, PS_LIST_TAIL, "-code", 0, - "set fault code (required)", 0); + "set fault code", 0); // -processedimfile @@ -173,4 +174,14 @@ "set fault code (required)", 0); + // -retryprocessedimfile + psMetadata *retryprocessedimfileArgs = psMetadataAlloc(); + psMetadataAddStr(retryprocessedimfileArgs, PS_LIST_TAIL, "-chip_id", 0, + "define chip ID (required)", NULL); + psMetadataAddStr(retryprocessedimfileArgs, PS_LIST_TAIL, "-exp_tag", 0, + "search by exposure ID", NULL); + psMetadataAddStr(retryprocessedimfileArgs, PS_LIST_TAIL, "-class", 0, + "search by class", NULL); + psMetadataAddStr(retryprocessedimfileArgs, PS_LIST_TAIL, "-class_id", 0, + "search by class ID", NULL); // -block @@ -189,59 +200,21 @@ "name of a label to unmask", NULL); -#define PXTOOL_MODE(option, modeval, argset) \ -{ \ - int N = 0; \ - if ((N = psArgumentGet (argc, argv, option))) { \ - psArgumentRemove (N, &argc, argv); \ - if (config->mode) { \ - psError(PS_ERR_UNKNOWN, true, "only one mode selection is allowed"); \ - psFree(config); \ - return NULL; \ - } \ - config->mode = modeval; \ - config->args = psMemIncrRefCounter(argset); \ - } \ - if (!psMetadataAddMetadata(argSets, PS_LIST_TAIL, option, 0, NULL, argset)) {; \ - psError(PS_ERR_UNKNOWN, false, "failed to add argset for %s", option); \ - } \ - psFree(argset); \ -} - psMetadata *argSets = psMetadataAlloc(); - PXTOOL_MODE("-queue", CHIPTOOL_MODE_QUEUE, queueArgs); - PXTOOL_MODE("-pendingimfile", CHIPTOOL_MODE_PENDINGIMFILE, pendingimfileArgs); - PXTOOL_MODE("-addprocessedimfile",CHIPTOOL_MODE_ADDPROCESSEDIMFILE,addprocessedimfileArgs); - PXTOOL_MODE("-processedimfile",CHIPTOOL_MODE_PROCESSEDIMFILE, processedimfileArgs); - PXTOOL_MODE("-updateprocessedimfile",CHIPTOOL_MODE_UPDATEPROCESSEDIMFILE, updateprocessedimfileArgs); - PXTOOL_MODE("-block", CHIPTOOL_MODE_BLOCK, blockArgs); - PXTOOL_MODE("-masked", CHIPTOOL_MODE_MASKED, maskedArgs); - PXTOOL_MODE("-unblock", CHIPTOOL_MODE_UNBLOCK, unblockArgs); - - bool argErr = false; - if (config->mode == CHIPTOOL_MODE_NONE) { - argErr = true; - fprintf (stderr, "mode argument is required\n"); - } else if (! psArgumentParse(config->args, &argc, argv) || argc != 1) { - argErr = true; - fprintf (stderr, "error parsing arguments\n"); - } - - if (argErr) { - printf("\nPan-STARRS Chip Tool\n\n"); - printf("Usage: %s []\n\n", argv[0]); - printf(" :\n\n"); - - psMetadataIterator *iter = psMetadataIteratorAlloc(argSets, 0, NULL); - psMetadataItem *item = NULL; - while ((item = psMetadataGetAndIncrement(iter))) { - if (!item->type == PS_DATA_METADATA) { - psAbort("all options must be specified as a metadata"); } - - fprintf(stdout, "%s ", item->name); - psArgumentHelp(item->data.md); - } - psFree(iter); - + psMetadata *modes = psMetadataAlloc(); + + PXTOOL_ADD_MODE("-queue", "", CHIPTOOL_MODE_QUEUE, queueArgs); + PXTOOL_ADD_MODE("-pendingimfile", "", CHIPTOOL_MODE_PENDINGIMFILE, pendingimfileArgs); + PXTOOL_ADD_MODE("-addprocessedimfile", "", CHIPTOOL_MODE_ADDPROCESSEDIMFILE,addprocessedimfileArgs); + PXTOOL_ADD_MODE("-processedimfile", "", CHIPTOOL_MODE_PROCESSEDIMFILE, processedimfileArgs); + PXTOOL_ADD_MODE("-updateprocessedimfile", "", CHIPTOOL_MODE_UPDATEPROCESSEDIMFILE, updateprocessedimfileArgs); + PXTOOL_ADD_MODE("-retryprocessedimfile", "", CHIPTOOL_MODE_RETRYPROCESSEDIMFILE, retryprocessedimfileArgs); + PXTOOL_ADD_MODE("-block", "", CHIPTOOL_MODE_BLOCK, blockArgs); + PXTOOL_ADD_MODE("-masked", "", CHIPTOOL_MODE_MASKED, maskedArgs); + PXTOOL_ADD_MODE("-unblock", "", CHIPTOOL_MODE_UNBLOCK, unblockArgs); + + if (!pxGetOptions(stderr, argc, argv, config, modes, argSets)) { + psError(PS_ERR_UNKNOWN, true, "option parsing failed"); psFree(argSets); + psFree(modes); psFree(config); return NULL; @@ -249,4 +222,5 @@ psFree(argSets); + psFree(modes); // setup search criterion @@ -321,8 +295,4 @@ } - // save argv/argc - config->argv = argv; - config->argc = argc; - return config; } Index: /trunk/ippTools/src/detselectConfig.c =================================================================== --- /trunk/ippTools/src/detselectConfig.c (revision 13577) +++ /trunk/ippTools/src/detselectConfig.c (revision 13578) @@ -78,54 +78,14 @@ "use the simple output format", false); -#define PXTOOL_MODE(option, modeval, argset) \ -{ \ - int N = 0; \ - if ((N = psArgumentGet (argc, argv, option))) { \ - psArgumentRemove (N, &argc, argv); \ - if (config->mode) { \ - psError(PS_ERR_UNKNOWN, true, "only one mode selection is allowed"); \ - psFree(config); \ - return NULL; \ - } \ - config->mode = modeval; \ - config->args = psMemIncrRefCounter(argset); \ - } \ - if (!psMetadataAddMetadata(argSets, PS_LIST_TAIL, option, 0, NULL, argset)) {;\ - psError(PS_ERR_UNKNOWN, false, "failed to add argset for %s", option);\ - } \ - psFree(argset); \ -} - psMetadata *argSets = psMetadataAlloc(); - // find which mode we're running under - PXTOOL_MODE("-search", DETSELECT_MODE_SEARCH, searchArgs); - PXTOOL_MODE("-select", DETSELECT_MODE_SELECT, selectArgs); - - bool argErr = false; - if (config->mode == DETSELECT_MODE_NONE) { - argErr = true; - fprintf (stderr, "mode argument is required\n"); - } else if (! psArgumentParse(config->args, &argc, argv) || argc != 1) { - argErr = true; - fprintf (stderr, "error parsing arguments\n"); - } - - if (argErr) { - printf("\nPan-STARRS detrend select Tool\n"); - printf("Usage: %s []\n\n", argv[0]); - printf(" :\n\n"); - - psMetadataIterator *iter = psMetadataIteratorAlloc(argSets, 0, NULL); - psMetadataItem *item = NULL; - while ((item = psMetadataGetAndIncrement(iter))) { - if (!item->type == PS_DATA_METADATA) { - psAbort("all options must be specified as a metadata"); } - - fprintf(stdout, "%s ", item->name); - psArgumentHelp(item->data.md); - } - psFree(iter); - + psMetadata *modes = psMetadataAlloc(); + + PXTOOL_ADD_MODE("-search", "search for an appropriate detrend", DETSELECT_MODE_SEARCH, searchArgs); + PXTOOL_ADD_MODE("-select", "retreive detrend information", DETSELECT_MODE_SELECT, selectArgs); + + if (!pxGetOptions(stderr, argc, argv, config, modes, argSets)) { + psError(PS_ERR_UNKNOWN, true, "option parsing failed"); psFree(argSets); + psFree(modes); psFree(config); return NULL; @@ -133,4 +93,5 @@ psFree(argSets); + psFree(modes); // setup search criterion @@ -262,8 +223,4 @@ } - // save argv/argc - config->argv = argv; - config->argc = argc; - return config; } Index: /trunk/ippTools/src/dettoolConfig.c =================================================================== --- /trunk/ippTools/src/dettoolConfig.c (revision 13577) +++ /trunk/ippTools/src/dettoolConfig.c (revision 13578) @@ -934,8 +934,4 @@ } - // save argv/argc - config->argv = argv; - config->argc = argc; - return config; } Index: /trunk/ippTools/src/difftoolConfig.c =================================================================== --- /trunk/ippTools/src/difftoolConfig.c (revision 13577) +++ /trunk/ippTools/src/difftoolConfig.c (revision 13578) @@ -91,7 +91,7 @@ psMetadata *inputskyfileArgs = psMetadataAlloc(); psMetadataAddStr(inputskyfileArgs, PS_LIST_TAIL, "-diff_id", 0, - "search by diff ID (required)", NULL); + "search by diff ID", NULL); psMetadataAddStr(inputskyfileArgs, PS_LIST_TAIL, "-warp_id", 0, - "search by warp ID (required)", NULL); + "search by warp ID", NULL); psMetadataAddStr(inputskyfileArgs, PS_LIST_TAIL, "-skycell_id", 0, "search by skycell ID", NULL); @@ -132,7 +132,7 @@ "search by warp ID", NULL); psMetadataAddStr(diffskyfileArgs , PS_LIST_TAIL, "-skycell_id", 0, - "define skycell ID (required)", NULL); + "define skycell ID", NULL); psMetadataAddStr(diffskyfileArgs, PS_LIST_TAIL, "-tess_id", 0, - "define tessellation ID (required)", NULL); + "define tessellation ID", NULL); psMetadataAddU64(diffskyfileArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); @@ -142,60 +142,19 @@ psFree(now); -#define PXTOOL_MODE(option, modeval, argset) \ -{ \ - int N = 0; \ - if ((N = psArgumentGet (argc, argv, option))) { \ - psArgumentRemove (N, &argc, argv); \ - if (config->mode) { \ - psError(PS_ERR_UNKNOWN, true, "only one mode selection is allowed"); \ - psFree(config); \ - return NULL; \ - } \ - config->mode = modeval; \ - config->args = psMemIncrRefCounter(argset); \ - } \ - if (!psMetadataAddMetadata(argSets, PS_LIST_TAIL, option, 0, NULL, argset)) {;\ - psError(PS_ERR_UNKNOWN, false, "failed to add argset for %s", option); \ - } \ - psFree(argset); \ -} - psMetadata *argSets = psMetadataAlloc(); - // find which mode we're running under - PXTOOL_MODE("-definerun", DIFFTOOL_MODE_DEFINERUN, definerunArgs); - PXTOOL_MODE("-updaterun", DIFFTOOL_MODE_UPDATERUN, updaterunArgs); - PXTOOL_MODE("-addinputskyfile", DIFFTOOL_MODE_ADDINPUTSKYFILE, addinputskyfileArgs); - PXTOOL_MODE("-inputskyfile", DIFFTOOL_MODE_INPUTSKYFILE, inputskyfileArgs); - PXTOOL_MODE("-todiffskyfile", DIFFTOOL_MODE_TODIFFSKYFILE, todiffskyfileArgs); - PXTOOL_MODE("-adddiffskyfile", DIFFTOOL_MODE_ADDDIFFSKYFILE, adddiffskyfileArgs); - PXTOOL_MODE("-diffskyfile", DIFFTOOL_MODE_DIFFSKYFILE, diffskyfileArgs); - - bool argErr = false; - if (config->mode == DIFFTOOL_MODE_NONE) { - argErr = true; - fprintf (stderr, "mode argument is required\n"); - } else if (! psArgumentParse(config->args, &argc, argv) || argc != 1) { - argErr = true; - fprintf (stderr, "error parsing arguments\n"); - } - - if (argErr) { - printf("\nPan-STARRS Difference Tool\n"); - printf("Usage: %s []\n\n", argv[0]); - printf(" :\n\n"); - - psMetadataIterator *iter = psMetadataIteratorAlloc(argSets, 0, NULL); - psMetadataItem *item = NULL; - while ((item = psMetadataGetAndIncrement(iter))) { - if (!item->type == PS_DATA_METADATA) { - psAbort("all options must be specified as a metadata"); - } - - fprintf(stdout, "%s ", item->name); - psArgumentHelp(item->data.md); - } - psFree(iter); - + psMetadata *modes = psMetadataAlloc(); + + PXTOOL_ADD_MODE("-definerun", "", DIFFTOOL_MODE_DEFINERUN, definerunArgs); + PXTOOL_ADD_MODE("-updaterun", "", DIFFTOOL_MODE_UPDATERUN, updaterunArgs); + PXTOOL_ADD_MODE("-addinputskyfile", "", DIFFTOOL_MODE_ADDINPUTSKYFILE, addinputskyfileArgs); + PXTOOL_ADD_MODE("-inputskyfile", "", DIFFTOOL_MODE_INPUTSKYFILE, inputskyfileArgs); + PXTOOL_ADD_MODE("-todiffskyfile", "", DIFFTOOL_MODE_TODIFFSKYFILE, todiffskyfileArgs); + PXTOOL_ADD_MODE("-adddiffskyfile", "", DIFFTOOL_MODE_ADDDIFFSKYFILE, adddiffskyfileArgs); + PXTOOL_ADD_MODE("-diffskyfile", "", DIFFTOOL_MODE_DIFFSKYFILE, diffskyfileArgs); + + if (!pxGetOptions(stderr, argc, argv, config, modes, argSets)) { + psError(PS_ERR_UNKNOWN, true, "option parsing failed"); psFree(argSets); + psFree(modes); psFree(config); return NULL; @@ -203,4 +162,5 @@ psFree(argSets); + psFree(modes); // setup search criterion @@ -275,8 +235,4 @@ } - // save argv/argc - config->argv = argv; - config->argc = argc; - return config; } Index: /trunk/ippTools/src/pxconfig.c =================================================================== --- /trunk/ippTools/src/pxconfig.c (revision 13577) +++ /trunk/ippTools/src/pxconfig.c (revision 13578) @@ -201,4 +201,8 @@ psFree(iter); + // save argv/argc + config->argv = argv; + config->argc = argc; + return true; } Index: /trunk/ippTools/src/pxinjectConfig.c =================================================================== --- /trunk/ippTools/src/pxinjectConfig.c (revision 13577) +++ /trunk/ippTools/src/pxinjectConfig.c (revision 13578) @@ -69,47 +69,20 @@ "define the URI (required)", NULL); -#define PXTOOL_MODE(option, modeval, argset) \ -{ \ - int N = 0; \ - if ((N = psArgumentGet (argc, argv, option))) { \ - psArgumentRemove (N, &argc, argv); \ - if (config->mode) { \ - psError(PS_ERR_UNKNOWN, true, "only one mode selection is allowed"); \ - } \ - config->mode = modeval; \ - config->args = psMemIncrRefCounter(argset); \ - } \ -} + psMetadata *argSets = psMetadataAlloc(); + psMetadata *modes = psMetadataAlloc(); - // find which mode we're running under - PXTOOL_MODE("-newExp", PXINJECT_MODE_NEWEXP, newExpArgs); - PXTOOL_MODE("-newImfile", PXINJECT_MODE_NEWIMFILE, newImfileArgs); + PXTOOL_ADD_MODE("-newExp", "", PXINJECT_MODE_NEWEXP, newExpArgs); + PXTOOL_ADD_MODE("-newImfile", "", PXINJECT_MODE_NEWIMFILE, newImfileArgs); - bool argErr = false; - if (config->mode == PXINJECT_MODE_NONE) { - argErr = true; - fprintf (stderr, "mode argument is required\n"); - } else if (! psArgumentParse(config->args, &argc, argv) || argc != 1) { - argErr = true; - fprintf (stderr, "error parsing arguments\n"); - } - - if (argErr) { - printf("\nPan-STARRS Detrend Tool\n"); - printf("Usage: %s []\n\n", argv[0]); - printf(" : [-newExp|-newImfile]\n\n"); - fprintf (stdout, "-newExp "); - psArgumentHelp(newExpArgs); - psFree(newExpArgs); - fprintf (stdout, "-newImfile "); - psArgumentHelp(newImfileArgs); - psFree(newImfileArgs); - + if (!pxGetOptions(stderr, argc, argv, config, modes, argSets)) { + psError(PS_ERR_UNKNOWN, true, "option parsing failed"); + psFree(argSets); + psFree(modes); psFree(config); return NULL; } - psFree(newExpArgs); - psFree(newImfileArgs); + psFree(argSets); + psFree(modes); // setup search criterion @@ -211,8 +184,4 @@ } - // save argv/argc - config->argv = argv; - config->argc = argc; - return config; } Index: /trunk/ippTools/src/regtoolConfig.c =================================================================== --- /trunk/ippTools/src/regtoolConfig.c (revision 13577) +++ /trunk/ippTools/src/regtoolConfig.c (revision 13578) @@ -96,5 +96,5 @@ "define observation time", NULL); psMetadataAddS8(addprocessedimfileArgs, PS_LIST_TAIL, "-code", 0, - "set fault code (required)", 0); + "set fault code", 0); // -processedimfile @@ -179,5 +179,5 @@ "define label for phase 2 processing (non-detrend data only)", NULL); psMetadataAddS8(addprocessedexpArgs, PS_LIST_TAIL, "-code", 0, - "set fault code (required)", 0); + "set fault code", 0); /* psMetadataAddStr(updateArgs, PS_LIST_TAIL, "-recip", 0, @@ -208,62 +208,20 @@ -#define PXTOOL_MODE(option, modeval, argset) \ -{ \ - int N = 0; \ - if ((N = psArgumentGet (argc, argv, option))) { \ - psArgumentRemove (N, &argc, argv); \ - if (config->mode) { \ - psError(PXTOOLS_ERR_CONFIG, true, "only one mode selection is allowed"); \ - psFree(config); \ - return NULL; \ - } \ - config->mode = modeval; \ - config->args = psMemIncrRefCounter(argset); \ - } \ - if (!psMetadataAddMetadata(argSets, PS_LIST_TAIL, option, 0, NULL, argset)) {;\ - psError(PXTOOLS_ERR_PROG, false, "failed to add argset for %s", option);\ - } \ - psFree(argset); \ -} - psMetadata *argSets = psMetadataAlloc(); - // find which mode we're running under - PXTOOL_MODE("-pendingimfile", REGTOOL_MODE_PENDINGIMFILE, pendingimfileArgs); - PXTOOL_MODE("-addprocessedimfile", REGTOOL_MODE_ADDPROCESSEDIMFILE, addprocessedimfileArgs); - PXTOOL_MODE("-processedimfile", REGTOOL_MODE_PROCESSEDIMFILE, processedimfileArgs); - PXTOOL_MODE("-updateprocessedimfile", REGTOOL_MODE_UPDATEPROCESSEDIMFILE, updateprocessedimfileArgs); - PXTOOL_MODE("-pendingexp", REGTOOL_MODE_PENDINGEXP,pendingexpArgs); - PXTOOL_MODE("-addprocessedexp", REGTOOL_MODE_ADDPROCESSEDEXP, addprocessedexpArgs); - PXTOOL_MODE("-processedexp", REGTOOL_MODE_PROCESSEDEXP, processedexpArgs); - PXTOOL_MODE("-updateprocessedexp", REGTOOL_MODE_UPDATEPROCESSEDEXP, updatedprocessedexpArgs); - - bool argErr = false; - if (config->mode == REGTOOL_MODE_NONE) { - psError(PXTOOLS_ERR_CONFIG, false, "missing mode argument"); - fprintf (stderr, "mode argument is required\n"); - argErr = true; - } else if (! psArgumentParse(config->args, &argc, argv) || argc != 1) { - psError(PXTOOLS_ERR_CONFIG, false, "unknown argument"); - fprintf (stderr, "error parsing arguments\n"); - argErr = true; - } - - if (argErr) { - printf("\nPan-STARRS Registration Tool\n"); - printf("Usage: %s []\n\n", argv[0]); - printf(" :\n\n"); - - psMetadataIterator *iter = psMetadataIteratorAlloc(argSets, 0, NULL); - psMetadataItem *item = NULL; - while ((item = psMetadataGetAndIncrement(iter))) { - if (!item->type == PS_DATA_METADATA) { - psAbort("all options must be specified as a metadata"); } - - fprintf(stdout, "%s ", item->name); - psArgumentHelp(item->data.md); - } - psFree(iter); - + psMetadata *modes = psMetadataAlloc(); + + PXTOOL_ADD_MODE("-pendingimfile", "", REGTOOL_MODE_PENDINGIMFILE, pendingimfileArgs); + PXTOOL_ADD_MODE("-addprocessedimfile", "", REGTOOL_MODE_ADDPROCESSEDIMFILE, addprocessedimfileArgs); + PXTOOL_ADD_MODE("-processedimfile", "", REGTOOL_MODE_PROCESSEDIMFILE, processedimfileArgs); + PXTOOL_ADD_MODE("-updateprocessedimfile", "", REGTOOL_MODE_UPDATEPROCESSEDIMFILE, updateprocessedimfileArgs); + PXTOOL_ADD_MODE("-pendingexp", "", REGTOOL_MODE_PENDINGEXP,pendingexpArgs); + PXTOOL_ADD_MODE("-addprocessedexp", "", REGTOOL_MODE_ADDPROCESSEDEXP, addprocessedexpArgs); + PXTOOL_ADD_MODE("-processedexp", "", REGTOOL_MODE_PROCESSEDEXP, processedexpArgs); + PXTOOL_ADD_MODE("-updateprocessedexp", "", REGTOOL_MODE_UPDATEPROCESSEDEXP, updatedprocessedexpArgs); + + if (!pxGetOptions(stderr, argc, argv, config, modes, argSets)) { + psError(PS_ERR_UNKNOWN, true, "option parsing failed"); psFree(argSets); + psFree(modes); psFree(config); return NULL; @@ -271,4 +229,5 @@ psFree(argSets); + psFree(modes); // setup search criterion @@ -333,8 +292,4 @@ } - // save argv/argc - config->argv = argv; - config->argc = argc; - return config; } Index: /trunk/ippTools/src/stacktoolConfig.c =================================================================== --- /trunk/ippTools/src/stacktoolConfig.c (revision 13577) +++ /trunk/ippTools/src/stacktoolConfig.c (revision 13578) @@ -27,5 +27,6 @@ #include "stacktool.h" -pxConfig *stacktoolConfig(pxConfig *config, int argc, char **argv) { +pxConfig *stacktoolConfig(pxConfig *config, int argc, char **argv) +{ if (!config) { config = pxConfigAlloc(); @@ -129,60 +130,19 @@ psFree(now); -#define PXTOOL_MODE(option, modeval, argset) \ -{ \ - int N = 0; \ - if ((N = psArgumentGet (argc, argv, option))) { \ - psArgumentRemove (N, &argc, argv); \ - if (config->mode) { \ - psError(PS_ERR_UNKNOWN, true, "only one mode selection is allowed"); \ - psFree(config); \ - return NULL; \ - } \ - config->mode = modeval; \ - config->args = psMemIncrRefCounter(argset); \ - } \ - if (!psMetadataAddMetadata(argSets, PS_LIST_TAIL, option, 0, NULL, argset)) {;\ - psError(PS_ERR_UNKNOWN, false, "failed to add argset for %s", option); \ - } \ - psFree(argset); \ -} - psMetadata *argSets = psMetadataAlloc(); - // find which mode we're running under - PXTOOL_MODE("-definerun", STACKTOOL_MODE_DEFINERUN, definerunArgs); - PXTOOL_MODE("-updaterun", STACKTOOL_MODE_UPDATERUN, updaterunArgs); - PXTOOL_MODE("-addinputskyfile", STACKTOOL_MODE_ADDINPUTSKYFILE, addinputskyfileArgs); - PXTOOL_MODE("-inputskyfile", STACKTOOL_MODE_INPUTSKYFILE, inputskyfileArgs); - PXTOOL_MODE("-tosum", STACKTOOL_MODE_TOSUM, tosumArgs); - PXTOOL_MODE("-addsumskyfile", STACKTOOL_MODE_ADDSUMSKYFILE, addsumskyfileArgs); - PXTOOL_MODE("-sumskyfile", STACKTOOL_MODE_SUMSKYFILE, sumskyfileArgs); - - bool argErr = false; - if (config->mode == STACKTOOL_MODE_NONE) { - argErr = true; - fprintf (stderr, "mode argument is required\n"); - } else if (! psArgumentParse(config->args, &argc, argv) || argc != 1) { - argErr = true; - fprintf (stderr, "error parsing arguments\n"); - } - - if (argErr) { - printf("\nPan-STARRS Stack Tool\n"); - printf("Usage: %s []\n\n", argv[0]); - printf(" :\n\n"); - - psMetadataIterator *iter = psMetadataIteratorAlloc(argSets, 0, NULL); - psMetadataItem *item = NULL; - while ((item = psMetadataGetAndIncrement(iter))) { - if (!item->type == PS_DATA_METADATA) { - psAbort("all options must be specified as a metadata"); - } - - fprintf(stdout, "%s ", item->name); - psArgumentHelp(item->data.md); - } - psFree(iter); - + psMetadata *modes = psMetadataAlloc(); + + PXTOOL_ADD_MODE("-definerun", "", STACKTOOL_MODE_DEFINERUN, definerunArgs); + PXTOOL_ADD_MODE("-updaterun", "", STACKTOOL_MODE_UPDATERUN, updaterunArgs); + PXTOOL_ADD_MODE("-addinputskyfile", "", STACKTOOL_MODE_ADDINPUTSKYFILE, addinputskyfileArgs); + PXTOOL_ADD_MODE("-inputskyfile", "", STACKTOOL_MODE_INPUTSKYFILE, inputskyfileArgs); + PXTOOL_ADD_MODE("-tosum", "", STACKTOOL_MODE_TOSUM, tosumArgs); + PXTOOL_ADD_MODE("-addsumskyfile", "", STACKTOOL_MODE_ADDSUMSKYFILE, addsumskyfileArgs); + PXTOOL_ADD_MODE("-sumskyfile", "", STACKTOOL_MODE_SUMSKYFILE, sumskyfileArgs); + + if (!pxGetOptions(stderr, argc, argv, config, modes, argSets)) { + psError(PS_ERR_UNKNOWN, true, "option parsing failed"); psFree(argSets); + psFree(modes); psFree(config); return NULL; @@ -190,4 +150,5 @@ psFree(argSets); + psFree(modes); // setup search criterion @@ -252,8 +213,4 @@ } - // save argv/argc - config->argv = argv; - config->argc = argc; - return config; } Index: /trunk/ippTools/src/warptoolConfig.c =================================================================== --- /trunk/ippTools/src/warptoolConfig.c (revision 13577) +++ /trunk/ippTools/src/warptoolConfig.c (revision 13578) @@ -27,5 +27,6 @@ #include "warptool.h" -pxConfig *warptoolConfig(pxConfig *config, int argc, char **argv) { +pxConfig *warptoolConfig(pxConfig *config, int argc, char **argv) +{ if (!config) { config = pxConfigAlloc(); @@ -157,11 +158,11 @@ "search by warptool ID", NULL); psMetadataAddStr(warpedArgs, PS_LIST_TAIL, "-skycell_id", 0, - "define skycell ID (required)", NULL); + "define skycell ID", NULL); psMetadataAddStr(warpedArgs, PS_LIST_TAIL, "-tess_id", 0, - "define tessellation ID (required)", NULL); + "define tessellation ID", NULL); psMetadataAddStr(warpedArgs, PS_LIST_TAIL, "-exp_tag", 0, - "define exposure tag (required)", NULL); + "define exposure tag", NULL); psMetadataAddStr(warpedArgs, PS_LIST_TAIL, "-cam_id", 0, - "define phase 3 version of exposure tag (required)", NULL); + "define phase 3 version of exposure tag", NULL); psMetadataAddU64(warpedArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); @@ -171,72 +172,31 @@ psFree(now); -#define PXTOOL_MODE(option, modeval, argset) \ -{ \ - int N = 0; \ - if ((N = psArgumentGet (argc, argv, option))) { \ - psArgumentRemove (N, &argc, argv); \ - if (config->mode) { \ - psError(PS_ERR_UNKNOWN, true, "only one mode selection is allowed"); \ - psFree(config); \ - return NULL; \ - } \ - config->mode = modeval; \ - config->args = psMemIncrRefCounter(argset); \ - } \ - if (!psMetadataAddMetadata(argSets, PS_LIST_TAIL, option, 0, NULL, argset)) {;\ - psError(PS_ERR_UNKNOWN, false, "failed to add argset for %s", option); \ - } \ - psFree(argset); \ -} - psMetadata *argSets = psMetadataAlloc(); - // find which mode we're running under - PXTOOL_MODE("-definerun", WARPTOOL_MODE_DEFINERUN, definerunArgs); - PXTOOL_MODE("-updaterun", WARPTOOL_MODE_UPDATERUN, updaterunArgs); - PXTOOL_MODE("-addinputexp", WARPTOOL_MODE_ADDINPUTEXP, addinputexpArgs); - PXTOOL_MODE("-exp", WARPTOOL_MODE_EXP, expArgs); - PXTOOL_MODE("-imfile", WARPTOOL_MODE_IMFILE, imfileArgs); - PXTOOL_MODE("-tooverlap", WARPTOOL_MODE_TOOVERLAP, tooverlapArgs); - PXTOOL_MODE("-addoverlap", WARPTOOL_MODE_ADDOVERLAP, addoverlapArgs); - PXTOOL_MODE("-scmap", WARPTOOL_MODE_SCMAP, scmapArgs); - PXTOOL_MODE("-towarped", WARPTOOL_MODE_TOWARPED, towarpedArgs); - PXTOOL_MODE("-addwarped", WARPTOOL_MODE_ADDWARPED, addwarpedArgs); - PXTOOL_MODE("-warped", WARPTOOL_MODE_WARPED, warpedArgs); + psMetadata *modes = psMetadataAlloc(); + + PXTOOL_ADD_MODE("-definerun", "", WARPTOOL_MODE_DEFINERUN, definerunArgs); + PXTOOL_ADD_MODE("-updaterun", "", WARPTOOL_MODE_UPDATERUN, updaterunArgs); + PXTOOL_ADD_MODE("-addinputexp", "", WARPTOOL_MODE_ADDINPUTEXP, addinputexpArgs); + PXTOOL_ADD_MODE("-exp", "", WARPTOOL_MODE_EXP, expArgs); + PXTOOL_ADD_MODE("-imfile", "", WARPTOOL_MODE_IMFILE, imfileArgs); + PXTOOL_ADD_MODE("-tooverlap", "", WARPTOOL_MODE_TOOVERLAP, tooverlapArgs); + PXTOOL_ADD_MODE("-addoverlap", "", WARPTOOL_MODE_ADDOVERLAP, addoverlapArgs); + PXTOOL_ADD_MODE("-scmap", "", WARPTOOL_MODE_SCMAP, scmapArgs); + PXTOOL_ADD_MODE("-towarped", "", WARPTOOL_MODE_TOWARPED, towarpedArgs); + PXTOOL_ADD_MODE("-addwarped", "", WARPTOOL_MODE_ADDWARPED, addwarpedArgs); + PXTOOL_ADD_MODE("-warped", "", WARPTOOL_MODE_WARPED, warpedArgs); #if 0 - PXTOOL_MODE("-tostackedimfile", WARPTOOL_MODE_TOSTACKEDIMFILE, tostackedimfileArgs); - PXTOOL_MODE("-addstackedimfile", WARPTOOL_MODE_ADDSTACKEDIMFILE, addstackedimfileArgs); - PXTOOL_MODE("-stackedimfile", WARPTOOL_MODE_STACKEDIMFILE, stackedimfileArgs); - PXTOOL_MODE("-todiffimfile", WARPTOOL_MODE_TODIFFIMFILE, todiffimfileArgs); - PXTOOL_MODE("-adddiffimfile", WARPTOOL_MODE_ADDDIFFIMFILE, adddiffimfileArgs); - PXTOOL_MODE("-diffimfile", WARPTOOL_MODE_DIFFIMFILE, diffimfileArgs); + PXTOOL_ADD_MODE("-tostackedimfile", WARPTOOL_MODE_TOSTACKEDIMFILE, tostackedimfileArgs); + PXTOOL_ADD_MODE("-addstackedimfile", WARPTOOL_MODE_ADDSTACKEDIMFILE, addstackedimfileArgs); + PXTOOL_ADD_MODE("-stackedimfile", WARPTOOL_MODE_STACKEDIMFILE, stackedimfileArgs); + PXTOOL_ADD_MODE("-todiffimfile", WARPTOOL_MODE_TODIFFIMFILE, todiffimfileArgs); + PXTOOL_ADD_MODE("-adddiffimfile", WARPTOOL_MODE_ADDDIFFIMFILE, adddiffimfileArgs); + PXTOOL_ADD_MODE("-diffimfile", WARPTOOL_MODE_DIFFIMFILE, diffimfileArgs); #endif - bool argErr = false; - if (config->mode == WARPTOOL_MODE_NONE) { - argErr = true; - fprintf (stderr, "mode argument is required\n"); - } else if (! psArgumentParse(config->args, &argc, argv) || argc != 1) { - argErr = true; - fprintf (stderr, "error parsing arguments\n"); - } - - if (argErr) { - printf("\nPan-STARRS Warp Tool\n"); - printf("Usage: %s []\n\n", argv[0]); - printf(" :\n\n"); - - psMetadataIterator *iter = psMetadataIteratorAlloc(argSets, 0, NULL); - psMetadataItem *item = NULL; - while ((item = psMetadataGetAndIncrement(iter))) { - if (!item->type == PS_DATA_METADATA) { - psAbort("all options must be specified as a metadata"); - } - - fprintf(stdout, "%s ", item->name); - psArgumentHelp(item->data.md); - } - psFree(iter); - + if (!pxGetOptions(stderr, argc, argv, config, modes, argSets)) { + psError(PS_ERR_UNKNOWN, true, "option parsing failed"); psFree(argSets); + psFree(modes); psFree(config); return NULL; @@ -244,4 +204,5 @@ psFree(argSets); + psFree(modes); // setup search criterion @@ -306,8 +267,4 @@ } - // save argv/argc - config->argv = argv; - config->argc = argc; - return config; }