IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Jan 20, 2008, 3:48:37 PM (19 years ago)
Author:
eugene
Message:

merging changes from JHs end_stage branch (new end_stage field and related features; substantial cleanup via macros)

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippTools/src/pzgetimfiles.c

    r15287 r16170  
    22 * pzgetimfiles.c
    33 *
    4  * Copyright (C) 2006  Joshua Hoblitt
     4 * Copyright (C) 2006-2008  Joshua Hoblitt
    55 *
    66 * This program is free software; you can redistribute it and/or modify it
    … …  
    7070    PS_ASSERT_PTR_NON_NULL(config, NULL);
    7171
    72     bool status = false;
    73     psString uri = psMetadataLookupStr(&status, config->args, "-uri");
    74     if (!status) {
    75         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -uri");
    76         return false;
    77     }
    78     if (!uri) {
    79         psError(PS_ERR_UNKNOWN, true, "-uri is required");
    80         return false;
    81     }
    82 
    83     psString filesetid = psMetadataLookupStr(&status, config->args, "-filesetid");
    84     if (!status) {
    85         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -filesetid");
    86         return false;
    87     }
    88     if (!filesetid) {
    89         psError(PS_ERR_UNKNOWN, true, "-filesetid is required");
    90         return false;
    91     }
    92 
    93     psString camera = psMetadataLookupStr(&status, config->args, "-inst");
    94     if (!status) {
    95         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -inst");
    96         return NULL;
    97     }
    98     if (!camera) {
    99         psError(PS_ERR_UNKNOWN, true, "-inst is required");
    100         return NULL;
    101     }
    102 
    103     psString telescope = psMetadataLookupStr(&status, config->args, "-telescope");
    104     if (!status) {
    105         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -telescope");
    106         return NULL;
    107     }
    108     if (!telescope) {
    109         psError(PS_ERR_UNKNOWN, true, "-telescope is required");
    110         return NULL;
    111     }
     72    // required
     73    PXOPT_LOOKUP_STR(uri, config->args, "-uri", true, false);
     74    PXOPT_LOOKUP_STR(filesetid, config->args, "-filesetid", true, false);
     75    PXOPT_LOOKUP_STR(camera, config->args, "-inst", true, false);
     76    PXOPT_LOOKUP_STR(telescope, config->args, "-telescope", true, false);
    11277
    11378    // invoke dsfilesetls
    … …  
    429394    // these are constants for all records parsed -- look them up before we do
    430395    // any work
    431     bool status = false;
    432     psString exp_name = psMetadataLookupStr(&status, config->args, "-filesetid");
    433     if (!status) {
    434         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for '-filesetid'");
    435         return NULL;
    436     }
    437     if (!exp_name) {
    438         psError(PS_ERR_UNKNOWN, true, "-filesetid is required");
    439         return NULL;
    440     }
    441 
    442     psString camera = psMetadataLookupStr(&status, config->args, "-inst");
    443     if (!status) {
    444         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -inst");
    445         return NULL;
    446     }
    447     if (!camera) {
    448         psError(PS_ERR_UNKNOWN, true, "-inst is required");
    449         return NULL;
    450     }
    451 
    452     psString telescope = psMetadataLookupStr(&status, config->args, "-telescope");
    453     if (!status) {
    454         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -telescope");
    455         return NULL;
    456     }
    457     if (!telescope) {
    458         psError(PS_ERR_UNKNOWN, true, "-telescope is required");
    459         return NULL;
    460     }
     396    PXOPT_LOOKUP_STR(exp_name, config->args, "-filesetid", true, false);
     397    PXOPT_LOOKUP_STR(camera, config->args, "-inst", true, false);
     398    PXOPT_LOOKUP_STR(telescope, config->args, "-telescope", true, false);
    461399
    462400    // split the string into lines
Note: See TracChangeset for help on using the changeset viewer.