IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Nov 13, 2006, 4:00:40 PM (20 years ago)
Author:
jhoblitt
Message:

modernize pztool -seen

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippTools/src/pztoolConfig.c

    r9392 r9967  
    4242    // -seen
    4343    psMetadata *seenArgs = psMetadataAlloc();
    44     psMetadataAddStr(seenArgs, PS_LIST_TAIL, "-exp_tag",  0,
    45         "define exposure ID", NULL);
    46     psMetadataAddStr(seenArgs, PS_LIST_TAIL, "-inst",  0,
    47         "define camera ID", NULL);
    48     psMetadataAddStr(seenArgs, PS_LIST_TAIL, "-telescope",  0,
    49         "define telescope ID", NULL);
    50     psMetadataAddStr(seenArgs, PS_LIST_TAIL, "-exp_type",  0,
    51         "define exposure type", NULL);
     44    psMetadataAddStr(seenArgs, PS_LIST_TAIL, "-exp_tag", 0,
     45            "define exposure ID", NULL);
     46    psMetadataAddStr(seenArgs, PS_LIST_TAIL, "-inst", 0,
     47            "define camera ID", NULL);
     48    psMetadataAddStr(seenArgs, PS_LIST_TAIL, "-telescope", 0,
     49            "define telescope ID", NULL);
     50    psMetadataAddStr(seenArgs, PS_LIST_TAIL, "-exp_type", 0,
     51            "define exposure type", NULL);
     52    psMetadataAddBool(seenArgs, PS_LIST_TAIL, "-simple", 0,
     53            "use the simple output format", false);
    5254   
    5355    // -pending
    5456    psMetadata *pendingArgs = psMetadataAlloc();
    55     psMetadataAddStr(pendingArgs, PS_LIST_TAIL, "-exp_tag",  0,
    56         "define exposure ID", NULL);
    57     psMetadataAddStr(pendingArgs, PS_LIST_TAIL, "-inst",  0,
    58         "define camera ID", NULL);
    59     psMetadataAddStr(pendingArgs, PS_LIST_TAIL, "-telescope",  0,
    60         "define telescope ID", NULL);
    61     psMetadataAddStr(pendingArgs, PS_LIST_TAIL, "-exp_type",  0,
    62         "define exposure type", NULL);
     57    psMetadataAddStr(pendingArgs, PS_LIST_TAIL, "-exp_tag", 0,
     58            "define exposure ID", NULL);
     59    psMetadataAddStr(pendingArgs, PS_LIST_TAIL, "-inst", 0,
     60            "define camera ID", NULL);
     61    psMetadataAddStr(pendingArgs, PS_LIST_TAIL, "-telescope", 0,
     62            "define telescope ID", NULL);
     63    psMetadataAddStr(pendingArgs, PS_LIST_TAIL, "-exp_type", 0,
     64            "define exposure type", NULL);
    6365
    6466    // -copydone
    6567    psMetadata *copydoneArgs = psMetadataAlloc();
    66     psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-exp_tag",  0,
    67         "define exposure ID", NULL);
    68     psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-class",  0,
    69         "define class", NULL);
    70     psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-class_id",  0,
    71         "define class_id", NULL);
    72     psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-suri",  0,
    73         "define storage uri", NULL);
     68    psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-exp_tag", 0,
     69            "define exposure ID", NULL);
     70    psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-class", 0,
     71            "define class", NULL);
     72    psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-class_id", 0,
     73            "define class_id", NULL);
     74    psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-suri", 0,
     75            "define storage uri", NULL);
    7476
    7577#define PXTOOL_MODE(option, modeval, argset) \
    … …  
    8082        if (config->mode) { \
    8183            psError(PS_ERR_UNKNOWN, true, "only one mode selection is allowed"); \
     84            goto FAIL; \
    8285        } \
    8386        config->mode = modeval; \
    8487        config->args = psMemIncrRefCounter(argset); \
    8588    } \
     89    if (!psMetadataAddMetadata(argSets, PS_LIST_TAIL, option, 0, NULL, argset)) {;\
     90        psError(PS_ERR_UNKNOWN, false, "failed to add argset for %s", option); \
     91    } \
     92    psFree(argset); \
    8693}
    8794
     95    psMetadata *argSets = psMetadataAlloc();
     96    // find which mode we're running under
    8897    PXTOOL_MODE("-seen",            PZTOOL_MODE_SEEN,         seenArgs);
    8998    PXTOOL_MODE("-pending",         PZTOOL_MODE_PENDING,      pendingArgs);
    … …  
    100109
    101110    if (argErr) {
    102         printf("\nPan-STARRS Phase Z Search Tool\n");
     111        printf("\nPan-STARRS Detrend Tool\n");
    103112        printf("Usage: %s <mode> [<options>]\n\n", argv[0]);
    104         printf(" <mode> : -seen | -pending | -copydone\n\n");
     113        printf(" <mode> :\n\n");
    105114
    106         fprintf (stdout, "-seen ");
    107         psArgumentHelp(seenArgs);
    108         psFree(seenArgs);
     115        psMetadataIterator *iter = psMetadataIteratorAlloc(argSets, 0, NULL);
     116        psMetadataItem *item = NULL;
     117        while ((item = psMetadataGetAndIncrement(iter))) {
     118            if (!item->type == PS_DATA_METADATA) {
     119                psAbort(argv[0], "all options must be specified as a metadata");
     120            }
    109121
    110         fprintf (stdout, "-pending ");
    111         psArgumentHelp(pendingArgs);
    112         psFree(pendingArgs);
     122            fprintf(stdout, "%s ", item->name);
     123            psArgumentHelp(item->data.md);
     124        }
     125        psFree(iter);
    113126
    114         fprintf (stdout, "-copydone ");
    115         psArgumentHelp(copydoneArgs);
    116         psFree(copydoneArgs);
    117 
     127        psFree(argSets);
    118128        goto FAIL;
    119129    }
    120130
    121     psFree(seenArgs);
    122     psArgumentHelp(pendingArgs);
    123     psFree(copydoneArgs);
     131    psFree(argSets);
    124132
    125133    // setup search criterion
Note: See TracChangeset for help on using the changeset viewer.