IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 6368


Ignore:
Timestamp:
Feb 7, 2006, 4:35:29 PM (20 years ago)
Author:
jhoblitt
Message:

remove arguments field from pxConfig

Location:
trunk/ippTools/src
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippTools/src/chiptoolConfig.c

    r6341 r6368  
    2323
    2424    // Parse other command-line arguments
    25     config->arguments = psMetadataAlloc(); // The arguments, with default values
     25    psMetadata *arguments = psMetadataAlloc(); // The arguments, with default values
    2626
    2727    int N;
    … …  
    6666   
    6767    // paul's argument parsing convention requires: -key value
    68     psMetadataAddBool(config->arguments, PS_LIST_TAIL, "-quick",   0, "examine raw image table, write ppImage output", false);
    69     psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-define",  0, "examine raw image table, add to pending image table", "");
    70     psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-pending", 0, "examine pending image table, write ppImage output", "");
    71 //    psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-update",  0, "update pending image table", "");
    72     psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-done",  0, "mov image from pending to done table", "");
    73 //    psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-time",    0, "define time range of interest", "");
    74     psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-inst",  0, "define camera of interest", "");
    75     psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-filter",  0, "define filter of interest", "");
    76     psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-exp_id",  0, "define exposure ID", "");
    77     psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-class",  0, "define class", "");
    78     psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-class_id",  0, "define class ID", "");
    79     psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-url",  0, "define URL", "");
     68    psMetadataAddBool(arguments, PS_LIST_TAIL, "-quick",   0, "examine raw image table, write ppImage output", false);
     69    psMetadataAddStr(arguments, PS_LIST_TAIL, "-define",  0, "examine raw image table, add to pending image table", "");
     70    psMetadataAddStr(arguments, PS_LIST_TAIL, "-pending", 0, "examine pending image table, write ppImage output", "");
     71//    psMetadataAddStr(arguments, PS_LIST_TAIL, "-update",  0, "update pending image table", "");
     72    psMetadataAddStr(arguments, PS_LIST_TAIL, "-done",  0, "mov image from pending to done table", "");
     73//    psMetadataAddStr(arguments, PS_LIST_TAIL, "-time",    0, "define time range of interest", "");
     74    psMetadataAddStr(arguments, PS_LIST_TAIL, "-inst",  0, "define camera of interest", "");
     75    psMetadataAddStr(arguments, PS_LIST_TAIL, "-filter",  0, "define filter of interest", "");
     76    psMetadataAddStr(arguments, PS_LIST_TAIL, "-exp_id",  0, "define exposure ID", "");
     77    psMetadataAddStr(arguments, PS_LIST_TAIL, "-class",  0, "define class", "");
     78    psMetadataAddStr(arguments, PS_LIST_TAIL, "-class_id",  0, "define class ID", "");
     79    psMetadataAddStr(arguments, PS_LIST_TAIL, "-url",  0, "define URL", "");
    8080
    8181    if (config->mode == PX_MODE_NONE) {
    8282        fprintf (stderr, "search mode not specified\n");
    83         psArgumentHelp(config->arguments);
    84         psFree(config->arguments);
     83        psArgumentHelp(arguments);
     84        psFree(arguments);
    8585        exit(EXIT_FAILURE);
    8686    }
    8787
    88     if (! psArgumentParse(config->arguments, &argc, argv) || argc != 1) {
     88    if (! psArgumentParse(arguments, &argc, argv) || argc != 1) {
    8989        printf("\nPan-STARRS Phase 2 Search Tool\n\n");
    9090        printf("Usage: %s [mode] [options]\n\n", argv[0]);
    9191        printf(" [mode] : -quick | -define | -pending | -donee\n\n");
    92         psArgumentHelp(config->arguments);
    93         psFree(config->arguments);
     92        psArgumentHelp(arguments);
     93        psFree(arguments);
    9494        exit(EXIT_FAILURE);
    9595    }
    9696
    9797    bool status;
    98     config->camera_name = psMetadataLookupStr(&status, config->arguments,
     98    config->camera_name = psMetadataLookupStr(&status, arguments,
    9999        "-inst");
    100     config->exp_id = psMetadataLookupStr(&status, config->arguments, "-exp_id");
    101     config->class = psMetadataLookupStr(&status, config->arguments, "-class");
    102     config->class_id = psMetadataLookupStr(&status, config->arguments,
     100    config->exp_id = psMetadataLookupStr(&status, arguments, "-exp_id");
     101    config->class = psMetadataLookupStr(&status, arguments, "-class");
     102    config->class_id = psMetadataLookupStr(&status, arguments,
    103103        "-class_id");
    104     config->url = psMetadataLookupStr(&status, config->arguments, "-url");
     104    config->url = psMetadataLookupStr(&status, arguments, "-url");
    105105
    106106    // XXX why is "" being returned when -[foo] isn't specified?
    … …  
    160160
    161161    // add the input and output images to the arguments list
    162     //psMetadataAddStr (config->arguments, PS_LIST_TAIL, "-output", 0, "Name of the output image", argv[1]);
     162    //psMetadataAddStr (arguments, PS_LIST_TAIL, "-output", 0, "Name of the output image", argv[1]);
    163163
    164164    // define Database handle, if used

  • trunk/ippTools/src/pxadminConfig.c

    r6341 r6368  
    1616
    1717    // Parse other command-line arguments
    18     config->arguments = psMetadataAlloc(); // The arguments, with default values
     18    psMetadata *arguments = psMetadataAlloc(); // The arguments, with default values
    1919
    2020    int N;
    … …  
    4343
    4444    // paul's argument parsing convention requires: -key value
    45     psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-create", 0,
     45    psMetadataAddStr(arguments, PS_LIST_TAIL, "-create", 0,
    4646            "create the P2 tables", "");
    47     psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-delete", 0,
     47    psMetadataAddStr(arguments, PS_LIST_TAIL, "-delete", 0,
    4848            "delete the P2 tables", "");
    49     psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-recreate", 0,
     49    psMetadataAddStr(arguments, PS_LIST_TAIL, "-recreate", 0,
    5050            "delete and recreate the P2 tables", "");
    5151
    5252    if (config->mode == PX_MODE_NONE) {
    5353        fprintf (stderr, "admin mode not specified\n");
    54         psArgumentHelp(config->arguments);
    55         psFree(config->arguments);
     54        psArgumentHelp(arguments);
     55        psFree(arguments);
    5656        exit(EXIT_FAILURE);
    5757    }
    5858
    5959    if ((N = psArgumentGet (argc, argv, "-help"))) {
    60         psArgumentHelp(config->arguments);
    61         psFree(config->arguments);
     60        psArgumentHelp(arguments);
     61        psFree(arguments);
    6262        exit(EXIT_FAILURE);
    6363    }
    6464
    65     if (! psArgumentParse(config->arguments, &argc, argv) || argc != 1) {
     65    if (! psArgumentParse(arguments, &argc, argv) || argc != 1) {
    6666        printf("\nPan-STARRS Phase 2 Admin Tool\n\n");
    6767        printf("Usage: %s [mode]\n", argv[0]);
    6868        printf(" [mode] : -create | -delete\n\n");
    69         psArgumentHelp(config->arguments);
    70         psFree(config->arguments);
     69        psArgumentHelp(arguments);
     70        psFree(arguments);
    7171        exit(EXIT_FAILURE);
    7272    }

  • trunk/ippTools/src/pxconfig.c

    r6341 r6368  
    1919    config->site            = NULL;
    2020    config->recipe          = NULL;
    21     config->arguments       = NULL;
    2221    config->exp_id          = NULL;
    2322    config->class           = NULL;
    … …  
    4039    psFree(config->site);
    4140    psFree(config->recipe);
    42     psFree(config->arguments);
    4341    psFree(config->exp_id);
    4442    psFree(config->class);

  • trunk/ippTools/src/regtoolConfig.c

    r6341 r6368  
    1212
    1313    // Parse other command-line arguments
    14     config->arguments = psMetadataAlloc(); // The arguments, with default values
     14    psMetadata *arguments = psMetadataAlloc(); // The arguments, with default values
    1515
    1616    int N;
    … …  
    3232   
    3333    // paul's argument parsing convention requires: -key value
    34     psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-pending", 0, "examine pending image table, write ppImage output", "");
    35     psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-update",  0, "update pending image table", "");
     34    psMetadataAddStr(arguments, PS_LIST_TAIL, "-pending", 0, "examine pending image table, write ppImage output", "");
     35    psMetadataAddStr(arguments, PS_LIST_TAIL, "-update",  0, "update pending image table", "");
    3636
    3737
    3838    // -pending search
    39     psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-exp_id",  0, "define exposure ID", "");
    40     psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-inst",  0, "define camera of interest", "");
    41     psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-telescope",  0, "define camera of interest", "");
    42     psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-exp_type",  0, "define class", "");
    43     psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-class",  0, "define class", "");
     39    psMetadataAddStr(arguments, PS_LIST_TAIL, "-exp_id",  0, "define exposure ID", "");
     40    psMetadataAddStr(arguments, PS_LIST_TAIL, "-inst",  0, "define camera of interest", "");
     41    psMetadataAddStr(arguments, PS_LIST_TAIL, "-telescope",  0, "define camera of interest", "");
     42    psMetadataAddStr(arguments, PS_LIST_TAIL, "-exp_type",  0, "define class", "");
     43    psMetadataAddStr(arguments, PS_LIST_TAIL, "-class",  0, "define class", "");
    4444
    4545    // -update inputs
    46 //    psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-exp_id",  0, "define class", "");
    47     psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-filter",  0, "define filter of interest", "");
    48     psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-stat",  0, "define URL", "");
    49     psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-recipe",  0, "define URL", "");
    50     psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-mosiac",  0, "define URL", "");
     46//    psMetadataAddStr(arguments, PS_LIST_TAIL, "-exp_id",  0, "define class", "");
     47    psMetadataAddStr(arguments, PS_LIST_TAIL, "-filter",  0, "define filter of interest", "");
     48    psMetadataAddStr(arguments, PS_LIST_TAIL, "-stat",  0, "define URL", "");
     49    psMetadataAddStr(arguments, PS_LIST_TAIL, "-recipe",  0, "define URL", "");
     50    psMetadataAddStr(arguments, PS_LIST_TAIL, "-mosiac",  0, "define URL", "");
    5151
    5252    if (config->mode == PX_MODE_NONE) {
    5353        fprintf (stderr, "search mode not specified\n");
    54         psArgumentHelp(config->arguments);
    55         psFree(config->arguments);
     54        psArgumentHelp(arguments);
     55        psFree(arguments);
    5656        exit(EXIT_FAILURE);
    5757    }
    5858
    59     if (! psArgumentParse(config->arguments, &argc, argv) || argc != 1) {
     59    if (! psArgumentParse(arguments, &argc, argv) || argc != 1) {
    6060        printf("\nPan-STARRS Phase 2 Search Tool\n\n");
    6161        printf("Usage: %s [mode] [options]\n\n", argv[0]);
    6262        printf(" [mode] : -quick | -define | -pending | -donee\n\n");
    63         psArgumentHelp(config->arguments);
    64         psFree(config->arguments);
     63        psArgumentHelp(arguments);
     64        psFree(arguments);
    6565        exit(EXIT_FAILURE);
    6666    }
    6767
    6868    bool status;
    69     config->camera_name = psMetadataLookupStr(&status, config->arguments,
     69    config->camera_name = psMetadataLookupStr(&status, arguments,
    7070        "-inst");
    71     config->filter = psMetadataLookupStr(&status, config->arguments, "-filter");
    72     config->exp_id = psMetadataLookupStr(&status, config->arguments, "-exp_id");
    73     config->class = psMetadataLookupStr(&status, config->arguments, "-class");
    74     config->class_id = psMetadataLookupStr(&status, config->arguments,
     71    config->filter = psMetadataLookupStr(&status, arguments, "-filter");
     72    config->exp_id = psMetadataLookupStr(&status, arguments, "-exp_id");
     73    config->class = psMetadataLookupStr(&status, arguments, "-class");
     74    config->class_id = psMetadataLookupStr(&status, arguments,
    7575        "-class_id");
    76     config->url = psMetadataLookupStr(&status, config->arguments, "-url");
     76    config->url = psMetadataLookupStr(&status, arguments, "-url");
    7777
    7878    // XXX why is "" being returned when -[foo] isn't specified?
    … …  
    133133
    134134    // add the input and output images to the arguments list
    135     //psMetadataAddStr (config->arguments, PS_LIST_TAIL, "-output", 0, "Name of the output image", argv[1]);
     135    //psMetadataAddStr (arguments, PS_LIST_TAIL, "-output", 0, "Name of the output image", argv[1]);
    136136
    137137    // define Database handle, if used
Note: See TracChangeset for help on using the changeset viewer.