IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 10704


Ignore:
Timestamp:
Dec 13, 2006, 4:14:10 PM (19 years ago)
Author:
jhoblitt
Message:

rename -definebyquery options: remove set_* and add select_ to search options

Location:
trunk/ippTools/src
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippTools/src/dettool.c

    r10697 r10704  
    545545    {
    546546        bool status = false;
    547         psString exp_type = psMetadataLookupStr(&status, config->args, "-exp_type");        if (!status) {
     547        psString exp_type = psMetadataLookupStr(&status, config->args, "-select_exp_type");        if (!status) {
    548548            psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -exp_type");
    549549            return false;
    … …  
    557557        }
    558558        // map -inst -> camera
    559         psString camera = psMetadataLookupStr(&status, config->args, "-inst");
     559        psString camera = psMetadataLookupStr(&status, config->args, "-select_inst");
    560560        if (!status) {
    561             psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -inst");
     561            psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -select_inst");
    562562            return false;
    563563        }
    … …  
    569569            }
    570570        }
    571         psString telescope = psMetadataLookupStr(&status, config->args, "-telescope");        if (!status) {
    572             psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -telescope");
     571        psString telescope = psMetadataLookupStr(&status, config->args, "-select_telescope");
     572        if (!status) {
     573            psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -select_telescope");
    573574            return false;
    574575        }
    … …  
    580581            }
    581582        }
    582         psString filter = psMetadataLookupStr(&status, config->args, "-filter");
     583        psString filter = psMetadataLookupStr(&status, config->args, "-select_filter");
    583584        if (!status) {
    584             psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -filter");
     585            psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -select_filter");
    585586            return false;
    586587        }
    … …  
    592593            }
    593594        }
    594         psString uri = psMetadataLookupStr(&status, config->args, "-uri");
     595        psString uri = psMetadataLookupStr(&status, config->args, "-select_uri");
    595596        if (!status) {
    596             psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -filter");
     597            psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -select_uri");
    597598            return false;
    598599        }
    … …  
    605606        }
    606607
    607         psString dateobs_begin = psMetadataLookupStr(&status, config->args, "-dateobs_begin");
     608        psString dateobs_begin = psMetadataLookupStr(&status, config->args, "-select_dateobs_begin");
    608609        if (!status) {
    609             psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -set_use_end");
     610            psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -select_dateobs_begin");
    610611            psFree(where);
    611612            return false;
    … …  
    614615            psTime *time = psTimeFromISO(dateobs_begin, PS_TIME_UTC);
    615616            if (!psMetadataAddTime(where, PS_LIST_TAIL, "dateobs", 0, ">=", time)) {
    616                 psError(PS_ERR_UNKNOWN, false, "failed to add item uri");
     617                psError(PS_ERR_UNKNOWN, false, "failed to add item dateobs");
    617618                psFree(time);
    618619                psFree(where);
    … …  
    622623        }
    623624
    624         psString dateobs_end = psMetadataLookupStr(&status, config->args, "-dateobs_end");
     625        psString dateobs_end = psMetadataLookupStr(&status, config->args, "-select_dateobs_end");
    625626        if (!status) {
    626             psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -set_use_end");
     627            psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -select_dateobs_end");
    627628            psFree(where);
    628629            return false;
    … …  
    631632            psTime *time = psTimeFromISO(dateobs_end, PS_TIME_UTC);
    632633            if (!psMetadataAddTime(where, PS_LIST_TAIL, "dateobs", 0, "<", time)) {
    633                 psError(PS_ERR_UNKNOWN, false, "failed to add item uri");
     634                psError(PS_ERR_UNKNOWN, false, "failed to add item dateobs");
    634635                psFree(time);
    635636                psFree(where);
    … …  
    662663    }
    663664
    664     psString exp_type = psMetadataLookupStr(&status, config->args, "-set_exp_type");
    665     if (!status) {
    666         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -set_exp_type");
    667         return false;
    668     }
    669 
    670     psString filter = psMetadataLookupStr(&status, config->args, "-set_filter");
    671     if (!status) {
    672         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -set_filter");
    673         return false;
    674     }
    675 
    676     psF32 airmass = psMetadataLookupF32(&status, config->args, "-set_airmass");
    677     if (!status) {
    678         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -set_airmass");
    679         return false;
    680     }
    681 
    682     psF32 exp_time = psMetadataLookupF32(&status, config->args, "-set_exp_time");
    683     if (!status) {
    684         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -set_exp_time");
    685         return false;
    686     }
    687 
    688     psF32 ccd_temp = psMetadataLookupF32(&status, config->args, "-set_ccd_temp");
    689     if (!status) {
    690         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -set_ccd_temp");
    691         return false;
    692     }
    693 
    694     psF64 posang = psMetadataLookupF32(&status, config->args, "-set_posang");
    695     if (!status) {
    696         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -set_posang");
    697         return false;
    698     }
    699 
    700     psString object = psMetadataLookupStr(&status, config->args, "-set_object");
    701     if (!status) {
    702         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -set_object");
     665    psString exp_type = psMetadataLookupStr(&status, config->args, "-exp_type");
     666    if (!status) {
     667        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -exp_type");
     668        return false;
     669    }
     670
     671    psString filter = psMetadataLookupStr(&status, config->args, "-filter");
     672    if (!status) {
     673        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -filter");
     674        return false;
     675    }
     676
     677    psF32 airmass = psMetadataLookupF32(&status, config->args, "-airmass");
     678    if (!status) {
     679        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -airmass");
     680        return false;
     681    }
     682
     683    psF32 exp_time = psMetadataLookupF32(&status, config->args, "-exp_time");
     684    if (!status) {
     685        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -exp_time");
     686        return false;
     687    }
     688
     689    psF32 ccd_temp = psMetadataLookupF32(&status, config->args, "-ccd_temp");
     690    if (!status) {
     691        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -ccd_temp");
     692        return false;
     693    }
     694
     695    psF64 posang = psMetadataLookupF32(&status, config->args, "-posang");
     696    if (!status) {
     697        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -posang");
     698        return false;
     699    }
     700
     701    psString object = psMetadataLookupStr(&status, config->args, "-object");
     702    if (!status) {
     703        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -object");
    703704        return false;
    704705    }
    705706    psTime *registered = NULL;
    706707    {
    707         psString registeredStr = psMetadataLookupStr(&status, config->args, "-set_registered");
     708        psString registeredStr = psMetadataLookupStr(&status, config->args, "-registered");
    708709        if (!status) {
    709             psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -set_registered");
     710            psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -registered");
    710711            return false;
    711712        }
    … …  
    720721    psTime *use_begin = NULL;
    721722    {
    722         psString use_beginStr = psMetadataLookupStr(&status, config->args, "-set_use_begin");
     723        psString use_beginStr = psMetadataLookupStr(&status, config->args, "-use_begin");
    723724        if (!status) {
    724             psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -set_use_begin");
     725            psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -use_begin");
    725726            return false;
    726727        }
    … …  
    735736    psTime *use_end = NULL;
    736737    {
    737         psString use_endStr = psMetadataLookupStr(&status, config->args, "-set_use_end");
     738        psString use_endStr = psMetadataLookupStr(&status, config->args, "-use_end");
    738739        if (!status) {
    739             psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -set_use_end");
     740            psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -use_end");
    740741            return false;
    741742        }

  • trunk/ippTools/src/dettoolConfig.c

    r10697 r10704  
    100100            "define the mode of this detrend run", "master");
    101101    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-exp_type",  0,
     102            "define exposure type", NULL);
     103    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-filter",  0,
     104            "define filter ", NULL);
     105    psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-airmass",  0,
     106            "define airmass", NAN);
     107    psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-exp_time",  0,
     108            "define exposure time", NAN);
     109    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-ccd_temp",  0,
     110            "define ccd tempature", NAN);
     111    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-posang",  0,
     112            "define rotator position angle", NAN);
     113    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-object",  0,
     114            "define exposure object", NULL);
     115    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-registered",  0,
     116            "time detrend run was registered", now);
     117    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-use_begin",  0,
     118            "start of detrend run applicable peroid", NULL);
     119    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-use_end",  0,
     120            "end of detrend run applicable peroid", NULL);
     121    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_exp_type",  0,
    102122            "search for exp_type", NULL);
    103     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-inst",  0,
     123    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_inst",  0,
    104124            "search for camera", NULL);
    105     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-telescope",  0,
     125    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_telescope",  0,
    106126            "search for telescope", NULL);
    107     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-filter",  0,
     127    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_filter",  0,
    108128            "search for filter", NULL);
    109     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-uri",  0,
     129    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_uri",  0,
    110130            "search for uri", NULL);
    111     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-dateobs_begin", 0,
    112             "define start (>=) of included exposure peroid", NULL);
    113     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-dateobs_end", 0,
    114             "define end (<) of included exposure peroid", NULL);
    115     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_exp_type",  0,
    116             "define exposure type", NULL);
    117     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_filter",  0,
    118             "define filter ", NULL);
    119     psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-set_airmass",  0,
    120             "define airmass", NAN);
    121     psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-set_exp_time",  0,
    122             "define exposure time", NAN);
    123     psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-set_ccd_temp",  0,
    124             "define ccd tempature", NAN);
    125     psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-set_posang",  0,
    126             "define rotator position angle", NAN);
    127     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_object",  0,
    128             "define exposure object", NULL);
    129     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_registered",  0,
    130             "time detrend run was registered", now);
    131     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_use_begin",  0,
    132             "start of detrend run applicable peroid", NULL);
    133     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_use_end",  0,
    134             "end of detrend run applicable peroid", NULL);
     131    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_dateobs_begin", 0,
     132            "search for exposures by time (>=)", NULL);
     133    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_dateobs_end", 0,
     134            "search for exposures by time (<)", NULL);
    135135    psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-pretend",  0,
    136136            "print the exposures that would be included in the detrend run and exit", false);
Note: See TracChangeset for help on using the changeset viewer.