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/pstamptoolConfig.c

    r18468 r18496  
    4545    // -adddatastore
    4646    psMetadata *adddatastoreArgs = psMetadataAlloc();
    47     psMetadataAddStr(adddatastoreArgs, PS_LIST_TAIL, "-uri", 0,
    48             "define storage uri", NULL);
    49     psMetadataAddStr(adddatastoreArgs, PS_LIST_TAIL, "-last_fileset", 0,
    50             "define last fileset seen", NULL);
    51     psMetadataAddStr(adddatastoreArgs, PS_LIST_TAIL, "-state", 0,
    52             "define datastore state", NULL);
    53     psMetadataAddStr(adddatastoreArgs, PS_LIST_TAIL, "-out_product", 0,
    54             "define output product name", NULL);
     47    psMetadataAddStr(adddatastoreArgs, PS_LIST_TAIL, "-uri",          0, "define storage uri (required)", NULL);
     48    psMetadataAddStr(adddatastoreArgs, PS_LIST_TAIL, "-out_product",  0, "define output product name (required)", NULL);
     49    psMetadataAddStr(adddatastoreArgs, PS_LIST_TAIL, "-last_fileset", 0, "define last fileset seen", NULL);
     50    psMetadataAddStr(adddatastoreArgs, PS_LIST_TAIL, "-state",        0, "define datastore state", "enabled");
    5551   
    5652    // -datastore
    5753    psMetadata *datastoreArgs = psMetadataAlloc();
    58     psMetadataAddBool(datastoreArgs, PS_LIST_TAIL, "-simple", 0,
    59             "use the simple output format", false);
    60     psMetadataAddStr(datastoreArgs, PS_LIST_TAIL, "-ds_id", 0,
    61             "define ds_id", NULL);
     54    psMetadataAddStr(datastoreArgs, PS_LIST_TAIL, "-ds_id", 0,            "define ds_id", NULL);
     55    psMetadataAddBool(datastoreArgs, PS_LIST_TAIL, "-simple", 0,            "use the simple output format", false);
    6256
    6357    // -moddatastore
    6458    psMetadata *moddatastoreArgs = psMetadataAlloc();
    65     psMetadataAddStr(moddatastoreArgs, PS_LIST_TAIL, "-ds_id", 0,
    66             "define ds_id", NULL);
    67     psMetadataAddStr(moddatastoreArgs, PS_LIST_TAIL, "-last_fileset", 0,
    68             "define storage uri", NULL);
    69     psMetadataAddStr(moddatastoreArgs, PS_LIST_TAIL, "-state", 0,
    70             "define storage uri", NULL);
    71     psMetadataAddStr(moddatastoreArgs, PS_LIST_TAIL, "-out_product", 0,
    72             "define output product name", NULL);
    73 
     59    psMetadataAddStr(moddatastoreArgs, PS_LIST_TAIL, "-ds_id", 0,            "define ds_id", "0");
     60    psMetadataAddStr(moddatastoreArgs, PS_LIST_TAIL, "-last_fileset", 0,            "define storage uri", NULL);
     61    psMetadataAddStr(moddatastoreArgs, PS_LIST_TAIL, "-state", 0,            "define storage uri", NULL);
    7462
    7563    // -addreq
    7664    psMetadata *addreqArgs = psMetadataAlloc();
    77     psMetadataAddStr(addreqArgs, PS_LIST_TAIL, "-uri", 0,
    78             "define request file uri", NULL);
    79     psMetadataAddStr(addreqArgs, PS_LIST_TAIL, "-ds_id", 0,
    80             "define request ds_id", NULL);
    81     psMetadataAddStr(addreqArgs, PS_LIST_TAIL, "-out_fileset", 0,
    82             "define request output_fileset", NULL);
     65    psMetadataAddStr(addreqArgs, PS_LIST_TAIL, "-uri", 0,            "define request file uri", NULL);
     66    psMetadataAddStr(addreqArgs, PS_LIST_TAIL, "-ds_id", 0,            "define request ds_id", NULL);
     67    psMetadataAddStr(addreqArgs, PS_LIST_TAIL, "-out_fileset", 0,            "define request output_fileset", NULL);
    8368
    8469    // -pendingreq
    8570    psMetadata *pendingreqArgs = psMetadataAlloc();
    86     psMetadataAddStr(pendingreqArgs, PS_LIST_TAIL, "-req_id", 0,
    87             "define req_id", NULL);
    88     psMetadataAddU64(pendingreqArgs, PS_LIST_TAIL, "-limit",  0,
    89             "limit result set to N items", 0);
    90     psMetadataAddBool(pendingreqArgs, PS_LIST_TAIL, "-simple", 0,
    91             "use the simple output format", false);
     71    psMetadataAddStr(pendingreqArgs, PS_LIST_TAIL, "-req_id", 0,            "define req_id", NULL);
     72    psMetadataAddU64(pendingreqArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
     73    psMetadataAddBool(pendingreqArgs, PS_LIST_TAIL, "-simple", 0,            "use the simple output format", false);
    9274
    9375    // -listreq
    9476    psMetadata *listreqArgs = psMetadataAlloc();
    95     psMetadataAddStr(listreqArgs, PS_LIST_TAIL, "-req_id", 0,
    96             "define req_id", NULL);
    97     psMetadataAddU64(listreqArgs, PS_LIST_TAIL, "-limit",  0,
    98             "limit result set to N items", 0);
    99     psMetadataAddBool(listreqArgs, PS_LIST_TAIL, "-simple", 0,
    100             "use the simple output format", false);
     77    psMetadataAddStr(listreqArgs, PS_LIST_TAIL, "-req_id", 0,            "define req_id", NULL);
     78    psMetadataAddU64(listreqArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
     79    psMetadataAddBool(listreqArgs, PS_LIST_TAIL, "-simple", 0,            "use the simple output format", false);
    10180
    10281    // -completedreq
    10382    psMetadata *completedreqArgs = psMetadataAlloc();
    104     psMetadataAddU64(completedreqArgs, PS_LIST_TAIL, "-limit",  0,
    105             "limit result set to N items", 0);
    106     psMetadataAddBool(completedreqArgs, PS_LIST_TAIL, "-simple", 0,
    107             "use the simple output format", false);
     83    psMetadataAddU64(completedreqArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
     84    psMetadataAddBool(completedreqArgs, PS_LIST_TAIL, "-simple", 0,            "use the simple output format", false);
    10885
    10986    // -processedreq
    11087    psMetadata *processedreqArgs = psMetadataAlloc();
    111     psMetadataAddStr(processedreqArgs, PS_LIST_TAIL, "-req_id", 0,
    112             "req_id for which to change state", NULL);
    113     psMetadataAddStr(processedreqArgs, PS_LIST_TAIL, "-state", 0,
    114             "new state", NULL);
     88    psMetadataAddStr(processedreqArgs, PS_LIST_TAIL, "-req_id", 0,            "req_id for which to change state", NULL);
     89    psMetadataAddStr(processedreqArgs, PS_LIST_TAIL, "-state", 0,            "new state", NULL);
    11590
    11691    // -addjob
    11792    psMetadata *addjobArgs = psMetadataAlloc();
    118     psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-uri", 0,
    119             "define job file uri", NULL);
    120     psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-req_id", 0,
    121             "define job req_id", NULL);
    122     psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-job_type", 0,
    123             "define job job_type", NULL);
    124     psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-outputBase", 0,
    125             "define job outputBase", NULL);
    126     psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-args", 0,
    127             "define job args", NULL);
    128     psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-state", 0,
    129             "new state", NULL);
    130     psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-result", 0,
    131             "new result", NULL);
     93    psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-uri", 0,            "define job file uri", NULL);
     94    psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-req_id", 0,            "define job req_id", NULL);
     95    psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-job_type", 0,            "define job job_type", "stamp");
     96    psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-outputBase", 0,            "define job outputBase", NULL);
     97    psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-args", 0,            "define job args", NULL);
     98    psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-state", 0,            "new state", "run");
     99    psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-result", 0,            "new result", "0");
    132100
    133101    // -listjob
    134102    psMetadata *listjobArgs = psMetadataAlloc();
    135     psMetadataAddStr(listjobArgs, PS_LIST_TAIL, "-req_id", 0,
    136             "define request", NULL);
    137     psMetadataAddStr(listjobArgs, PS_LIST_TAIL, "-job_id", 0,
    138             "define job", NULL);
    139     psMetadataAddU64(listjobArgs, PS_LIST_TAIL, "-limit",  0,
    140             "limit result set to N items", 0);
    141     psMetadataAddBool(listjobArgs, PS_LIST_TAIL, "-simple", 0,
    142             "use the simple output format", false);
     103    psMetadataAddStr(listjobArgs, PS_LIST_TAIL, "-req_id", 0,            "define request", NULL);
     104    psMetadataAddStr(listjobArgs, PS_LIST_TAIL, "-job_id", 0,            "define job", NULL);
     105    psMetadataAddU64(listjobArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
     106    psMetadataAddBool(listjobArgs, PS_LIST_TAIL, "-simple", 0,            "use the simple output format", false);
    143107
    144108    // -pendingjob
    145109    psMetadata *pendingjobArgs = psMetadataAlloc();
    146     psMetadataAddStr(pendingjobArgs, PS_LIST_TAIL, "-job_id", 0,
    147             "define job", NULL);
    148     psMetadataAddU64(pendingjobArgs, PS_LIST_TAIL, "-limit",  0,
    149             "limit result set to N items", 0);
    150     psMetadataAddBool(pendingjobArgs, PS_LIST_TAIL, "-simple", 0,
    151             "use the simple output format", false);
     110    psMetadataAddStr(pendingjobArgs, PS_LIST_TAIL, "-job_id", 0,            "define job", NULL);
     111    psMetadataAddU64(pendingjobArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
     112    psMetadataAddBool(pendingjobArgs, PS_LIST_TAIL, "-simple", 0,            "use the simple output format", false);
    152113
    153114    // -processedjob
    154115    psMetadata *processedjobArgs = psMetadataAlloc();
    155     psMetadataAddStr(processedjobArgs, PS_LIST_TAIL, "-job_id", 0,
    156             "req_id for which to change state", NULL);
    157     psMetadataAddStr(processedjobArgs, PS_LIST_TAIL, "-state", 0,
    158             "new state", NULL);
    159     psMetadataAddStr(processedjobArgs, PS_LIST_TAIL, "-result", 0,
    160             "new result", NULL);
    161 
    162 #define PXTOOL_MODE(option, modeval, argset) \
    163 { \
    164     int N = 0; \
    165     if ((N = psArgumentGet (argc, argv, option))) { \
    166         psArgumentRemove (N, &argc, argv); \
    167         if (config->mode) { \
    168             psError(PS_ERR_UNKNOWN, true, "only one mode selection is allowed"); \
    169             psFree(config); \
    170             return NULL; \
    171         } \
    172         config->mode = modeval; \
    173         config->args = psMemIncrRefCounter(argset); \
    174     } \
    175     if (!psMetadataAddMetadata(argSets, PS_LIST_TAIL, option, 0, NULL, argset)) {;\
    176         psError(PS_ERR_UNKNOWN, false, "failed to add argset for %s", option); \
    177     } \
    178     psFree(argset); \
    179 }
     116    psMetadataAddStr(processedjobArgs, PS_LIST_TAIL, "-job_id", 0,            "req_id for which to change state", NULL);
     117    psMetadataAddStr(processedjobArgs, PS_LIST_TAIL, "-state", 0,            "new state", NULL);
     118    psMetadataAddStr(processedjobArgs, PS_LIST_TAIL, "-result", 0,            "new result", NULL);
    180119
    181120    psMetadata *argSets = psMetadataAlloc();
    … …  
    208147    psFree(modes);
    209148
    210     // generate SQL where clause
    211     config->where = psMetadataAlloc();
    212 
    213     PXOPT_ADD_WHERE_STR(req_id);
    214     PXOPT_ADD_WHERE_STR(job_id);
    215 
    216     if (config->where->list->n < 1) {
    217         psFree(config->where);
    218         config->where = NULL;
    219     }
    220 
    221149    // define Database handle, if used
    222150    // do this last so we don't setup a connection before CLI options are
Note: See TracChangeset for help on using the changeset viewer.