IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 16087


Ignore:
Timestamp:
Jan 15, 2008, 3:55:58 PM (18 years ago)
Author:
jhoblitt
Message:

convert to PXOPT_* macros

File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/end_stage/ippTools/src/pxinject.c

    r16083 r16087  
    7979    PS_ASSERT_PTR_NON_NULL(config, false);
    8080
    81     bool status = false;
    82     psString tmp_exp_name = psMetadataLookupStr(&status, config->args, "-tmp_exp_name");
    83     if (!status) {
    84         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -tmp_exp_name");
    85         return false;
    86     }
    87     if (!tmp_exp_name) {
    88         psError(PS_ERR_UNKNOWN, true, "-tmp_exp_name is required");
    89         return false;
    90     }
    91     psString tmp_camera = psMetadataLookupStr(&status, config->args, "-tmp_inst");
    92     if (!status) {
    93         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -tmp_inst");
    94         return false;
    95     }
    96     if (!tmp_camera) {
    97         psError(PS_ERR_UNKNOWN, true, "-tmp_inst is required");
    98         return false;
    99     }
    100     psString tmp_telescope = psMetadataLookupStr(&status, config->args, "-tmp_telescope");
    101     if (!status) {
    102         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -tmp_telescope");
    103         return false;
    104     }
    105     if (!tmp_telescope) {
    106         psError(PS_ERR_UNKNOWN, true, "-tmp_telescope is required");
    107         return false;
    108     }
    109 
    110     psString workdir = psMetadataLookupStr(&status, config->args, "-workdir");
    111     if (!status) {
    112         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -workdir");
    113         return false;
    114     }
    115     if (!workdir) {
    116         psError(PS_ERR_UNKNOWN, true, "-workdir is required");
    117         return false;
    118     }
    119 
    120     psString reduction = psMetadataLookupStr(&status, config->args, "-reduction");
    121     if (!status) {
    122         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -reduction");
    123         return false;
    124     }
    125 
    126     psString dvodb = psMetadataLookupStr(&status, config->args, "-dvodb");
    127     if (!status) {
    128         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -dvodb");
    129         return false;
    130     }
    131 
    132     psString tess_id = psMetadataLookupStr(&status, config->args, "-tess_id");
    133     if (!status) {
    134         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -tess_id");
    135         return false;
    136     }
    137 
    138     psString end_stage = psMetadataLookupStr(&status, config->args, "-end_stage");
    139     if (!status) {
    140         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -end_stage");
    141         return false;
    142     }
     81    PXOPT_LOOKUP_STR(tmp_exp_name, config->args, "-tmp_exp_name", true, false);
     82    PXOPT_LOOKUP_STR(tmp_camera, config->args, "-tmp_inst", true, false);
     83    PXOPT_LOOKUP_STR(tmp_telescope, config->args, "-tmp_telescope", true, false);
     84    PXOPT_LOOKUP_STR(workdir, config->args, "-workdir", true, false);
     85    PXOPT_LOOKUP_STR(reduction, config->args, "-reduction", false, false);
     86    PXOPT_LOOKUP_STR(dvodb, config->args, "-dvodb", false, false);
     87    PXOPT_LOOKUP_STR(tess_id, config->args, "-tess_id", false, false);
     88    PXOPT_LOOKUP_STR(end_stage, config->args, "-end_stage", false, false);
     89    PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
    14390
    14491    if (!newExpInsert(config->dbh,
    … …  
    171118    psFree(exp_id);
    172119
    173     bool simple = false;
    174     {
    175         bool status = false;
    176         simple = psMetadataLookupBool(&status, config->args, "-simple");
    177         if (!status) {
    178             psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -simple");
    179             psFree(md);
    180             return false;
    181         }
    182     }
    183 
    184120    // negate simple so the default is true
    185121    if (!ippdbPrintMetadata(stdout, md, !simple)) {
    … …  
    198134    PS_ASSERT_PTR_NON_NULL(config, false);
    199135
    200     bool status = false;
    201     psString exp_id = psMetadataLookupStr(&status, config->args, "-exp_id");
    202     if (!status) {
    203         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -exp_id");
    204         return false;
    205     }
    206     if (!exp_id) {
    207         psError(PS_ERR_UNKNOWN, true, "-exp_id is required");
    208         return false;
    209     }
    210 #if 0
    211     psString class = psMetadataLookupStr(&status, config->args, "-class");
    212     if (!status) {
    213         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -class");
    214         return false;
    215     }
    216     if (!class) {
    217         psError(PS_ERR_UNKNOWN, true, "-class is required");
    218         return false;
    219     }
    220 #endif
    221     psString tmp_class_id = psMetadataLookupStr(&status, config->args, "-tmp_class_id");
    222     if (!status) {
    223         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -tmp_class_id");
    224         return false;
    225     }
    226     if (!tmp_class_id) {
    227         psError(PS_ERR_UNKNOWN, true, "-tmp_class_id is required");
    228         return false;
    229     }
    230     psString uri = psMetadataLookupStr(&status, config->args, "-uri");
    231     if (!status) {
    232         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -uri");
    233         return false;
    234     }
    235     if (!uri) {
    236         psError(PS_ERR_UNKNOWN, true, "-uri is required");
    237         return false;
    238     }
     136    PXOPT_LOOKUP_STR(exp_id, config->args, "-exp_id", true, false);
     137    PXOPT_LOOKUP_STR(tmp_class_id, config->args, "-tmp_class_id", true, false);
     138    PXOPT_LOOKUP_STR(uri, config->args, "-uri", true, false);
    239139
    240140    // insert with error flag state set to 0 (no errors)
    … …  
    252152    PS_ASSERT_PTR_NON_NULL(config, false);
    253153
    254     bool status = false;
    255     psString exp_id = psMetadataLookupStr(&status, config->args, "-exp_id");
    256     if (!status) {
    257         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -exp_id");
    258         return false;
    259     }
    260     if (!exp_id) {
    261         psError(PS_ERR_UNKNOWN, true, "-exp_id is required");
    262         return false;
    263     }
    264 
    265     psString state = psMetadataLookupStr(&status, config->args, "-state");
    266     if (!status) {
    267         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -state");
    268         return false;
    269     }
    270     if (!state) {
    271         psError(PS_ERR_UNKNOWN, true, "-state is required");
    272         return false;
    273     }
     154    PXOPT_LOOKUP_STR(exp_id, config->args, "-exp_id", true, false);
     155    PXOPT_LOOKUP_STR(state, config->args, "-state", true, false);
    274156
    275157    if (state) {
Note: See TracChangeset for help on using the changeset viewer.