IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 12426


Ignore:
Timestamp:
Mar 12, 2007, 5:52:56 PM (19 years ago)
Author:
jhoblitt
Message:

VERSION 1.1.18

Location:
trunk/ippdb
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippdb/configure.ac

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

  • trunk/ippdb/src/ippdb.c

    r12350 r12426  
    84708470static void detRunRowFree(detRunRow *object);
    84718471
    8472 detRunRow *detRunRowAlloc(psS64 det_id, psS32 iteration, const char *det_type, const char *mode, const char *state, const char *workdir, const char *camera, const char *telescope, const char *exp_type, const char *filter, psF32 airmass_min, psF32 airmass_max, psF32 exp_time_min, psF32 exp_time_max, psF32 ccd_temp_min, psF32 ccd_temp_max, psF64 posang_min, psF64 posang_max, psTime* registered, psTime* time_begin, psTime* time_end, psTime* use_begin, psTime* use_end, psF32 solang_min, psF32 solang_max, const char *label, psS32 parent)
     8472detRunRow *detRunRowAlloc(psS64 det_id, psS32 iteration, const char *det_type, const char *mode, const char *state, const char *filelevel, const char *workdir, const char *camera, const char *telescope, const char *exp_type, const char *filter, psF32 airmass_min, psF32 airmass_max, psF32 exp_time_min, psF32 exp_time_max, psF32 ccd_temp_min, psF32 ccd_temp_max, psF64 posang_min, psF64 posang_max, psTime* registered, psTime* time_begin, psTime* time_end, psTime* use_begin, psTime* use_end, psF32 solang_min, psF32 solang_max, const char *label, psS32 parent)
    84738473{
    84748474    detRunRow       *_object;
    … …  
    84828482    _object->mode = psStringCopy(mode);
    84838483    _object->state = psStringCopy(state);
     8484    _object->filelevel = psStringCopy(filelevel);
    84848485    _object->workdir = psStringCopy(workdir);
    84858486    _object->camera = psStringCopy(camera);
    … …  
    85138514    psFree(object->mode);
    85148515    psFree(object->state);
     8516    psFree(object->filelevel);
    85158517    psFree(object->workdir);
    85168518    psFree(object->camera);
    … …  
    85548556        return false;
    85558557    }
     8558    if (!psMetadataAdd(md, PS_LIST_TAIL, "filelevel", PS_DATA_STRING, NULL, "64")) {
     8559        psError(PS_ERR_UNKNOWN, false, "failed to add item filelevel");
     8560        psFree(md);
     8561        return false;
     8562    }
    85568563    if (!psMetadataAdd(md, PS_LIST_TAIL, "workdir", PS_DATA_STRING, "destination for output files", "255")) {
    85578564        psError(PS_ERR_UNKNOWN, false, "failed to add item workdir");
    … …  
    86778684}
    86788685
    8679 bool detRunInsert(psDB * dbh, psS64 det_id, psS32 iteration, const char *det_type, const char *mode, const char *state, const char *workdir, const char *camera, const char *telescope, const char *exp_type, const char *filter, psF32 airmass_min, psF32 airmass_max, psF32 exp_time_min, psF32 exp_time_max, psF32 ccd_temp_min, psF32 ccd_temp_max, psF64 posang_min, psF64 posang_max, psTime* registered, psTime* time_begin, psTime* time_end, psTime* use_begin, psTime* use_end, psF32 solang_min, psF32 solang_max, const char *label, psS32 parent)
     8686bool detRunInsert(psDB * dbh, psS64 det_id, psS32 iteration, const char *det_type, const char *mode, const char *state, const char *filelevel, const char *workdir, const char *camera, const char *telescope, const char *exp_type, const char *filter, psF32 airmass_min, psF32 airmass_max, psF32 exp_time_min, psF32 exp_time_max, psF32 ccd_temp_min, psF32 ccd_temp_max, psF64 posang_min, psF64 posang_max, psTime* registered, psTime* time_begin, psTime* time_end, psTime* use_begin, psTime* use_end, psF32 solang_min, psF32 solang_max, const char *label, psS32 parent)
    86808687{
    86818688    psMetadata *md = psMetadataAlloc();
    … …  
    87028709    if (!psMetadataAdd(md, PS_LIST_TAIL, "state", PS_DATA_STRING, NULL, state)) {
    87038710        psError(PS_ERR_UNKNOWN, false, "failed to add item state");
     8711        psFree(md);
     8712        return false;
     8713    }
     8714    if (!psMetadataAdd(md, PS_LIST_TAIL, "filelevel", PS_DATA_STRING, NULL, filelevel)) {
     8715        psError(PS_ERR_UNKNOWN, false, "failed to add item filelevel");
    87048716        psFree(md);
    87058717        return false;
    … …  
    88388850bool detRunInsertObject(psDB *dbh, detRunRow *object)
    88398851{
    8840     return detRunInsert(dbh, object->det_id, object->iteration, object->det_type, object->mode, object->state, object->workdir, object->camera, object->telescope, object->exp_type, object->filter, object->airmass_min, object->airmass_max, object->exp_time_min, object->exp_time_max, object->ccd_temp_min, object->ccd_temp_max, object->posang_min, object->posang_max, object->registered, object->time_begin, object->time_end, object->use_begin, object->use_end, object->solang_min, object->solang_max, object->label, object->parent);
     8852    return detRunInsert(dbh, object->det_id, object->iteration, object->det_type, object->mode, object->state, object->filelevel, object->workdir, object->camera, object->telescope, object->exp_type, object->filter, object->airmass_min, object->airmass_max, object->exp_time_min, object->exp_time_max, object->ccd_temp_min, object->ccd_temp_max, object->posang_min, object->posang_max, object->registered, object->time_begin, object->time_end, object->use_begin, object->use_end, object->solang_min, object->solang_max, object->label, object->parent);
    88418853}
    88428854
    … …  
    89368948        return false;
    89378949    }
     8950    if (!psMetadataAdd(md, PS_LIST_TAIL, "filelevel", PS_DATA_STRING, NULL, object->filelevel)) {
     8951        psError(PS_ERR_UNKNOWN, false, "failed to add item filelevel");
     8952        psFree(md);
     8953        return false;
     8954    }
    89388955    if (!psMetadataAdd(md, PS_LIST_TAIL, "workdir", PS_DATA_STRING, NULL, object->workdir)) {
    89398956        psError(PS_ERR_UNKNOWN, false, "failed to add item workdir");
    … …  
    90809097        return false;
    90819098    }
     9099    char* filelevel = psMetadataLookupPtr(&status, md, "filelevel");
     9100    if (!status) {
     9101        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item filelevel");
     9102        return false;
     9103    }
    90829104    char* workdir = psMetadataLookupPtr(&status, md, "workdir");
    90839105    if (!status) {
    … …  
    91919213    }
    91929214
    9193     return detRunRowAlloc(det_id, iteration, det_type, mode, state, workdir, camera, telescope, exp_type, filter, airmass_min, airmass_max, exp_time_min, exp_time_max, ccd_temp_min, ccd_temp_max, posang_min, posang_max, registered, time_begin, time_end, use_begin, use_end, solang_min, solang_max, label, parent);
     9215    return detRunRowAlloc(det_id, iteration, det_type, mode, state, filelevel, workdir, camera, telescope, exp_type, filter, airmass_min, airmass_max, exp_time_min, exp_time_max, ccd_temp_min, ccd_temp_max, posang_min, posang_max, registered, time_begin, time_end, use_begin, use_end, solang_min, solang_max, label, parent);
    91949216}
    91959217psArray *detRunSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)

  • trunk/ippdb/src/ippdb.h

    r12350 r12426  
    44174417    char            *mode;
    44184418    char            *state;
     4419    char            *filelevel;
    44194420    char            *workdir;
    44204421    char            *camera;
    … …  
    44524453    const char      *mode,
    44534454    const char      *state,
     4455    const char      *filelevel,
    44544456    const char      *workdir,
    44554457    const char      *camera,
    … …  
    45084510    const char      *mode,
    45094511    const char      *state,
     4512    const char      *filelevel,
    45104513    const char      *workdir,
    45114514    const char      *camera,

  • trunk/ippdb/tests/alloc.c

    r12350 r12426  
    856856        detRunRow       *object;
    857857
    858         object = detRunRowAlloc(-64, -32, "a string", "a string", "a string", "a string", "a string", "a string", "a string", "a string", 32.32, 32.32, 32.32, 32.32, 32.32, 32.32, 64.64, 64.64, "0001-01-01T00:00:00Z", "0001-01-01T00:00:00Z", "0001-01-01T00:00:00Z", "0001-01-01T00:00:00Z", "0001-01-01T00:00:00Z", 32.32, 32.32, "a string", -32    );
     858        object = detRunRowAlloc(-64, -32, "a string", "a string", "a string", "a string", "a string", "a string", "a string", "a string", "a string", 32.32, 32.32, 32.32, 32.32, 32.32, 32.32, 64.64, 64.64, "0001-01-01T00:00:00Z", "0001-01-01T00:00:00Z", "0001-01-01T00:00:00Z", "0001-01-01T00:00:00Z", "0001-01-01T00:00:00Z", 32.32, 32.32, "a string", -32    );
    859859
    860860        if (!object) {
    … …  
    879879        }
    880880        if (strncmp(object->state, "a string", MAX_STRING_LENGTH)) {
     881            psFree(object);
     882            exit(EXIT_FAILURE);
     883        }
     884        if (strncmp(object->filelevel, "a string", MAX_STRING_LENGTH)) {
    881885            psFree(object);
    882886            exit(EXIT_FAILURE);

  • trunk/ippdb/tests/insert.c

    r12350 r12426  
    313313        }
    314314
    315         if (!detRunInsert(dbh, -64, -32, "a string", "a string", "a string", "a string", "a string", "a string", "a string", "a string", 32.32, 32.32, 32.32, 32.32, 32.32, 32.32, 64.64, 64.64, "0001-01-01T00:00:00Z", "0001-01-01T00:00:00Z", "0001-01-01T00:00:00Z", "0001-01-01T00:00:00Z", "0001-01-01T00:00:00Z", 32.32, 32.32, "a string", -32)) {
     315        if (!detRunInsert(dbh, -64, -32, "a string", "a string", "a string", "a string", "a string", "a string", "a string", "a string", "a string", 32.32, 32.32, 32.32, 32.32, 32.32, 32.32, 64.64, 64.64, "0001-01-01T00:00:00Z", "0001-01-01T00:00:00Z", "0001-01-01T00:00:00Z", "0001-01-01T00:00:00Z", "0001-01-01T00:00:00Z", 32.32, 32.32, "a string", -32)) {
    316316            exit(EXIT_FAILURE);
    317317        }

  • trunk/ippdb/tests/insertobject.c

    r12350 r12426  
    454454        }
    455455
    456         object = detRunRowAlloc(-64, -32, "a string", "a string", "a string", "a string", "a string", "a string", "a string", "a string", 32.32, 32.32, 32.32, 32.32, 32.32, 32.32, 64.64, 64.64, "0001-01-01T00:00:00Z", "0001-01-01T00:00:00Z", "0001-01-01T00:00:00Z", "0001-01-01T00:00:00Z", "0001-01-01T00:00:00Z", 32.32, 32.32, "a string", -32);
     456        object = detRunRowAlloc(-64, -32, "a string", "a string", "a string", "a string", "a string", "a string", "a string", "a string", "a string", 32.32, 32.32, 32.32, 32.32, 32.32, 32.32, 64.64, 64.64, "0001-01-01T00:00:00Z", "0001-01-01T00:00:00Z", "0001-01-01T00:00:00Z", "0001-01-01T00:00:00Z", "0001-01-01T00:00:00Z", 32.32, 32.32, "a string", -32);
    457457        if (!object) {
    458458            exit(EXIT_FAILURE);

  • trunk/ippdb/tests/metadatafromobject.c

    r12350 r12426  
    10021002        bool            status;
    10031003
    1004         object = detRunRowAlloc(-64, -32, "a string", "a string", "a string", "a string", "a string", "a string", "a string", "a string", 32.32, 32.32, 32.32, 32.32, 32.32, 32.32, 64.64, 64.64, "0001-01-01T00:00:00Z", "0001-01-01T00:00:00Z", "0001-01-01T00:00:00Z", "0001-01-01T00:00:00Z", "0001-01-01T00:00:00Z", 32.32, 32.32, "a string", -32);
     1004        object = detRunRowAlloc(-64, -32, "a string", "a string", "a string", "a string", "a string", "a string", "a string", "a string", "a string", 32.32, 32.32, 32.32, 32.32, 32.32, 32.32, 64.64, 64.64, "0001-01-01T00:00:00Z", "0001-01-01T00:00:00Z", "0001-01-01T00:00:00Z", "0001-01-01T00:00:00Z", "0001-01-01T00:00:00Z", 32.32, 32.32, "a string", -32);
    10051005        if (!object) {
    10061006            exit(EXIT_FAILURE);
    … …  
    10301030        }
    10311031        if (strncmp(psMetadataLookupPtr(&status, md, "state"), "a string", MAX_STRING_LENGTH)) {
     1032            psFree(md);
     1033            exit(EXIT_FAILURE);
     1034        }
     1035        if (strncmp(psMetadataLookupPtr(&status, md, "filelevel"), "a string", MAX_STRING_LENGTH)) {
    10321036            psFree(md);
    10331037            exit(EXIT_FAILURE);

  • trunk/ippdb/tests/objectfrommetadata.c

    r12350 r12426  
    15301530            exit(EXIT_FAILURE);
    15311531        }
     1532        if (!psMetadataAddStr(md, PS_LIST_TAIL, "filelevel", 0, NULL, "a string")) {
     1533            psFree(md);
     1534            exit(EXIT_FAILURE);
     1535        }
    15321536        if (!psMetadataAddStr(md, PS_LIST_TAIL, "workdir", 0, NULL, "a string")) {
    15331537            psFree(md);
    … …  
    16381642        }
    16391643        if (strncmp(object->state, "a string", MAX_STRING_LENGTH)) {
     1644            psFree(object);
     1645            exit(EXIT_FAILURE);
     1646        }
     1647        if (strncmp(object->filelevel, "a string", MAX_STRING_LENGTH)) {
    16401648            psFree(object);
    16411649            exit(EXIT_FAILURE);
Note: See TracChangeset for help on using the changeset viewer.