IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 9242


Ignore:
Timestamp:
Oct 4, 2006, 1:17:06 PM (20 years ago)
Author:
jhoblitt
Message:

VERSION 0.0.46

Location:
trunk/ippdb
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippdb/configure.ac

    r9229 r9242  
    77AC_PREREQ(2.59)
    88
    9 AC_INIT([ippdb], [0.0.45], [pan-starrs.ifa.hawaii.edu])
     9AC_INIT([ippdb], [0.0.46], [pan-starrs.ifa.hawaii.edu])
    1010AC_CONFIG_SRCDIR([ippdb.pc.in])
    1111

  • trunk/ippdb/src/ippdb.c

    r9229 r9242  
    71947194static void rawDetrendExpRowFree(rawDetrendExpRow *object);
    71957195
    7196 rawDetrendExpRow *rawDetrendExpRowAlloc(const char *exp_tag, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, const char *obstype)
     7196rawDetrendExpRow *rawDetrendExpRowAlloc(const char *exp_tag, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, const char *object)
    71977197{
    71987198    rawDetrendExpRow *object;
    … …  
    72187218    object->ccd_temp = ccd_temp;
    72197219    object->posang = posang;
    7220     object->obstype = psStringCopy(obstype);
     7220    object->object = psStringCopy(object);
    72217221
    72227222    return object;
    … …  
    72307230    psFree(object->exp_type);
    72317231    psFree(object->filter);
    7232     psFree(object->obstype);
     7232    psFree(object->object);
    72337233}
    72347234
    … …  
    73297329        return false;
    73307330    }
    7331     if (!psMetadataAddStr(md, PS_LIST_TAIL, "obstype", 0, NULL, "64")) {
    7332         psError(PS_ERR_UNKNOWN, false, "failed to add item obstype");
     7331    if (!psMetadataAddStr(md, PS_LIST_TAIL, "object", 0, NULL, "64")) {
     7332        psError(PS_ERR_UNKNOWN, false, "failed to add item object");
    73337333        psFree(md);
    73347334        return false;
    … …  
    73477347}
    73487348
    7349 bool rawDetrendExpInsert(psDB * dbh, const char *exp_tag, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, const char *obstype)
     7349bool rawDetrendExpInsert(psDB * dbh, const char *exp_tag, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, const char *object)
    73507350{
    73517351    psMetadata      *md;
    … …  
    74387438        return false;
    74397439    }
    7440     if (!psMetadataAddStr(md, PS_LIST_TAIL, "obstype", 0, NULL, obstype)) {
    7441         psError(PS_ERR_UNKNOWN, false, "failed to add item obstype");
     7440    if (!psMetadataAddStr(md, PS_LIST_TAIL, "object", 0, NULL, object)) {
     7441        psError(PS_ERR_UNKNOWN, false, "failed to add item object");
    74427442        psFree(md);
    74437443        return false;
    … …  
    74647464    return deleted;
    74657465}
    7466 bool rawDetrendExpPop(psDB *dbh, char **exp_tag, char **camera, char **telescope, char **exp_type, psS32 *imfiles, char **filter, psF32 *airmass, psF64 *ra, psF64 *decl, psF32 *exp_time, psF64 *bg, psF64 *bg_stdev, psF64 *bg_mean_stdev, psF64 *alt, psF64 *az, psF32 *ccd_temp, psF64 *posang, char **obstype)
     7466bool rawDetrendExpPop(psDB *dbh, char **exp_tag, char **camera, char **telescope, char **exp_type, psS32 *imfiles, char **filter, psF32 *airmass, psF64 *ra, psF64 *decl, psF32 *exp_time, psF64 *bg, psF64 *bg_stdev, psF64 *bg_mean_stdev, psF64 *alt, psF64 *az, psF32 *ccd_temp, psF64 *posang, char **object)
    74677467{
    74687468    psArray         *rowSet;
    … …  
    76107610        return false;
    76117611    }
    7612     *obstype = psMetadataLookupPtr(&status, row, "obstype");
    7613     if (!status) {
    7614         psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item obstype");
     7612    *object = psMetadataLookupPtr(&status, row, "object");
     7613    if (!status) {
     7614        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item object");
    76157615        psFree(row);
    76167616        return false;
    … …  
    76247624bool rawDetrendExpInsertObject(psDB *dbh, rawDetrendExpRow *object)
    76257625{
    7626     return rawDetrendExpInsert(dbh, object->exp_tag, object->camera, object->telescope, object->exp_type, object->imfiles, object->filter, object->airmass, object->ra, object->decl, object->exp_time, object->bg, object->bg_stdev, object->bg_mean_stdev, object->alt, object->az, object->ccd_temp, object->posang, object->obstype);
     7626    return rawDetrendExpInsert(dbh, object->exp_tag, object->camera, object->telescope, object->exp_type, object->imfiles, object->filter, object->airmass, object->ra, object->decl, object->exp_time, object->bg, object->bg_stdev, object->bg_mean_stdev, object->alt, object->az, object->ccd_temp, object->posang, object->object);
    76277627}
    76287628
    … …  
    76577657    psF32           ccd_temp;
    76587658    psF64           posang;
    7659     char            obstype[256];
    7660 
    7661     if (!rawDetrendExpPop(dbh, (char **)&exp_tag, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, &airmass, &ra, &decl, &exp_time, &bg, &bg_stdev, &bg_mean_stdev, &alt, &az, &ccd_temp, &posang, (char **)&obstype)) {
     7659    char            object[256];
     7660
     7661    if (!rawDetrendExpPop(dbh, (char **)&exp_tag, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, &airmass, &ra, &decl, &exp_time, &bg, &bg_stdev, &bg_mean_stdev, &alt, &az, &ccd_temp, &posang, (char **)&object)) {
    76627662        psError(PS_ERR_UNKNOWN, false, "failed to pop a database row");
    76637663        return NULL;
    76647664    }
    76657665
    7666     return rawDetrendExpRowAlloc(exp_tag, camera, telescope, exp_type, imfiles, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang, obstype);
     7666    return rawDetrendExpRowAlloc(exp_tag, camera, telescope, exp_type, imfiles, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang, object);
    76677667}
    76687668
    … …  
    78487848        return NULL;
    78497849    }
    7850     if (!psMetadataAddStr(md, PS_LIST_TAIL, "obstype", 0, NULL, object->obstype)) {
    7851         psError(PS_ERR_UNKNOWN, false, "failed to add item obstype");
     7850    if (!psMetadataAddStr(md, PS_LIST_TAIL, "object", 0, NULL, object->object)) {
     7851        psError(PS_ERR_UNKNOWN, false, "failed to add item object");
    78527852        psFree(md);
    78537853        return NULL;
    … …  
    78777877    psF32           ccd_temp;
    78787878    psF64           posang;
    7879     char            *obstype;
     7879    char            *object;
    78807880
    78817881    exp_tag = psMetadataLookupPtr(&status, md, "exp_tag");
    … …  
    79647964        return false;
    79657965    }
    7966     obstype = psMetadataLookupPtr(&status, md, "obstype");
    7967     if (!status) {
    7968         psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item obstype");
    7969         return false;
    7970     }
    7971 
    7972     return rawDetrendExpRowAlloc(exp_tag, camera, telescope, exp_type, imfiles, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang, obstype);
     7966    object = psMetadataLookupPtr(&status, md, "object");
     7967    if (!status) {
     7968        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item object");
     7969        return false;
     7970    }
     7971
     7972    return rawDetrendExpRowAlloc(exp_tag, camera, telescope, exp_type, imfiles, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang, object);
    79737973}
    79747974psArray *rawDetrendExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)
    … …  
    80778077static void rawScienceExpRowFree(rawScienceExpRow *object);
    80788078
    8079 rawScienceExpRow *rawScienceExpRowAlloc(const char *exp_tag, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, const char *obstype)
     8079rawScienceExpRow *rawScienceExpRowAlloc(const char *exp_tag, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, const char *object)
    80808080{
    80818081    rawScienceExpRow *object;
    … …  
    81018101    object->ccd_temp = ccd_temp;
    81028102    object->posang = posang;
    8103     object->obstype = psStringCopy(obstype);
     8103    object->object = psStringCopy(object);
    81048104
    81058105    return object;
    … …  
    81138113    psFree(object->exp_type);
    81148114    psFree(object->filter);
    8115     psFree(object->obstype);
     8115    psFree(object->object);
    81168116}
    81178117
    … …  
    82128212        return false;
    82138213    }
    8214     if (!psMetadataAddStr(md, PS_LIST_TAIL, "obstype", 0, NULL, "64")) {
    8215         psError(PS_ERR_UNKNOWN, false, "failed to add item obstype");
     8214    if (!psMetadataAddStr(md, PS_LIST_TAIL, "object", 0, NULL, "64")) {
     8215        psError(PS_ERR_UNKNOWN, false, "failed to add item object");
    82168216        psFree(md);
    82178217        return false;
    … …  
    82308230}
    82318231
    8232 bool rawScienceExpInsert(psDB * dbh, const char *exp_tag, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, const char *obstype)
     8232bool rawScienceExpInsert(psDB * dbh, const char *exp_tag, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, const char *object)
    82338233{
    82348234    psMetadata      *md;
    … …  
    83218321        return false;
    83228322    }
    8323     if (!psMetadataAddStr(md, PS_LIST_TAIL, "obstype", 0, NULL, obstype)) {
    8324         psError(PS_ERR_UNKNOWN, false, "failed to add item obstype");
     8323    if (!psMetadataAddStr(md, PS_LIST_TAIL, "object", 0, NULL, object)) {
     8324        psError(PS_ERR_UNKNOWN, false, "failed to add item object");
    83258325        psFree(md);
    83268326        return false;
    … …  
    83478347    return deleted;
    83488348}
    8349 bool rawScienceExpPop(psDB *dbh, char **exp_tag, char **camera, char **telescope, char **exp_type, psS32 *imfiles, char **filter, psF32 *airmass, psF64 *ra, psF64 *decl, psF32 *exp_time, psF64 *bg, psF64 *bg_stdev, psF64 *bg_mean_stdev, psF64 *alt, psF64 *az, psF32 *ccd_temp, psF64 *posang, char **obstype)
     8349bool rawScienceExpPop(psDB *dbh, char **exp_tag, char **camera, char **telescope, char **exp_type, psS32 *imfiles, char **filter, psF32 *airmass, psF64 *ra, psF64 *decl, psF32 *exp_time, psF64 *bg, psF64 *bg_stdev, psF64 *bg_mean_stdev, psF64 *alt, psF64 *az, psF32 *ccd_temp, psF64 *posang, char **object)
    83508350{
    83518351    psArray         *rowSet;
    … …  
    84938493        return false;
    84948494    }
    8495     *obstype = psMetadataLookupPtr(&status, row, "obstype");
    8496     if (!status) {
    8497         psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item obstype");
     8495    *object = psMetadataLookupPtr(&status, row, "object");
     8496    if (!status) {
     8497        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item object");
    84988498        psFree(row);
    84998499        return false;
    … …  
    85078507bool rawScienceExpInsertObject(psDB *dbh, rawScienceExpRow *object)
    85088508{
    8509     return rawScienceExpInsert(dbh, object->exp_tag, object->camera, object->telescope, object->exp_type, object->imfiles, object->filter, object->airmass, object->ra, object->decl, object->exp_time, object->bg, object->bg_stdev, object->bg_mean_stdev, object->alt, object->az, object->ccd_temp, object->posang, object->obstype);
     8509    return rawScienceExpInsert(dbh, object->exp_tag, object->camera, object->telescope, object->exp_type, object->imfiles, object->filter, object->airmass, object->ra, object->decl, object->exp_time, object->bg, object->bg_stdev, object->bg_mean_stdev, object->alt, object->az, object->ccd_temp, object->posang, object->object);
    85108510}
    85118511
    … …  
    85408540    psF32           ccd_temp;
    85418541    psF64           posang;
    8542     char            obstype[256];
    8543 
    8544     if (!rawScienceExpPop(dbh, (char **)&exp_tag, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, &airmass, &ra, &decl, &exp_time, &bg, &bg_stdev, &bg_mean_stdev, &alt, &az, &ccd_temp, &posang, (char **)&obstype)) {
     8542    char            object[256];
     8543
     8544    if (!rawScienceExpPop(dbh, (char **)&exp_tag, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, &airmass, &ra, &decl, &exp_time, &bg, &bg_stdev, &bg_mean_stdev, &alt, &az, &ccd_temp, &posang, (char **)&object)) {
    85458545        psError(PS_ERR_UNKNOWN, false, "failed to pop a database row");
    85468546        return NULL;
    85478547    }
    85488548
    8549     return rawScienceExpRowAlloc(exp_tag, camera, telescope, exp_type, imfiles, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang, obstype);
     8549    return rawScienceExpRowAlloc(exp_tag, camera, telescope, exp_type, imfiles, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang, object);
    85508550}
    85518551
    … …  
    87318731        return NULL;
    87328732    }
    8733     if (!psMetadataAddStr(md, PS_LIST_TAIL, "obstype", 0, NULL, object->obstype)) {
    8734         psError(PS_ERR_UNKNOWN, false, "failed to add item obstype");
     8733    if (!psMetadataAddStr(md, PS_LIST_TAIL, "object", 0, NULL, object->object)) {
     8734        psError(PS_ERR_UNKNOWN, false, "failed to add item object");
    87358735        psFree(md);
    87368736        return NULL;
    … …  
    87608760    psF32           ccd_temp;
    87618761    psF64           posang;
    8762     char            *obstype;
     8762    char            *object;
    87638763
    87648764    exp_tag = psMetadataLookupPtr(&status, md, "exp_tag");
    … …  
    88478847        return false;
    88488848    }
    8849     obstype = psMetadataLookupPtr(&status, md, "obstype");
    8850     if (!status) {
    8851         psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item obstype");
    8852         return false;
    8853     }
    8854 
    8855     return rawScienceExpRowAlloc(exp_tag, camera, telescope, exp_type, imfiles, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang, obstype);
     8849    object = psMetadataLookupPtr(&status, md, "object");
     8850    if (!status) {
     8851        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item object");
     8852        return false;
     8853    }
     8854
     8855    return rawScienceExpRowAlloc(exp_tag, camera, telescope, exp_type, imfiles, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang, object);
    88568856}
    88578857psArray *rawScienceExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)
    … …  
    89608960static void rawImfileRowFree(rawImfileRow *object);
    89618961
    8962 rawImfileRow *rawImfileRowAlloc(const char *exp_tag, const char *class, const char *class_id, const char *uri, const char *exp_type, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, const char *obstype)
     8962rawImfileRow *rawImfileRowAlloc(const char *exp_tag, const char *class, const char *class_id, const char *uri, const char *exp_type, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, const char *object)
    89638963{
    89648964    rawImfileRow    *object;
    … …  
    89848984    object->ccd_temp = ccd_temp;
    89858985    object->posang = posang;
    8986     object->obstype = psStringCopy(obstype);
     8986    object->object = psStringCopy(object);
    89878987
    89888988    return object;
    … …  
    89978997    psFree(object->exp_type);
    89988998    psFree(object->filter);
    8999     psFree(object->obstype);
     8999    psFree(object->object);
    90009000}
    90019001
    … …  
    90969096        return false;
    90979097    }
    9098     if (!psMetadataAddStr(md, PS_LIST_TAIL, "obstype", 0, NULL, "64")) {
    9099         psError(PS_ERR_UNKNOWN, false, "failed to add item obstype");
     9098    if (!psMetadataAddStr(md, PS_LIST_TAIL, "object", 0, NULL, "64")) {
     9099        psError(PS_ERR_UNKNOWN, false, "failed to add item object");
    91009100        psFree(md);
    91019101        return false;
    … …  
    91149114}
    91159115
    9116 bool rawImfileInsert(psDB * dbh, const char *exp_tag, const char *class, const char *class_id, const char *uri, const char *exp_type, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, const char *obstype)
     9116bool rawImfileInsert(psDB * dbh, const char *exp_tag, const char *class, const char *class_id, const char *uri, const char *exp_type, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, const char *object)
    91179117{
    91189118    psMetadata      *md;
    … …  
    92059205        return false;
    92069206    }
    9207     if (!psMetadataAddStr(md, PS_LIST_TAIL, "obstype", 0, NULL, obstype)) {
    9208         psError(PS_ERR_UNKNOWN, false, "failed to add item obstype");
     9207    if (!psMetadataAddStr(md, PS_LIST_TAIL, "object", 0, NULL, object)) {
     9208        psError(PS_ERR_UNKNOWN, false, "failed to add item object");
    92099209        psFree(md);
    92109210        return false;
    … …  
    92319231    return deleted;
    92329232}
    9233 bool rawImfilePop(psDB *dbh, char **exp_tag, char **class, char **class_id, char **uri, char **exp_type, char **filter, psF32 *airmass, psF64 *ra, psF64 *decl, psF32 *exp_time, psF64 *bg, psF64 *bg_stdev, psF64 *bg_mean_stdev, psF64 *alt, psF64 *az, psF32 *ccd_temp, psF64 *posang, char **obstype)
     9233bool rawImfilePop(psDB *dbh, char **exp_tag, char **class, char **class_id, char **uri, char **exp_type, char **filter, psF32 *airmass, psF64 *ra, psF64 *decl, psF32 *exp_time, psF64 *bg, psF64 *bg_stdev, psF64 *bg_mean_stdev, psF64 *alt, psF64 *az, psF32 *ccd_temp, psF64 *posang, char **object)
    92349234{
    92359235    psArray         *rowSet;
    … …  
    93779377        return false;
    93789378    }
    9379     *obstype = psMetadataLookupPtr(&status, row, "obstype");
    9380     if (!status) {
    9381         psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item obstype");
     9379    *object = psMetadataLookupPtr(&status, row, "object");
     9380    if (!status) {
     9381        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item object");
    93829382        psFree(row);
    93839383        return false;
    … …  
    93919391bool rawImfileInsertObject(psDB *dbh, rawImfileRow *object)
    93929392{
    9393     return rawImfileInsert(dbh, object->exp_tag, object->class, object->class_id, object->uri, object->exp_type, object->filter, object->airmass, object->ra, object->decl, object->exp_time, object->bg, object->bg_stdev, object->bg_mean_stdev, object->alt, object->az, object->ccd_temp, object->posang, object->obstype);
     9393    return rawImfileInsert(dbh, object->exp_tag, object->class, object->class_id, object->uri, object->exp_type, object->filter, object->airmass, object->ra, object->decl, object->exp_time, object->bg, object->bg_stdev, object->bg_mean_stdev, object->alt, object->az, object->ccd_temp, object->posang, object->object);
    93949394}
    93959395
    … …  
    94249424    psF32           ccd_temp;
    94259425    psF64           posang;
    9426     char            obstype[256];
    9427 
    9428     if (!rawImfilePop(dbh, (char **)&exp_tag, (char **)&class, (char **)&class_id, (char **)&uri, (char **)&exp_type, (char **)&filter, &airmass, &ra, &decl, &exp_time, &bg, &bg_stdev, &bg_mean_stdev, &alt, &az, &ccd_temp, &posang, (char **)&obstype)) {
     9426    char            object[256];
     9427
     9428    if (!rawImfilePop(dbh, (char **)&exp_tag, (char **)&class, (char **)&class_id, (char **)&uri, (char **)&exp_type, (char **)&filter, &airmass, &ra, &decl, &exp_time, &bg, &bg_stdev, &bg_mean_stdev, &alt, &az, &ccd_temp, &posang, (char **)&object)) {
    94299429        psError(PS_ERR_UNKNOWN, false, "failed to pop a database row");
    94309430        return NULL;
    94319431    }
    94329432
    9433     return rawImfileRowAlloc(exp_tag, class, class_id, uri, exp_type, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang, obstype);
     9433    return rawImfileRowAlloc(exp_tag, class, class_id, uri, exp_type, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang, object);
    94349434}
    94359435
    … …  
    96159615        return NULL;
    96169616    }
    9617     if (!psMetadataAddStr(md, PS_LIST_TAIL, "obstype", 0, NULL, object->obstype)) {
    9618         psError(PS_ERR_UNKNOWN, false, "failed to add item obstype");
     9617    if (!psMetadataAddStr(md, PS_LIST_TAIL, "object", 0, NULL, object->object)) {
     9618        psError(PS_ERR_UNKNOWN, false, "failed to add item object");
    96199619        psFree(md);
    96209620        return NULL;
    … …  
    96449644    psF32           ccd_temp;
    96459645    psF64           posang;
    9646     char            *obstype;
     9646    char            *object;
    96479647
    96489648    exp_tag = psMetadataLookupPtr(&status, md, "exp_tag");
    … …  
    97319731        return false;
    97329732    }
    9733     obstype = psMetadataLookupPtr(&status, md, "obstype");
    9734     if (!status) {
    9735         psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item obstype");
    9736         return false;
    9737     }
    9738 
    9739     return rawImfileRowAlloc(exp_tag, class, class_id, uri, exp_type, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang, obstype);
     9733    object = psMetadataLookupPtr(&status, md, "object");
     9734    if (!status) {
     9735        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item object");
     9736        return false;
     9737    }
     9738
     9739    return rawImfileRowAlloc(exp_tag, class, class_id, uri, exp_type, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang, object);
    97409740}
    97419741psArray *rawImfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)

  • trunk/ippdb/src/ippdb.h

    r9229 r9242  
    31873187    psF32           ccd_temp;
    31883188    psF64           posang;
    3189     char            *obstype;
     3189    char            *object;
    31903190} rawDetrendExpRow;
    31913191
    … …  
    32133213    psF32           ccd_temp,
    32143214    psF64           posang,
    3215     const char      *obstype
     3215    const char      *object
    32163216);
    32173217
    … …  
    32603260    psF32           ccd_temp,
    32613261    psF64           posang,
    3262     const char      *obstype
     3262    const char      *object
    32633263);
    32643264
    … …  
    32983298    psF32           *ccd_temp,
    32993299    psF64           *posang,
    3300     char            **obstype
     3300    char            **object
    33013301);
    33023302
    … …  
    34703470    psF32           ccd_temp;
    34713471    psF64           posang;
    3472     char            *obstype;
     3472    char            *object;
    34733473} rawScienceExpRow;
    34743474
    … …  
    34963496    psF32           ccd_temp,
    34973497    psF64           posang,
    3498     const char      *obstype
     3498    const char      *object
    34993499);
    35003500
    … …  
    35433543    psF32           ccd_temp,
    35443544    psF64           posang,
    3545     const char      *obstype
     3545    const char      *object
    35463546);
    35473547
    … …  
    35813581    psF32           *ccd_temp,
    35823582    psF64           *posang,
    3583     char            **obstype
     3583    char            **object
    35843584);
    35853585
    … …  
    37533753    psF32           ccd_temp;
    37543754    psF64           posang;
    3755     char            *obstype;
     3755    char            *object;
    37563756} rawImfileRow;
    37573757
    … …  
    37793779    psF32           ccd_temp,
    37803780    psF64           posang,
    3781     const char      *obstype
     3781    const char      *object
    37823782);
    37833783
    … …  
    38263826    psF32           ccd_temp,
    38273827    psF64           posang,
    3828     const char      *obstype
     3828    const char      *object
    38293829);
    38303830
    … …  
    38643864    psF32           *ccd_temp,
    38653865    psF64           *posang,
    3866     char            **obstype
     3866    char            **object
    38673867);
    38683868

  • trunk/ippdb/tests/alloc.c

    r9229 r9242  
    570570            exit(EXIT_FAILURE);
    571571        }
    572         if (strncmp(object->obstype, "a string", MAX_STRING_LENGTH)) {
     572        if (strncmp(object->object, "a string", MAX_STRING_LENGTH)) {
    573573            psFree(object);
    574574            exit(EXIT_FAILURE);
    … …  
    655655            exit(EXIT_FAILURE);
    656656        }
    657         if (strncmp(object->obstype, "a string", MAX_STRING_LENGTH)) {
     657        if (strncmp(object->object, "a string", MAX_STRING_LENGTH)) {
    658658            psFree(object);
    659659            exit(EXIT_FAILURE);
    … …  
    740740            exit(EXIT_FAILURE);
    741741        }
    742         if (strncmp(object->obstype, "a string", MAX_STRING_LENGTH)) {
     742        if (strncmp(object->object, "a string", MAX_STRING_LENGTH)) {
    743743            psFree(object);
    744744            exit(EXIT_FAILURE);

  • trunk/ippdb/tests/metadatafromobject.c

    r9229 r9242  
    682682            exit(EXIT_FAILURE);
    683683        }
    684         if (strncmp(psMetadataLookupPtr(&status, md, "obstype"), "a string", MAX_STRING_LENGTH)) {
     684        if (strncmp(psMetadataLookupPtr(&status, md, "object"), "a string", MAX_STRING_LENGTH)) {
    685685            psFree(md);
    686686            exit(EXIT_FAILURE);
    … …  
    775775            exit(EXIT_FAILURE);
    776776        }
    777         if (strncmp(psMetadataLookupPtr(&status, md, "obstype"), "a string", MAX_STRING_LENGTH)) {
     777        if (strncmp(psMetadataLookupPtr(&status, md, "object"), "a string", MAX_STRING_LENGTH)) {
    778778            psFree(md);
    779779            exit(EXIT_FAILURE);
    … …  
    868868            exit(EXIT_FAILURE);
    869869        }
    870         if (strncmp(psMetadataLookupPtr(&status, md, "obstype"), "a string", MAX_STRING_LENGTH)) {
     870        if (strncmp(psMetadataLookupPtr(&status, md, "object"), "a string", MAX_STRING_LENGTH)) {
    871871            psFree(md);
    872872            exit(EXIT_FAILURE);

  • trunk/ippdb/tests/objectfrommetadata.c

    r9229 r9242  
    947947            exit(EXIT_FAILURE);
    948948        }
    949         if (!psMetadataAddStr(md, PS_LIST_TAIL, "obstype", 0, NULL, "a string")) {
     949        if (!psMetadataAddStr(md, PS_LIST_TAIL, "object", 0, NULL, "a string")) {
    950950            psFree(md);
    951951            exit(EXIT_FAILURE);
    … …  
    10281028            exit(EXIT_FAILURE);
    10291029        }
    1030         if (strncmp(object->obstype, "a string", MAX_STRING_LENGTH)) {
     1030        if (strncmp(object->object, "a string", MAX_STRING_LENGTH)) {
    10311031            psFree(object);
    10321032            exit(EXIT_FAILURE);
    … …  
    11091109            exit(EXIT_FAILURE);
    11101110        }
    1111         if (!psMetadataAddStr(md, PS_LIST_TAIL, "obstype", 0, NULL, "a string")) {
     1111        if (!psMetadataAddStr(md, PS_LIST_TAIL, "object", 0, NULL, "a string")) {
    11121112            psFree(md);
    11131113            exit(EXIT_FAILURE);
    … …  
    11901190            exit(EXIT_FAILURE);
    11911191        }
    1192         if (strncmp(object->obstype, "a string", MAX_STRING_LENGTH)) {
     1192        if (strncmp(object->object, "a string", MAX_STRING_LENGTH)) {
    11931193            psFree(object);
    11941194            exit(EXIT_FAILURE);
    … …  
    12711271            exit(EXIT_FAILURE);
    12721272        }
    1273         if (!psMetadataAddStr(md, PS_LIST_TAIL, "obstype", 0, NULL, "a string")) {
     1273        if (!psMetadataAddStr(md, PS_LIST_TAIL, "object", 0, NULL, "a string")) {
    12741274            psFree(md);
    12751275            exit(EXIT_FAILURE);
    … …  
    13521352            exit(EXIT_FAILURE);
    13531353        }
    1354         if (strncmp(object->obstype, "a string", MAX_STRING_LENGTH)) {
     1354        if (strncmp(object->object, "a string", MAX_STRING_LENGTH)) {
    13551355            psFree(object);
    13561356            exit(EXIT_FAILURE);

  • trunk/ippdb/tests/pop.c

    r9229 r9242  
    298298        psF32           ccd_temp;
    299299        psF64           posang;
    300         char            obstype[256];
    301 
    302         dbh = psDBInit("localhost", "test", NULL, "test");
    303         if (!dbh) {
    304             exit(EXIT_FAILURE);
    305         }
    306 
    307         if (!rawDetrendExpPop(dbh, (char **)&exp_tag, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, &airmass, &ra, &decl, &exp_time, &bg, &bg_stdev, &bg_mean_stdev, &alt, &az, &ccd_temp, &posang, (char **)&obstype)) {
     300        char            object[256];
     301
     302        dbh = psDBInit("localhost", "test", NULL, "test");
     303        if (!dbh) {
     304            exit(EXIT_FAILURE);
     305        }
     306
     307        if (!rawDetrendExpPop(dbh, (char **)&exp_tag, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, &airmass, &ra, &decl, &exp_time, &bg, &bg_stdev, &bg_mean_stdev, &alt, &az, &ccd_temp, &posang, (char **)&object)) {
    308308            exit(EXIT_FAILURE);
    309309        }
    … …  
    331331        psF32           ccd_temp;
    332332        psF64           posang;
    333         char            obstype[256];
    334 
    335         dbh = psDBInit("localhost", "test", NULL, "test");
    336         if (!dbh) {
    337             exit(EXIT_FAILURE);
    338         }
    339 
    340         if (!rawScienceExpPop(dbh, (char **)&exp_tag, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, &airmass, &ra, &decl, &exp_time, &bg, &bg_stdev, &bg_mean_stdev, &alt, &az, &ccd_temp, &posang, (char **)&obstype)) {
     333        char            object[256];
     334
     335        dbh = psDBInit("localhost", "test", NULL, "test");
     336        if (!dbh) {
     337            exit(EXIT_FAILURE);
     338        }
     339
     340        if (!rawScienceExpPop(dbh, (char **)&exp_tag, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, &airmass, &ra, &decl, &exp_time, &bg, &bg_stdev, &bg_mean_stdev, &alt, &az, &ccd_temp, &posang, (char **)&object)) {
    341341            exit(EXIT_FAILURE);
    342342        }
    … …  
    364364        psF32           ccd_temp;
    365365        psF64           posang;
    366         char            obstype[256];
    367 
    368         dbh = psDBInit("localhost", "test", NULL, "test");
    369         if (!dbh) {
    370             exit(EXIT_FAILURE);
    371         }
    372 
    373         if (!rawImfilePop(dbh, (char **)&exp_tag, (char **)&class, (char **)&class_id, (char **)&uri, (char **)&exp_type, (char **)&filter, &airmass, &ra, &decl, &exp_time, &bg, &bg_stdev, &bg_mean_stdev, &alt, &az, &ccd_temp, &posang, (char **)&obstype)) {
     366        char            object[256];
     367
     368        dbh = psDBInit("localhost", "test", NULL, "test");
     369        if (!dbh) {
     370            exit(EXIT_FAILURE);
     371        }
     372
     373        if (!rawImfilePop(dbh, (char **)&exp_tag, (char **)&class, (char **)&class_id, (char **)&uri, (char **)&exp_type, (char **)&filter, &airmass, &ra, &decl, &exp_time, &bg, &bg_stdev, &bg_mean_stdev, &alt, &az, &ccd_temp, &posang, (char **)&object)) {
    374374            exit(EXIT_FAILURE);
    375375        }
Note: See TracChangeset for help on using the changeset viewer.