IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Feb 28, 2007, 6:44:37 PM (19 years ago)
Author:
jhoblitt
Message:

rename all *_version fields to be *_id
change chip* tables to use a chip_id
change cam* tables to use a cam_id
change all *_id fields to be S64

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/ippTools/src/warptoolConfig.c

    r12029 r12131  
    6060    psMetadata *updaterunArgs = psMetadataAlloc();
    6161    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-warp_id", 0,
    62             "define warp ID (required)", NULL);
     62            "define warptool ID (required)", NULL);
    6363    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-state", 0,
    6464            "set state (required)", NULL);
     
    7373    psMetadata *addinputexpArgs = psMetadataAlloc();
    7474    psMetadataAddStr(addinputexpArgs, PS_LIST_TAIL, "-warp_id", 0,
    75             "define warp ID (required)", NULL);
    76     psMetadataAddStr(addinputexpArgs, PS_LIST_TAIL, "-exp_tag", 0,
    77             "define exposure tag (required)", NULL);
    78     psMetadataAddS32(addinputexpArgs, PS_LIST_TAIL, "-cam_version", 0,
    79             "define phase 3 version of exposure tag (required)", 0);
     75            "define warptool ID (required)", NULL);
     76    psMetadataAddStr(addinputexpArgs, PS_LIST_TAIL, "-cam_id", 0,
     77            "define camtool ID (required)", NULL);
    8078    psMetadataAddBool(addinputexpArgs, PS_LIST_TAIL, "-magiced",  0,
    8179            "has this exposure been magiced", false);
     
    8482    psMetadata *expArgs = psMetadataAlloc();
    8583    psMetadataAddStr(expArgs, PS_LIST_TAIL, "-warp_id", 0,
    86             "define warp ID (required)", NULL);
    87     psMetadataAddStr(expArgs, PS_LIST_TAIL, "-exp_tag", 0,
    88             "define exposure tag (required)", NULL);
    89     psMetadataAddS32(expArgs, PS_LIST_TAIL, "-cam_version", 0,
    90             "define phase 3 version of exposure tag (required)", 0);
     84            "search by warptool ID", NULL);
     85    psMetadataAddStr(expArgs, PS_LIST_TAIL, "-cam_id", 0,
     86            "search by camtool ID", NULL);
    9187    psMetadataAddU64(expArgs, PS_LIST_TAIL, "-limit",  0,
    9288            "limit result set to N items", 0);
     
    9793    psMetadata *imfileArgs = psMetadataAlloc();
    9894    psMetadataAddStr(imfileArgs, PS_LIST_TAIL, "-warp_id", 0,
    99             "define warp ID (required)", NULL);
    100     psMetadataAddStr(imfileArgs, PS_LIST_TAIL, "-exp_tag", 0,
    101             "define exposure tag (required)", NULL);
    102     psMetadataAddS32(imfileArgs, PS_LIST_TAIL, "-cam_version", 0,
    103             "define phase 3 version of exposure tag (required)", 0);
     95            "search by warptool ID", NULL);
     96    psMetadataAddStr(imfileArgs, PS_LIST_TAIL, "-cam_id", 0,
     97            "search by camtool ID", NULL);
    10498    psMetadataAddU64(imfileArgs, PS_LIST_TAIL, "-limit",  0,
    10599            "limit result set to N items", 0);
     
    119113    psMetadata *addoverlapArgs = psMetadataAlloc();
    120114    psMetadataAddStr(addoverlapArgs, PS_LIST_TAIL, "-mapfile", 0,
    121             "skycell <-> imfile mapping description", NULL);
     115            "path to skycell <-> imfile mapping file", NULL);
    122116
    123117    // -scmap
    124118    psMetadata *scmapArgs = psMetadataAlloc();
    125119    psMetadataAddStr(scmapArgs, PS_LIST_TAIL, "-warp_id", 0,
    126             "search by warp ID", NULL);
     120            "search by warptool ID", NULL);
    127121    psMetadataAddStr(scmapArgs, PS_LIST_TAIL, "-skycell_id", 0,
    128122            "searcy by skycell ID", NULL);
     
    137131    psMetadata *towarpedArgs = psMetadataAlloc();
    138132    psMetadataAddStr(towarpedArgs, PS_LIST_TAIL, "-warp_id", 0,
    139             "search by warp ID", NULL);
     133            "search by warptool ID", NULL);
    140134    psMetadataAddU64(towarpedArgs, PS_LIST_TAIL, "-limit",  0,
    141135            "limit result set to N items", 0);
     
    146140    psMetadata *addwarpedArgs = psMetadataAlloc();
    147141    psMetadataAddStr(addwarpedArgs, PS_LIST_TAIL, "-warp_id", 0,
    148             "define warp ID (required)", NULL);
     142            "define warptool ID (required)", NULL);
    149143    psMetadataAddStr(addwarpedArgs, PS_LIST_TAIL, "-skycell_id",  0,
    150144            "define skycell ID (required)", NULL);
     
    161155    psMetadata *warpedArgs = psMetadataAlloc();
    162156    psMetadataAddStr(warpedArgs, PS_LIST_TAIL, "-warp_id", 0,
    163             "search by warp ID", NULL);
     157            "search by warptool ID", NULL);
    164158    psMetadataAddStr(warpedArgs, PS_LIST_TAIL, "-skycell_id",  0,
    165159            "define skycell ID (required)", NULL);
     
    168162    psMetadataAddStr(warpedArgs, PS_LIST_TAIL, "-exp_tag", 0,
    169163            "define exposure tag (required)", NULL);
    170     psMetadataAddS32(warpedArgs, PS_LIST_TAIL, "-cam_version", 0,
    171             "define phase 3 version of exposure tag (required)", 0);
     164    psMetadataAddStr(warpedArgs, PS_LIST_TAIL, "-cam_id", 0,
     165            "define phase 3 version of exposure tag (required)", NULL);
    172166    psMetadataAddU64(warpedArgs, PS_LIST_TAIL, "-limit",  0,
    173167            "limit result set to N items", 0);
     
    286280    bool status = false;
    287281    if ((str = psMetadataLookupStr(&status, config->args, "-warp_id"))) {
    288         if (!psMetadataAddS32(config->where, PS_LIST_TAIL, "warp_id", 0, "==", (psS32)atoi(str))) {
     282        if (!psMetadataAddS64(config->where, PS_LIST_TAIL, "warp_id", 0, "==", (psS64)atoll(str))) {
    289283            psError(PS_ERR_UNKNOWN, false, "failed to add item warp_id");
    290284            psFree(config);
Note: See TracChangeset for help on using the changeset viewer.