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

    r18314 r18561  
    4545    // -adddatastore
    4646    psMetadata *adddatastoreArgs = psMetadataAlloc();
    47     psMetadataAddStr(adddatastoreArgs, PS_LIST_TAIL, "-inst", 0,
    48             "define camera ID", NULL);
    49     psMetadataAddStr(adddatastoreArgs, PS_LIST_TAIL, "-telescope", 0,
    50             "define telescope ID", NULL);
    51     psMetadataAddStr(adddatastoreArgs, PS_LIST_TAIL, "-uri", 0,
    52             "define storage uri", NULL);
     47    psMetadataAddStr(adddatastoreArgs, PS_LIST_TAIL, "-inst", 0,            "define camera ID", NULL);
     48    psMetadataAddStr(adddatastoreArgs, PS_LIST_TAIL, "-telescope", 0,            "define telescope ID", NULL);
     49    psMetadataAddStr(adddatastoreArgs, PS_LIST_TAIL, "-uri", 0,            "define storage uri", NULL);
    5350   
    5451    // -datastore
    5552    psMetadata *datastoreArgs = psMetadataAlloc();
    56     psMetadataAddBool(datastoreArgs, PS_LIST_TAIL, "-simple", 0,
    57             "use the simple output format", false);
     53    psMetadataAddBool(datastoreArgs, PS_LIST_TAIL, "-simple", 0,            "use the simple output format", false);
    5854
    5955    // -seen
    6056    psMetadata *seenArgs = psMetadataAlloc();
    61     psMetadataAddStr(seenArgs, PS_LIST_TAIL, "-exp_name", 0,
    62             "define exposure ID", NULL);
    63     psMetadataAddStr(seenArgs, PS_LIST_TAIL, "-inst", 0,
    64             "define camera ID", NULL);
    65     psMetadataAddStr(seenArgs, PS_LIST_TAIL, "-telescope", 0,
    66             "define telescope ID", NULL);
    67     psMetadataAddStr(seenArgs, PS_LIST_TAIL, "-exp_type", 0,
    68             "define exposure type", NULL);
    69     psMetadataAddBool(seenArgs, PS_LIST_TAIL, "-simple", 0,
    70             "use the simple output format", false);
     57    psMetadataAddStr(seenArgs, PS_LIST_TAIL, "-exp_name", 0,            "define exposure ID", NULL);
     58    psMetadataAddStr(seenArgs, PS_LIST_TAIL, "-inst", 0,            "define camera ID", NULL);
     59    psMetadataAddStr(seenArgs, PS_LIST_TAIL, "-telescope", 0,            "define telescope ID", NULL);
     60    psMetadataAddStr(seenArgs, PS_LIST_TAIL, "-exp_type", 0,            "define exposure type", NULL);
     61    psMetadataAddBool(seenArgs, PS_LIST_TAIL, "-simple", 0,            "use the simple output format", false);
    7162   
    7263    // -pendingexp
    7364    psMetadata *pendingexpArgs = psMetadataAlloc();
    74     psMetadataAddStr(pendingexpArgs, PS_LIST_TAIL, "-exp_name", 0,
    75             "define exposure ID", NULL);
    76     psMetadataAddStr(pendingexpArgs, PS_LIST_TAIL, "-inst", 0,
    77             "define camera ID", NULL);
    78     psMetadataAddStr(pendingexpArgs, PS_LIST_TAIL, "-telescope", 0,
    79             "define telescope ID", NULL);
    80     psMetadataAddStr(pendingexpArgs, PS_LIST_TAIL, "-exp_type", 0,
    81             "define exposure type", NULL);
    82     psMetadataAddBool(pendingexpArgs, PS_LIST_TAIL, "-desc", 0,
    83             "sort ouput in descending format", false);
    84     psMetadataAddU64(pendingexpArgs, PS_LIST_TAIL, "-limit",  0,
    85             "limit result set to N items", 0);
    86     psMetadataAddBool(pendingexpArgs, PS_LIST_TAIL, "-simple", 0,
    87             "use the simple output format", false);
     65    psMetadataAddStr(pendingexpArgs, PS_LIST_TAIL, "-exp_name", 0,            "define exposure ID", NULL);
     66    psMetadataAddStr(pendingexpArgs, PS_LIST_TAIL, "-inst", 0,            "define camera ID", NULL);
     67    psMetadataAddStr(pendingexpArgs, PS_LIST_TAIL, "-telescope", 0,            "define telescope ID", NULL);
     68    psMetadataAddStr(pendingexpArgs, PS_LIST_TAIL, "-exp_type", 0,            "define exposure type", NULL);
     69    psMetadataAddBool(pendingexpArgs, PS_LIST_TAIL, "-desc", 0,            "sort ouput in descending format", false);
     70    psMetadataAddU64(pendingexpArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
     71    psMetadataAddBool(pendingexpArgs, PS_LIST_TAIL, "-simple", 0,            "use the simple output format", false);
    8872
    8973    // -pendingimfile
    9074    psMetadata *pendingimfileArgs = psMetadataAlloc();
    91     psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-exp_name", 0,
    92             "define exposure ID", NULL);
    93     psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-inst", 0,
    94             "define camera ID", NULL);
    95     psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-telescope", 0,
    96             "define telescope ID", NULL);
    97     psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-exp_type", 0,
    98             "define exposure type", NULL);
    99     psMetadataAddBool(pendingimfileArgs, PS_LIST_TAIL, "-desc", 0,
    100             "sort ouput in descending format", false);
    101     psMetadataAddU64(pendingimfileArgs, PS_LIST_TAIL, "-limit",  0,
    102             "limit result set to N items", 0);
    103     psMetadataAddBool(pendingimfileArgs, PS_LIST_TAIL, "-simple", 0,
    104             "use the simple output format", false);
     75    psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-exp_name", 0,            "define exposure ID", NULL);
     76    psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-inst", 0,            "define camera ID", NULL);
     77    psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-telescope", 0,            "define telescope ID", NULL);
     78    psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-exp_type", 0,            "define exposure type", NULL);
     79    psMetadataAddBool(pendingimfileArgs, PS_LIST_TAIL, "-desc", 0,            "sort ouput in descending format", false);
     80    psMetadataAddU64(pendingimfileArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
     81    psMetadataAddBool(pendingimfileArgs, PS_LIST_TAIL, "-simple", 0,            "use the simple output format", false);
    10582
    10683    // -copydone
    10784    psMetadata *copydoneArgs = psMetadataAlloc();
    108     psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-exp_name", 0,
    109             "define exposure ID (required)", NULL);
    110     psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-inst", 0,
    111             "define camera ID (required)", NULL);
    112     psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-telescope", 0,
    113             "define telescope ID (required)", NULL);
    114     psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-class", 0,
    115             "define class", NULL);
    116     psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-class_id", 0,
    117             "define class_id", NULL);
    118     psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-uri", 0,
    119             "define storage uri", NULL);
    120     psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-workdir",  0,
    121         "define the \"default\" workdir for this exposure", NULL);
    122     psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-dvodb",  0,
    123         "define the dvodb for the next processing step", NULL);
    124     psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-tess_id",  0,
    125         "define the tess_id for the next processing step", NULL);
    126     psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-end_stage",  0,
    127         "define the end goal processing step", NULL);
    128     psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-label",  0,
    129         "define the label for the chip stage", NULL);
    130     psMetadataAddS16(copydoneArgs, PS_LIST_TAIL, "-code",  0,
    131             "set fault code", 0);
     85    psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-exp_name", 0,            "define exposure ID (required)", NULL);
     86    psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-inst", 0,            "define camera ID (required)", NULL);
     87    psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-telescope", 0,            "define telescope ID (required)", NULL);
     88    psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-class", 0,            "define class", NULL);
     89    psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-class_id", 0,            "define class_id", NULL);
     90    psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-uri", 0,            "define storage uri", NULL);
     91    psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-workdir",  0,        "define the \"default\" workdir for this exposure", NULL);
     92    psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-dvodb",  0,        "define the dvodb for the next processing step", NULL);
     93    psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-tess_id",  0,        "define the tess_id for the next processing step", NULL);
     94    psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-end_stage",  0,        "define the end goal processing step", NULL);
     95    psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-label",  0,        "define the label for the chip stage", NULL);
     96    psMetadataAddS16(copydoneArgs, PS_LIST_TAIL, "-code",  0,            "set fault code", 0);
    13297
    13398    // -copied
    13499    psMetadata *copiedArgs = psMetadataAlloc();
    135     psMetadataAddStr(copiedArgs, PS_LIST_TAIL, "-exp_name", 0,
    136             "define exposure ID", NULL);
    137     psMetadataAddStr(copiedArgs, PS_LIST_TAIL, "-inst", 0,
    138             "define camera ID", NULL);
    139     psMetadataAddStr(copiedArgs, PS_LIST_TAIL, "-telescope", 0,
    140             "define telescope ID", NULL);
    141     psMetadataAddStr(copiedArgs, PS_LIST_TAIL, "-class", 0,
    142             "define class", NULL);
    143     psMetadataAddStr(copiedArgs, PS_LIST_TAIL, "-class_id", 0,
    144             "define class_id", NULL);
    145     psMetadataAddBool(copiedArgs, PS_LIST_TAIL, "-faulted",  0,
    146             "only return imfiles with a fault status set", false);
    147     psMetadataAddU64(copiedArgs, PS_LIST_TAIL, "-limit",  0,
    148             "limit result set to N items", 0);
    149     psMetadataAddBool(copiedArgs, PS_LIST_TAIL, "-simple",  0,
    150             "use the simple output format", false);
     100    psMetadataAddStr(copiedArgs, PS_LIST_TAIL, "-exp_name", 0,            "define exposure ID", NULL);
     101    psMetadataAddStr(copiedArgs, PS_LIST_TAIL, "-inst", 0,            "define camera ID", NULL);
     102    psMetadataAddStr(copiedArgs, PS_LIST_TAIL, "-telescope", 0,            "define telescope ID", NULL);
     103    psMetadataAddStr(copiedArgs, PS_LIST_TAIL, "-class", 0,            "define class", NULL);
     104    psMetadataAddStr(copiedArgs, PS_LIST_TAIL, "-class_id", 0,            "define class_id", NULL);
     105    psMetadataAddBool(copiedArgs, PS_LIST_TAIL, "-faulted",  0,            "only return imfiles with a fault status set", false);
     106    psMetadataAddU64(copiedArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
     107    psMetadataAddBool(copiedArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
    151108
    152109    // -updatecopied
    153110    psMetadata *updatecopiedArgs = psMetadataAlloc();
    154     psMetadataAddStr(updatecopiedArgs, PS_LIST_TAIL, "-exp_name", 0,
    155             "define exposure ID (required)", NULL);
    156     psMetadataAddStr(updatecopiedArgs, PS_LIST_TAIL, "-inst", 0,
    157             "define camera ID (required)", NULL);
    158     psMetadataAddStr(updatecopiedArgs, PS_LIST_TAIL, "-telescope", 0,
    159             "define telescope ID (required)", NULL);
    160     psMetadataAddStr(updatecopiedArgs, PS_LIST_TAIL, "-class", 0,
    161             "define class", NULL);
    162     psMetadataAddStr(updatecopiedArgs, PS_LIST_TAIL, "-class_id", 0,
    163             "define class_id", NULL);
    164     psMetadataAddS16(updatecopiedArgs, PS_LIST_TAIL, "-code",  0,
    165             "search by fault code", 0);
     111    psMetadataAddStr(updatecopiedArgs, PS_LIST_TAIL, "-exp_name", 0,            "define exposure ID (required)", NULL);
     112    psMetadataAddStr(updatecopiedArgs, PS_LIST_TAIL, "-inst", 0,            "define camera ID (required)", NULL);
     113    psMetadataAddStr(updatecopiedArgs, PS_LIST_TAIL, "-telescope", 0,            "define telescope ID (required)", NULL);
     114    psMetadataAddStr(updatecopiedArgs, PS_LIST_TAIL, "-class", 0,            "define class", NULL);
     115    psMetadataAddStr(updatecopiedArgs, PS_LIST_TAIL, "-class_id", 0,            "define class_id", NULL);
     116    psMetadataAddS16(updatecopiedArgs, PS_LIST_TAIL, "-code",  0,            "search by fault code", 0);
    166117
    167118    // -revertcopied
    168119    psMetadata *revertcopiedArgs = psMetadataAlloc();
    169     psMetadataAddStr(revertcopiedArgs, PS_LIST_TAIL, "-exp_name", 0,
    170             "define exposure ID (required)", NULL);
    171     psMetadataAddStr(revertcopiedArgs, PS_LIST_TAIL, "-inst", 0,
    172             "define camera ID (required)", NULL);
    173     psMetadataAddStr(revertcopiedArgs, PS_LIST_TAIL, "-telescope", 0,
    174             "define telescope ID (required)", NULL);
    175     psMetadataAddStr(revertcopiedArgs, PS_LIST_TAIL, "-class", 0,
    176             "define class", NULL);
    177     psMetadataAddStr(revertcopiedArgs, PS_LIST_TAIL, "-class_id", 0,
    178             "define class_id", NULL);
    179     psMetadataAddS16(revertcopiedArgs, PS_LIST_TAIL, "-code",  0,
    180             "search by fault code", 0);
     120    psMetadataAddStr(revertcopiedArgs, PS_LIST_TAIL, "-exp_name", 0,            "define exposure ID (required)", NULL);
     121    psMetadataAddStr(revertcopiedArgs, PS_LIST_TAIL, "-inst", 0,            "define camera ID (required)", NULL);
     122    psMetadataAddStr(revertcopiedArgs, PS_LIST_TAIL, "-telescope", 0,            "define telescope ID (required)", NULL);
     123    psMetadataAddStr(revertcopiedArgs, PS_LIST_TAIL, "-class", 0,            "define class", NULL);
     124    psMetadataAddStr(revertcopiedArgs, PS_LIST_TAIL, "-class_id", 0,            "define class_id", NULL);
     125    psMetadataAddS16(revertcopiedArgs, PS_LIST_TAIL, "-code",  0,            "search by fault code", 0);
    181126
    182127    // -clearcommonfaults
    … …  
    185130    // -advance
    186131    psMetadata *advanceArgs = psMetadataAlloc();
    187     psMetadataAddStr(advanceArgs, PS_LIST_TAIL, "-workdir",  0,
    188         "define the \"default\" workdir for this exposure", NULL);
    189     psMetadataAddStr(advanceArgs, PS_LIST_TAIL, "-dvodb",  0,
    190         "define the dvodb for the next processing step", NULL);
    191     psMetadataAddStr(advanceArgs, PS_LIST_TAIL, "-tess_id",  0,
    192         "define the tess_id for the next processing step", NULL);
    193     psMetadataAddStr(advanceArgs, PS_LIST_TAIL, "-end_stage",  0,
    194         "define the end goal processing step", NULL);
    195     psMetadataAddStr(advanceArgs, PS_LIST_TAIL, "-label",  0,
    196         "define the label for the chip stage", NULL);
     132    psMetadataAddStr(advanceArgs, PS_LIST_TAIL, "-workdir",  0,        "define the \"default\" workdir for this exposure", NULL);
     133    psMetadataAddStr(advanceArgs, PS_LIST_TAIL, "-dvodb",  0,        "define the dvodb for the next processing step", NULL);
     134    psMetadataAddStr(advanceArgs, PS_LIST_TAIL, "-tess_id",  0,        "define the tess_id for the next processing step", NULL);
     135    psMetadataAddStr(advanceArgs, PS_LIST_TAIL, "-end_stage",  0,        "define the end goal processing step", NULL);
     136    psMetadataAddStr(advanceArgs, PS_LIST_TAIL, "-label",  0,        "define the label for the chip stage", NULL);
    197137
    198138    psMetadata *argSets = psMetadataAlloc();
    … …  
    222162    psFree(modes);
    223163
    224     // setup search criterion
    225 #define addWhereStr(name) \
    226 { \
    227     psString str = NULL; \
    228     bool status = false; \
    229     if ((str = psMetadataLookupStr(&status, config->args, "-" #name))) { \
    230         if (!psMetadataAddStr(config->where, PS_LIST_TAIL, #name, 0, "==", str)) {\
    231             psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \
    232             psFree(config); \
    233             return NULL; \
    234         } \
    235     } \
    236 }
    237 
    238     // generate SQL where clause
    239     config->where = psMetadataAlloc();
    240 
    241     addWhereStr(exp_name);
    242     addWhereStr(telescope);
    243     // convert '-inst' to 'camera'
    244     {
    245         psString str = NULL;
    246         bool status = false;
    247         if ((str = psMetadataLookupStr(&status, config->args, "-inst"))) {
    248             if (!psMetadataAddStr(config->where, PS_LIST_TAIL, "camera", 0, "==", str)) {
    249                 psError(PS_ERR_UNKNOWN, false, "failed to add item camera");
    250                 psFree(config);
    251                 return NULL;
    252             }
    253         }
    254     }
    255     addWhereStr(exp_type);
    256     addWhereStr(class);
    257     addWhereStr(class_id);
    258 
    259     if (config->where->list->n < 1) {
    260         psFree(config->where);
    261         config->where = NULL;
    262     }
    263 
    264164    // define Database handle, if used
    265165    // do this last so we don't setup a connection before CLI options are
Note: See TracChangeset for help on using the changeset viewer.