IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Jul 13, 2008, 11:21:45 AM (18 years ago)
Author:
eugene
Message:

cleanup command-line argument handling; deprecate config.where

File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branch_20080706/ippTools/src/magictoolConfig.c

    r18468 r18496  
    5252    // -definerun
    5353    psMetadata *definerunArgs = psMetadataAlloc();
    54     psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-workdir", 0,
    55             "define workdir (required)", NULL);
    56     psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-label", 0,
    57             "define label", NULL);
    58     psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-dvodb", 0,
    59             "define dvodb", NULL);
    60     psMetadataAddTime(definerunArgs, PS_LIST_TAIL, "-registered",  0,
    61             "time detrend run was registered", now);
    62     psMetadataAddBool(definerunArgs, PS_LIST_TAIL, "-simple",  0,
    63             "use the simple output format", false);
     54    psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-workdir", 0,            "define workdir (required)", NULL);
     55    psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-label", 0,            "define label", NULL);
     56    psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-dvodb", 0,            "define dvodb", NULL);
     57    psMetadataAddTime(definerunArgs, PS_LIST_TAIL, "-registered",  0,            "time detrend run was registered", now);
     58    psMetadataAddBool(definerunArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
    6459
    6560    // -updaterun
    6661    psMetadata *updaterunArgs = psMetadataAlloc();
    67     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-magic_id", 0,
    68             "define warptool ID (required)", NULL);
    69     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-state", 0,
    70             "set state (required)", NULL);
    71 #if 0
    72     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-workdir", 0,
    73             "define workdir (required)", NULL);
    74     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-registered",  0,
    75             "time detrend run was registered", now);
    76 #endif
     62    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-magic_id", 0,            "define warptool ID (required)", NULL);
     63    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-state", 0,            "set state (required)", NULL);
    7764
    7865    // -addinputskyfile
    7966    psMetadata *addinputskyfileArgs = psMetadataAlloc();
    80     psMetadataAddStr(addinputskyfileArgs, PS_LIST_TAIL, "-magic_id", 0,
    81             "define magictool ID (required)", NULL);
    82     psMetadataAddStr(addinputskyfileArgs, PS_LIST_TAIL, "-diff_id", 0,
    83             "define difftool ID (required)", NULL);
    84     psMetadataAddStr(addinputskyfileArgs, PS_LIST_TAIL, "-node",  0,
    85             "define symbolic node name (required)", NULL);
     67    psMetadataAddStr(addinputskyfileArgs, PS_LIST_TAIL, "-magic_id", 0,            "define magictool ID (required)", NULL);
     68    psMetadataAddStr(addinputskyfileArgs, PS_LIST_TAIL, "-diff_id", 0,            "define difftool ID (required)", NULL);
     69    psMetadataAddStr(addinputskyfileArgs, PS_LIST_TAIL, "-node",  0,            "define symbolic node name (required)", NULL);
    8670
    8771    // -inputskyfile
    8872    psMetadata *inputskyfileArgs = psMetadataAlloc();
    89     psMetadataAddStr(inputskyfileArgs, PS_LIST_TAIL, "-magic_id", 0,
    90             "search by magictool ID", NULL);
    91     psMetadataAddStr(inputskyfileArgs, PS_LIST_TAIL, "-diff_id", 0,
    92             "search by difftool ID", NULL);
    93     psMetadataAddStr(inputskyfileArgs, PS_LIST_TAIL, "-node",  0,
    94             "search by symbolic node name", NULL);
    95     psMetadataAddU64(inputskyfileArgs, PS_LIST_TAIL, "-limit",  0,
    96             "limit result set to N items", 0);
    97     psMetadataAddBool(inputskyfileArgs, PS_LIST_TAIL, "-simple",  0,
    98             "use the simple output format", false);
     73    psMetadataAddStr(inputskyfileArgs, PS_LIST_TAIL, "-magic_id", 0,            "search by magictool ID", NULL);
     74    psMetadataAddStr(inputskyfileArgs, PS_LIST_TAIL, "-diff_id", 0,            "search by difftool ID", NULL);
     75    psMetadataAddStr(inputskyfileArgs, PS_LIST_TAIL, "-node",  0,            "search by symbolic node name", NULL);
     76    psMetadataAddU64(inputskyfileArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
     77    psMetadataAddBool(inputskyfileArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
    9978
    10079    // -inputtree
    10180    psMetadata *inputtreeArgs = psMetadataAlloc();
    102     psMetadataAddStr(inputtreeArgs, PS_LIST_TAIL, "-magic_id", 0,
    103             "define magictool ID (required)", NULL);
    104     psMetadataAddStr(inputtreeArgs, PS_LIST_TAIL, "-dep_file", 0,
    105             "order of operations dep. file (required)", NULL);
     81    psMetadataAddStr(inputtreeArgs, PS_LIST_TAIL, "-magic_id", 0,            "define magictool ID (required)", NULL);
     82    psMetadataAddStr(inputtreeArgs, PS_LIST_TAIL, "-dep_file", 0,            "order of operations dep. file (required)", NULL);
    10683
    10784    // -tooprocess
    10885    psMetadata *toprocessArgs = psMetadataAlloc();
    109     psMetadataAddStr(toprocessArgs, PS_LIST_TAIL, "-magic_id", 0,
    110             "search by magic ID", NULL);
    111     psMetadataAddU64(toprocessArgs, PS_LIST_TAIL, "-limit",  0,
    112             "limit result set to N items", 0);
    113     psMetadataAddBool(toprocessArgs, PS_LIST_TAIL, "-simple",  0,
    114             "use the simple output format", false);
     86    psMetadataAddStr(toprocessArgs, PS_LIST_TAIL, "-magic_id", 0,            "search by magic ID", NULL);
     87    psMetadataAddU64(toprocessArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
     88    psMetadataAddBool(toprocessArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
    11589
    11690    // -addresult
    11791    psMetadata *addresultArgs = psMetadataAlloc();
    118     psMetadataAddStr(addresultArgs, PS_LIST_TAIL, "-magic_id", 0,
    119             "define magictool ID (required)", NULL);
    120     psMetadataAddStr(addresultArgs, PS_LIST_TAIL, "-node",  0,
    121             "define symbolic node name (required)", NULL);
    122     psMetadataAddStr(addresultArgs, PS_LIST_TAIL, "-uri",  0,
    123             "define URI (required)", NULL);
     92    psMetadataAddStr(addresultArgs, PS_LIST_TAIL, "-magic_id", 0,            "define magictool ID (required)", NULL);
     93    psMetadataAddStr(addresultArgs, PS_LIST_TAIL, "-node",  0,            "define symbolic node name (required)", NULL);
     94    psMetadataAddStr(addresultArgs, PS_LIST_TAIL, "-uri",  0,            "define URI (required)", NULL);
    12495
    12596    // -tomask
    12697    psMetadata *tomaskArgs = psMetadataAlloc();
    127     psMetadataAddU64(tomaskArgs, PS_LIST_TAIL, "-limit",  0,
    128             "limit result set to N items", 0);
    129     psMetadataAddBool(tomaskArgs, PS_LIST_TAIL, "-simple",  0,
    130             "use the simple output format", false);
     98    psMetadataAddU64(tomaskArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
     99    psMetadataAddBool(tomaskArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
    131100
    132101    // -addmask
    133102    psMetadata *addmaskArgs = psMetadataAlloc();
    134     psMetadataAddStr(addmaskArgs, PS_LIST_TAIL, "-magic_id", 0,
    135             "define magictool ID (required)", NULL);
    136     psMetadataAddStr(addmaskArgs, PS_LIST_TAIL, "-uri",  0,
    137             "define URI (required)", NULL);
     103    psMetadataAddStr(addmaskArgs, PS_LIST_TAIL, "-magic_id", 0,            "define magictool ID (required)", NULL);
     104    psMetadataAddStr(addmaskArgs, PS_LIST_TAIL, "-uri",  0,            "define URI (required)", NULL);
    138105
    139106    // -toskyfilemask
    140107    psMetadata *toskyfilemaskArgs = psMetadataAlloc();
    141     psMetadataAddStr(toskyfilemaskArgs, PS_LIST_TAIL, "-magic_id", 0,
    142             "search by magic ID", NULL);
    143     psMetadataAddU64(toskyfilemaskArgs, PS_LIST_TAIL, "-limit",  0,
    144             "limit result set to N items", 0);
    145     psMetadataAddBool(toskyfilemaskArgs, PS_LIST_TAIL, "-simple",  0,
    146             "use the simple output format", false);
     108    psMetadataAddStr(toskyfilemaskArgs, PS_LIST_TAIL, "-magic_id", 0,            "search by magic ID", NULL);
     109    psMetadataAddU64(toskyfilemaskArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
     110    psMetadataAddBool(toskyfilemaskArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
    147111
    148112    // -addskyfilemask
    149113    psMetadata *addskyfilemaskArgs = psMetadataAlloc();
    150     psMetadataAddStr(addskyfilemaskArgs, PS_LIST_TAIL, "-magic_id", 0,
    151             "define magictool ID (required)", NULL);
    152     psMetadataAddStr(addskyfilemaskArgs, PS_LIST_TAIL, "-diff_id",  0,
    153             "define difftool ID (required)", NULL);
    154     psMetadataAddStr(addskyfilemaskArgs, PS_LIST_TAIL, "-uri",  0,
    155             "define URI (required)", NULL);
     114    psMetadataAddStr(addskyfilemaskArgs, PS_LIST_TAIL, "-magic_id", 0,            "define magictool ID (required)", NULL);
     115    psMetadataAddStr(addskyfilemaskArgs, PS_LIST_TAIL, "-diff_id",  0,            "define difftool ID (required)", NULL);
     116    psMetadataAddStr(addskyfilemaskArgs, PS_LIST_TAIL, "-uri",  0,            "define URI (required)", NULL);
    156117
    157118    psFree(now);
    … …  
    184145    psFree(modes);
    185146
    186     // generate SQL where clause
    187     config->where = psMetadataAlloc();
    188 
    189     PXOPT_ADD_WHERE_S64(warp_id);
    190     PXOPT_ADD_WHERE_STR(skycell_id);
    191     PXOPT_ADD_WHERE_STR(tess_id);
    192     PXOPT_ADD_WHERE_STR(exp_id);
    193     PXOPT_ADD_WHERE_STR_ALIAS("-code", "fault");
    194 
    195     if (config->where->list->n < 1) {
    196         psFree(config->where);
    197         config->where = NULL;
    198     }
    199 
    200147    // define Database handle, if used
    201148    // do this last so we don't setup a connection before CLI options are
Note: See TracChangeset for help on using the changeset viewer.