IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Jul 15, 2008, 10:30:59 AM (18 years ago)
Author:
eugene
Message:

completely deprecate config->where; make all command-line handling consistent; move nearly all sql into share/*.sql; ensure consistency between args supplied and used

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippTools/src/pstamptoolConfig.c

    r18531 r18561  
    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);
     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);
    8168
    8269    // -pendingreq
    8370    psMetadata *pendingreqArgs = psMetadataAlloc();
    84     psMetadataAddStr(pendingreqArgs, PS_LIST_TAIL, "-req_id", 0,
    85             "define req_id", NULL);
    86     psMetadataAddU64(pendingreqArgs, PS_LIST_TAIL, "-limit",  0,
    87             "limit result set to N items", 0);
    88     psMetadataAddBool(pendingreqArgs, PS_LIST_TAIL, "-simple", 0,
    89             "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);
    9074
    9175    // -listreq
    9276    psMetadata *listreqArgs = psMetadataAlloc();
    93     psMetadataAddStr(listreqArgs, PS_LIST_TAIL, "-req_id", 0,
    94             "define req_id", NULL);
    95     psMetadataAddU64(listreqArgs, PS_LIST_TAIL, "-limit",  0,
    96             "limit result set to N items", 0);
    97     psMetadataAddBool(listreqArgs, PS_LIST_TAIL, "-simple", 0,
    98             "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);
    9980
    10081    // -completedreq
    10182    psMetadata *completedreqArgs = psMetadataAlloc();
    102     psMetadataAddU64(completedreqArgs, PS_LIST_TAIL, "-limit",  0,
    103             "limit result set to N items", 0);
    104     psMetadataAddBool(completedreqArgs, PS_LIST_TAIL, "-simple", 0,
    105             "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);
    10685
    10786    // -processedreq
    10887    psMetadata *processedreqArgs = psMetadataAlloc();
    109     psMetadataAddStr(processedreqArgs, PS_LIST_TAIL, "-req_id", 0,
    110             "req_id for which to change state", NULL);
    111     psMetadataAddStr(processedreqArgs, PS_LIST_TAIL, "-state", 0,
    112             "new state", NULL);
    113     psMetadataAddStr(processedreqArgs, PS_LIST_TAIL, "-outProduct", 0,
    114             "define request outProduct", NULL);
    115     psMetadataAddStr(processedreqArgs, PS_LIST_TAIL, "-fault", 0,
    116             "define request fault code", NULL);
    117     psMetadataAddStr(processedreqArgs, PS_LIST_TAIL, "-uri", 0,
    118             "define the uri", NULL);
    119     psMetadataAddStr(processedreqArgs, PS_LIST_TAIL, "-name", 0,
    120             "define the name", NULL);
    121     psMetadataAddStr(processedreqArgs, PS_LIST_TAIL, "-reqType", 0,
    122             "define the reqType", 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);
     90    psMetadataAddStr(processedreqArgs, PS_LIST_TAIL, "-outProduct", 0,            "define request outProduct", NULL);
     91    psMetadataAddStr(processedreqArgs, PS_LIST_TAIL, "-fault", 0,            "define request fault code", NULL);
     92    psMetadataAddStr(processedreqArgs, PS_LIST_TAIL, "-uri", 0,            "define the uri", NULL);
     93    psMetadataAddStr(processedreqArgs, PS_LIST_TAIL, "-name", 0,            "define the name", NULL);
     94    psMetadataAddStr(processedreqArgs, PS_LIST_TAIL, "-reqType", 0,            "define the reqType", NULL);
    12395
    12496    // -revertreq
    12597    psMetadata *revertreqArgs = psMetadataAlloc();
    126     psMetadataAddS64(revertreqArgs, PS_LIST_TAIL, "-req_id", 0,
    127             "req_id for which to revert", 0);
     98    psMetadataAddS64(revertreqArgs, PS_LIST_TAIL, "-req_id", 0,            "req_id for which to revert", 0);
    12899
    129100    // -addjob
    130101    psMetadata *addjobArgs = psMetadataAlloc();
    131     psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-uri", 0,
    132             "define job file uri", NULL);
    133     psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-req_id", 0,
    134             "define job req_id", NULL);
    135     psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-rownum", 0,
    136             "define job rownum", NULL);
    137     psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-job_type", 0,
    138             "define job job_type", NULL);
    139     psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-outputBase", 0,
    140             "define job outputBase", NULL);
    141     psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-args", 0,
    142             "define job args", NULL);
    143     psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-state", 0,
    144             "new state", NULL);
    145     psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-fault", 0,
    146             "new result", NULL);
     102    psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-uri", 0,            "define job file uri", NULL);
     103    psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-req_id", 0,            "define job req_id", NULL);
     104    psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-rownum", 0,            "define job rownum", NULL);
     105    psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-job_type", 0,            "define job job_type", "stamp");
     106    psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-outputBase", 0,            "define job outputBase", NULL);
     107    psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-args", 0,            "define job args", NULL);
     108    psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-state", 0,            "new state", "run");
     109    // psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-result", 0,            "new result", "0");
     110    psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-fault", 0,            "new result", NULL);
    147111
    148112    // -listjob
    149113    psMetadata *listjobArgs = psMetadataAlloc();
    150     psMetadataAddStr(listjobArgs, PS_LIST_TAIL, "-req_id", 0,
    151             "define request", NULL);
    152     psMetadataAddStr(listjobArgs, PS_LIST_TAIL, "-job_id", 0,
    153             "define job", NULL);
    154     psMetadataAddU64(listjobArgs, PS_LIST_TAIL, "-limit",  0,
    155             "limit result set to N items", 0);
    156     psMetadataAddBool(listjobArgs, PS_LIST_TAIL, "-simple", 0,
    157             "use the simple output format", false);
     114    psMetadataAddStr(listjobArgs, PS_LIST_TAIL, "-req_id", 0,            "define request", NULL);
     115    psMetadataAddStr(listjobArgs, PS_LIST_TAIL, "-job_id", 0,            "define job", NULL);
     116    psMetadataAddU64(listjobArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
     117    psMetadataAddBool(listjobArgs, PS_LIST_TAIL, "-simple", 0,            "use the simple output format", false);
    158118
    159119    // -pendingjob
    160120    psMetadata *pendingjobArgs = psMetadataAlloc();
    161     psMetadataAddStr(pendingjobArgs, PS_LIST_TAIL, "-job_id", 0,
    162             "define job", NULL);
    163     psMetadataAddU64(pendingjobArgs, PS_LIST_TAIL, "-limit",  0,
    164             "limit result set to N items", 0);
    165     psMetadataAddBool(pendingjobArgs, PS_LIST_TAIL, "-simple", 0,
    166             "use the simple output format", false);
     121    psMetadataAddStr(pendingjobArgs, PS_LIST_TAIL, "-job_id", 0,            "define job", NULL);
     122    psMetadataAddU64(pendingjobArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
     123    psMetadataAddBool(pendingjobArgs, PS_LIST_TAIL, "-simple", 0,            "use the simple output format", false);
    167124
    168125    // -processedjob
    169126    psMetadata *processedjobArgs = psMetadataAlloc();
    170     psMetadataAddStr(processedjobArgs, PS_LIST_TAIL, "-job_id", 0,
    171             "req_id for which to change state", NULL);
    172     psMetadataAddStr(processedjobArgs, PS_LIST_TAIL, "-state", 0,
    173             "new state", NULL);
    174     psMetadataAddStr(processedjobArgs, PS_LIST_TAIL, "-fault", 0,
    175             "new result", NULL);
    176 
    177 #define PXTOOL_MODE(option, modeval, argset) \
    178 { \
    179     int N = 0; \
    180     if ((N = psArgumentGet (argc, argv, option))) { \
    181         psArgumentRemove (N, &argc, argv); \
    182         if (config->mode) { \
    183             psError(PS_ERR_UNKNOWN, true, "only one mode selection is allowed"); \
    184             psFree(config); \
    185             return NULL; \
    186         } \
    187         config->mode = modeval; \
    188         config->args = psMemIncrRefCounter(argset); \
    189     } \
    190     if (!psMetadataAddMetadata(argSets, PS_LIST_TAIL, option, 0, NULL, argset)) {;\
    191         psError(PS_ERR_UNKNOWN, false, "failed to add argset for %s", option); \
    192     } \
    193     psFree(argset); \
    194 }
     127    psMetadataAddStr(processedjobArgs, PS_LIST_TAIL, "-job_id", 0,            "req_id for which to change state", NULL);
     128    psMetadataAddStr(processedjobArgs, PS_LIST_TAIL, "-state", 0,            "new state", NULL);
     129    // psMetadataAddStr(processedjobArgs, PS_LIST_TAIL, "-result", 0,            "new result", NULL);
     130    psMetadataAddStr(processedjobArgs, PS_LIST_TAIL, "-fault", 0,            "new result", NULL);
    195131
    196132    psMetadata *argSets = psMetadataAlloc();
    … …  
    224160    psFree(modes);
    225161
    226     // setup search criterion
    227 #define addWhereStr(name) \
    228 { \
    229     psString str = NULL; \
    230     bool status = false; \
    231     if ((str = psMetadataLookupStr(&status, config->args, "-" #name))) { \
    232         if (!psMetadataAddStr(config->where, PS_LIST_TAIL, #name, 0, "==", str)) {\
    233             psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \
    234             psFree(config); \
    235             return NULL; \
    236         } \
    237     } \
    238 }
    239 
    240     // generate SQL where clause
    241     config->where = psMetadataAlloc();
    242 
    243     addWhereStr(req_id);
    244     addWhereStr(job_id);
    245 
    246     if (config->where->list->n < 1) {
    247         psFree(config->where);
    248         config->where = NULL;
    249     }
    250 
    251162    // define Database handle, if used
    252163    // do this last so we don't setup a connection before CLI options are
Note: See TracChangeset for help on using the changeset viewer.