IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 10155


Ignore:
Timestamp:
Nov 22, 2006, 3:48:15 PM (20 years ago)
Author:
jhoblitt
Message:

VERSION 0.0.59

Location:
trunk/ippdb
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippdb/configure.ac

    r10152 r10155  
    77AC_PREREQ(2.59)
    88
    9 AC_INIT([ippdb], [0.0.58], [pan-starrs.ifa.hawaii.edu])
     9AC_INIT([ippdb], [0.0.59], [pan-starrs.ifa.hawaii.edu])
    1010AC_CONFIG_SRCDIR([ippdb.pc.in])
    1111

  • trunk/ippdb/src/ippdb.c

    r10152 r10155  
    85558555static void detRunRowFree(detRunRow *object);
    85568556
    8557 detRunRow *detRunRowAlloc(psS32 det_id, psS32 iteration, const char *det_type, const char *det_mode, const char *state, const char *exp_type, const char *filter, psF32 airmass, psF32 exp_time, psF32 ccd_temp, psF64 posang, const char *object, psTime* registered, psTime* use_begin, psTime* use_end)
     8557detRunRow *detRunRowAlloc(psS32 det_id, psS32 iteration, const char *det_type, const char *mode, const char *state, const char *exp_type, const char *filter, psF32 airmass, psF32 exp_time, psF32 ccd_temp, psF64 posang, const char *object, psTime* registered, psTime* use_begin, psTime* use_end)
    85588558{
    85598559    detRunRow       *_object;
    … …  
    85658565    _object->iteration = iteration;
    85668566    _object->det_type = psStringCopy(det_type);
    8567     _object->det_mode = psStringCopy(det_mode);
     8567    _object->mode = psStringCopy(mode);
    85688568    _object->state = psStringCopy(state);
    85698569    _object->exp_type = psStringCopy(exp_type);
    … …  
    85848584{
    85858585    psFree(object->det_type);
    8586     psFree(object->det_mode);
     8586    psFree(object->mode);
    85878587    psFree(object->state);
    85888588    psFree(object->exp_type);
    … …  
    86128612        return false;
    86138613    }
    8614     if (!psMetadataAdd(md, PS_LIST_TAIL, "det_mode", PS_DATA_STRING, "Key", "64")) {
    8615         psError(PS_ERR_UNKNOWN, false, "failed to add item det_mode");
     8614    if (!psMetadataAdd(md, PS_LIST_TAIL, "mode", PS_DATA_STRING, "Key", "64")) {
     8615        psError(PS_ERR_UNKNOWN, false, "failed to add item mode");
    86168616        psFree(md);
    86178617        return false;
    … …  
    86948694}
    86958695
    8696 bool detRunInsert(psDB * dbh, psS32 det_id, psS32 iteration, const char *det_type, const char *det_mode, const char *state, const char *exp_type, const char *filter, psF32 airmass, psF32 exp_time, psF32 ccd_temp, psF64 posang, const char *object, psTime* registered, psTime* use_begin, psTime* use_end)
     8696bool detRunInsert(psDB * dbh, psS32 det_id, psS32 iteration, const char *det_type, const char *mode, const char *state, const char *exp_type, const char *filter, psF32 airmass, psF32 exp_time, psF32 ccd_temp, psF64 posang, const char *object, psTime* registered, psTime* use_begin, psTime* use_end)
    86978697{
    86988698    psMetadata *md = psMetadataAlloc();
    … …  
    87128712        return false;
    87138713    }
    8714     if (!psMetadataAdd(md, PS_LIST_TAIL, "det_mode", PS_DATA_STRING, NULL, det_mode)) {
    8715         psError(PS_ERR_UNKNOWN, false, "failed to add item det_mode");
     8714    if (!psMetadataAdd(md, PS_LIST_TAIL, "mode", PS_DATA_STRING, NULL, mode)) {
     8715        psError(PS_ERR_UNKNOWN, false, "failed to add item mode");
    87168716        psFree(md);
    87178717        return false;
    … …  
    87958795bool detRunInsertObject(psDB *dbh, detRunRow *object)
    87968796{
    8797     return detRunInsert(dbh, object->det_id, object->iteration, object->det_type, object->det_mode, object->state, object->exp_type, object->filter, object->airmass, object->exp_time, object->ccd_temp, object->posang, object->object, object->registered, object->use_begin, object->use_end);
     8797    return detRunInsert(dbh, object->det_id, object->iteration, object->det_type, object->mode, object->state, object->exp_type, object->filter, object->airmass, object->exp_time, object->ccd_temp, object->posang, object->object, object->registered, object->use_begin, object->use_end);
    87988798}
    87998799
    … …  
    88838883        return false;
    88848884    }
    8885     if (!psMetadataAdd(md, PS_LIST_TAIL, "det_mode", PS_DATA_STRING, NULL, object->det_mode)) {
    8886         psError(PS_ERR_UNKNOWN, false, "failed to add item det_mode");
     8885    if (!psMetadataAdd(md, PS_LIST_TAIL, "mode", PS_DATA_STRING, NULL, object->mode)) {
     8886        psError(PS_ERR_UNKNOWN, false, "failed to add item mode");
    88878887        psFree(md);
    88888888        return false;
    … …  
    89678967        return false;
    89688968    }
    8969     char* det_mode = psMetadataLookupPtr(&status, md, "det_mode");
    8970     if (!status) {
    8971         psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item det_mode");
     8969    char* mode = psMetadataLookupPtr(&status, md, "mode");
     8970    if (!status) {
     8971        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item mode");
    89728972        return false;
    89738973    }
    … …  
    90289028    }
    90299029
    9030     return detRunRowAlloc(det_id, iteration, det_type, det_mode, state, exp_type, filter, airmass, exp_time, ccd_temp, posang, object, registered, use_begin, use_end);
     9030    return detRunRowAlloc(det_id, iteration, det_type, mode, state, exp_type, filter, airmass, exp_time, ccd_temp, posang, object, registered, use_begin, use_end);
    90319031}
    90329032psArray *detRunSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)

  • trunk/ippdb/src/ippdb.h

    r10152 r10155  
    43554355    psS32           iteration;
    43564356    char            *det_type;
    4357     char            *det_mode;
     4357    char            *mode;
    43584358    char            *state;
    43594359    char            *exp_type;
    … …  
    43784378    psS32           iteration,
    43794379    const char      *det_type,
    4380     const char      *det_mode,
     4380    const char      *mode,
    43814381    const char      *state,
    43824382    const char      *exp_type,
    … …  
    44224422    psS32           iteration,
    44234423    const char      *det_type,
    4424     const char      *det_mode,
     4424    const char      *mode,
    44254425    const char      *state,
    44264426    const char      *exp_type,

  • trunk/ippdb/tests/alloc.c

    r10152 r10155  
    912912            exit(EXIT_FAILURE);
    913913        }
    914         if (strncmp(object->det_mode, "a string", MAX_STRING_LENGTH)) {
     914        if (strncmp(object->mode, "a string", MAX_STRING_LENGTH)) {
    915915            psFree(object);
    916916            exit(EXIT_FAILURE);

  • trunk/ippdb/tests/metadatafromobject.c

    r10152 r10155  
    10881088            exit(EXIT_FAILURE);
    10891089        }
    1090         if (strncmp(psMetadataLookupPtr(&status, md, "det_mode"), "a string", MAX_STRING_LENGTH)) {
     1090        if (strncmp(psMetadataLookupPtr(&status, md, "mode"), "a string", MAX_STRING_LENGTH)) {
    10911091            psFree(md);
    10921092            exit(EXIT_FAILURE);

  • trunk/ippdb/tests/objectfrommetadata.c

    r10152 r10155  
    16231623            exit(EXIT_FAILURE);
    16241624        }
    1625         if (!psMetadataAddStr(md, PS_LIST_TAIL, "det_mode", 0, NULL, "a string")) {
     1625        if (!psMetadataAddStr(md, PS_LIST_TAIL, "mode", 0, NULL, "a string")) {
    16261626            psFree(md);
    16271627            exit(EXIT_FAILURE);
    … …  
    16891689            exit(EXIT_FAILURE);
    16901690        }
    1691         if (strncmp(object->det_mode, "a string", MAX_STRING_LENGTH)) {
     1691        if (strncmp(object->mode, "a string", MAX_STRING_LENGTH)) {
    16921692            psFree(object);
    16931693            exit(EXIT_FAILURE);
Note: See TracChangeset for help on using the changeset viewer.