IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 12350


Ignore:
Timestamp:
Mar 8, 2007, 3:17:23 PM (19 years ago)
Author:
jhoblitt
Message:

VERISON 1.1.17

Location:
trunk/ippdb
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippdb/configure.ac

    r12260 r12350  
    77AC_PREREQ(2.59)
    88
    9 AC_INIT([ippdb], [1.1.16], [pan-starrs.ifa.hawaii.edu])
     9AC_INIT([ippdb], [1.1.17], [pan-starrs.ifa.hawaii.edu])
    1010AC_CONFIG_SRCDIR([ippdb.pc.in])
    1111

  • trunk/ippdb/src/ippdb.c

    r12260 r12350  
    42924292static void rawImfileRowFree(rawImfileRow *object);
    42934293
    4294 rawImfileRow *rawImfileRowAlloc(const char *exp_tag, 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, psTime* dateobs, psS16 fault)
     4294rawImfileRow *rawImfileRowAlloc(const char *exp_tag, const char *class_id, const char *uri, const char *exp_type, const char *filelevel, 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, psTime* dateobs, psS16 fault)
    42954295{
    42964296    rawImfileRow    *_object;
    … …  
    43034303    _object->uri = psStringCopy(uri);
    43044304    _object->exp_type = psStringCopy(exp_type);
     4305    _object->filelevel = psStringCopy(filelevel);
    43054306    _object->filter = psStringCopy(filter);
    43064307    _object->airmass = airmass;
    … …  
    43284329    psFree(object->uri);
    43294330    psFree(object->exp_type);
     4331    psFree(object->filelevel);
    43304332    psFree(object->filter);
    43314333    psFree(object->object);
    … …  
    43564358        return false;
    43574359    }
     4360    if (!psMetadataAdd(md, PS_LIST_TAIL, "filelevel", PS_DATA_STRING, NULL, "64")) {
     4361        psError(PS_ERR_UNKNOWN, false, "failed to add item filelevel");
     4362        psFree(md);
     4363        return false;
     4364    }
    43584365    if (!psMetadataAdd(md, PS_LIST_TAIL, "filter", PS_DATA_STRING, NULL, "64")) {
    43594366        psError(PS_ERR_UNKNOWN, false, "failed to add item filter");
    … …  
    44444451}
    44454452
    4446 bool rawImfileInsert(psDB * dbh, const char *exp_tag, 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, psTime* dateobs, psS16 fault)
     4453bool rawImfileInsert(psDB * dbh, const char *exp_tag, const char *class_id, const char *uri, const char *exp_type, const char *filelevel, 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, psTime* dateobs, psS16 fault)
    44474454{
    44484455    psMetadata *md = psMetadataAlloc();
    … …  
    44644471    if (!psMetadataAdd(md, PS_LIST_TAIL, "exp_type", PS_DATA_STRING, NULL, exp_type)) {
    44654472        psError(PS_ERR_UNKNOWN, false, "failed to add item exp_type");
     4473        psFree(md);
     4474        return false;
     4475    }
     4476    if (!psMetadataAdd(md, PS_LIST_TAIL, "filelevel", PS_DATA_STRING, NULL, filelevel)) {
     4477        psError(PS_ERR_UNKNOWN, false, "failed to add item filelevel");
    44664478        psFree(md);
    44674479        return false;
    … …  
    45654577bool rawImfileInsertObject(psDB *dbh, rawImfileRow *object)
    45664578{
    4567     return rawImfileInsert(dbh, object->exp_tag, 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, object->dateobs, object->fault);
     4579    return rawImfileInsert(dbh, object->exp_tag, object->class_id, object->uri, object->exp_type, object->filelevel, 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, object->dateobs, object->fault);
    45684580}
    45694581
    … …  
    46584670        return false;
    46594671    }
     4672    if (!psMetadataAdd(md, PS_LIST_TAIL, "filelevel", PS_DATA_STRING, NULL, object->filelevel)) {
     4673        psError(PS_ERR_UNKNOWN, false, "failed to add item filelevel");
     4674        psFree(md);
     4675        return false;
     4676    }
    46604677    if (!psMetadataAdd(md, PS_LIST_TAIL, "filter", PS_DATA_STRING, NULL, object->filter)) {
    46614678        psError(PS_ERR_UNKNOWN, false, "failed to add item filter");
    … …  
    47624779        return false;
    47634780    }
     4781    char* filelevel = psMetadataLookupPtr(&status, md, "filelevel");
     4782    if (!status) {
     4783        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item filelevel");
     4784        return false;
     4785    }
    47644786    char* filter = psMetadataLookupPtr(&status, md, "filter");
    47654787    if (!status) {
    … …  
    48384860    }
    48394861
    4840     return rawImfileRowAlloc(exp_tag, class_id, uri, exp_type, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang, object, dateobs, fault);
     4862    return rawImfileRowAlloc(exp_tag, class_id, uri, exp_type, filelevel, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang, object, dateobs, fault);
    48414863}
    48424864psArray *rawImfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)

  • trunk/ippdb/src/ippdb.h

    r12260 r12350  
    22652265    char            *uri;
    22662266    char            *exp_type;
     2267    char            *filelevel;
    22672268    char            *filter;
    22682269    psF32           airmass;
    … …  
    22922293    const char      *uri,
    22932294    const char      *exp_type,
     2295    const char      *filelevel,
    22942296    const char      *filter,
    22952297    psF32           airmass,
    … …  
    23402342    const char      *uri,
    23412343    const char      *exp_type,
     2344    const char      *filelevel,
    23422345    const char      *filter,
    23432346    psF32           airmass,

  • trunk/ippdb/tests/alloc.c

    r12260 r12350  
    419419        rawImfileRow    *object;
    420420
    421         object = rawImfileRowAlloc("a string", "a string", "a string", "a string", "a string", 32.32, 64.64, 64.64, 32.32, 64.64, 64.64, 64.64, 64.64, 64.64, 32.32, 64.64, "a string", "0001-01-01T00:00:00Z", -16    );
     421        object = rawImfileRowAlloc("a string", "a string", "a string", "a string", "a string", "a string", 32.32, 64.64, 64.64, 32.32, 64.64, 64.64, 64.64, 64.64, 64.64, 32.32, 64.64, "a string", "0001-01-01T00:00:00Z", -16    );
    422422
    423423        if (!object) {
    … …  
    438438        }
    439439        if (strncmp(object->exp_type, "a string", MAX_STRING_LENGTH)) {
     440            psFree(object);
     441            exit(EXIT_FAILURE);
     442        }
     443        if (strncmp(object->filelevel, "a string", MAX_STRING_LENGTH)) {
    440444            psFree(object);
    441445            exit(EXIT_FAILURE);

  • trunk/ippdb/tests/insert.c

    r12260 r12350  
    163163        }
    164164
    165         if (!rawImfileInsert(dbh, "a string", "a string", "a string", "a string", "a string", 32.32, 64.64, 64.64, 32.32, 64.64, 64.64, 64.64, 64.64, 64.64, 32.32, 64.64, "a string", "0001-01-01T00:00:00Z", -16)) {
     165        if (!rawImfileInsert(dbh, "a string", "a string", "a string", "a string", "a string", "a string", 32.32, 64.64, 64.64, 32.32, 64.64, 64.64, 64.64, 64.64, 64.64, 32.32, 64.64, "a string", "0001-01-01T00:00:00Z", -16)) {
    166166            exit(EXIT_FAILURE);
    167167        }

  • trunk/ippdb/tests/insertobject.c

    r12260 r12350  
    234234        }
    235235
    236         object = rawImfileRowAlloc("a string", "a string", "a string", "a string", "a string", 32.32, 64.64, 64.64, 32.32, 64.64, 64.64, 64.64, 64.64, 64.64, 32.32, 64.64, "a string", "0001-01-01T00:00:00Z", -16);
     236        object = rawImfileRowAlloc("a string", "a string", "a string", "a string", "a string", "a string", 32.32, 64.64, 64.64, 32.32, 64.64, 64.64, 64.64, 64.64, 64.64, 32.32, 64.64, "a string", "0001-01-01T00:00:00Z", -16);
    237237        if (!object) {
    238238            exit(EXIT_FAILURE);

  • trunk/ippdb/tests/metadatafromobject.c

    r12260 r12350  
    499499        bool            status;
    500500
    501         object = rawImfileRowAlloc("a string", "a string", "a string", "a string", "a string", 32.32, 64.64, 64.64, 32.32, 64.64, 64.64, 64.64, 64.64, 64.64, 32.32, 64.64, "a string", "0001-01-01T00:00:00Z", -16);
     501        object = rawImfileRowAlloc("a string", "a string", "a string", "a string", "a string", "a string", 32.32, 64.64, 64.64, 32.32, 64.64, 64.64, 64.64, 64.64, 64.64, 32.32, 64.64, "a string", "0001-01-01T00:00:00Z", -16);
    502502        if (!object) {
    503503            exit(EXIT_FAILURE);
    … …  
    524524        }
    525525        if (strncmp(psMetadataLookupPtr(&status, md, "exp_type"), "a string", MAX_STRING_LENGTH)) {
     526            psFree(md);
     527            exit(EXIT_FAILURE);
     528        }
     529        if (strncmp(psMetadataLookupPtr(&status, md, "filelevel"), "a string", MAX_STRING_LENGTH)) {
    526530            psFree(md);
    527531            exit(EXIT_FAILURE);

  • trunk/ippdb/tests/objectfrommetadata.c

    r12260 r12350  
    761761            exit(EXIT_FAILURE);
    762762        }
     763        if (!psMetadataAddStr(md, PS_LIST_TAIL, "filelevel", 0, NULL, "a string")) {
     764            psFree(md);
     765            exit(EXIT_FAILURE);
     766        }
    763767        if (!psMetadataAddStr(md, PS_LIST_TAIL, "filter", 0, NULL, "a string")) {
    764768            psFree(md);
    … …  
    841845        }
    842846        if (strncmp(object->exp_type, "a string", MAX_STRING_LENGTH)) {
     847            psFree(object);
     848            exit(EXIT_FAILURE);
     849        }
     850        if (strncmp(object->filelevel, "a string", MAX_STRING_LENGTH)) {
    843851            psFree(object);
    844852            exit(EXIT_FAILURE);
Note: See TracChangeset for help on using the changeset viewer.