Index: /trunk/dbconfig/config.md =================================================================== --- /trunk/dbconfig/config.md (revision 11192) +++ /trunk/dbconfig/config.md (revision 11193) @@ -2,4 +2,4 @@ pkg_name STR ippdb pkg_namespace STR ippdb - pkg_version STR 0.0.77 + pkg_version STR 0.0.78 END Index: /trunk/ippdb/configure.ac =================================================================== --- /trunk/ippdb/configure.ac (revision 11192) +++ /trunk/ippdb/configure.ac (revision 11193) @@ -7,5 +7,5 @@ AC_PREREQ(2.59) -AC_INIT([ippdb], [0.0.77], [pan-starrs.ifa.hawaii.edu]) +AC_INIT([ippdb], [0.0.78], [pan-starrs.ifa.hawaii.edu]) AC_CONFIG_SRCDIR([ippdb.pc.in]) Index: /trunk/ippdb/src/ippdb.c =================================================================== --- /trunk/ippdb/src/ippdb.c (revision 11192) +++ /trunk/ippdb/src/ippdb.c (revision 11193) @@ -8333,5 +8333,5 @@ static void detRunRowFree(detRunRow *object); -detRunRow *detRunRowAlloc(psS32 det_id, psS32 iteration, const char *det_type, const char *mode, const char *state, const char *exp_type, const char *workdir, const char *filter, psF32 airmass, psF32 exp_time, psF32 ccd_temp, psF64 posang, const char *object, psTime* registered, psTime* use_begin, psTime* use_end) +detRunRow *detRunRowAlloc(psS32 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) { detRunRow *_object; @@ -8345,13 +8345,20 @@ _object->mode = psStringCopy(mode); _object->state = psStringCopy(state); + _object->workdir = psStringCopy(workdir); + _object->camera = psStringCopy(camera); + _object->telescope = psStringCopy(telescope); _object->exp_type = psStringCopy(exp_type); - _object->workdir = psStringCopy(workdir); _object->filter = psStringCopy(filter); - _object->airmass = airmass; - _object->exp_time = exp_time; - _object->ccd_temp = ccd_temp; - _object->posang = posang; - _object->object = psStringCopy(object); + _object->airmass_min = airmass_min; + _object->airmass_max = airmass_max; + _object->exp_time_min = exp_time_min; + _object->exp_time_max = exp_time_max; + _object->ccd_temp_min = ccd_temp_min; + _object->ccd_temp_max = ccd_temp_max; + _object->posang_min = posang_min; + _object->posang_max = posang_max; _object->registered = psTimeCopy(registered); + _object->time_begin = psTimeCopy(time_begin); + _object->time_end = psTimeCopy(time_end); _object->use_begin = psTimeCopy(use_begin); _object->use_end = psTimeCopy(use_end); @@ -8365,9 +8372,12 @@ psFree(object->mode); psFree(object->state); + psFree(object->workdir); + psFree(object->camera); + psFree(object->telescope); psFree(object->exp_type); - psFree(object->workdir); psFree(object->filter); - psFree(object->object); psFree(object->registered); + psFree(object->time_begin); + psFree(object->time_end); psFree(object->use_begin); psFree(object->use_end); @@ -8402,4 +8412,19 @@ return false; } + if (!psMetadataAdd(md, PS_LIST_TAIL, "workdir", PS_DATA_STRING, "destination for output files", "255")) { + psError(PS_ERR_UNKNOWN, false, "failed to add item workdir"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "camera", PS_DATA_STRING, NULL, "64")) { + psError(PS_ERR_UNKNOWN, false, "failed to add item camera"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "telescope", PS_DATA_STRING, NULL, "64")) { + psError(PS_ERR_UNKNOWN, false, "failed to add item telescope"); + psFree(md); + return false; + } if (!psMetadataAdd(md, PS_LIST_TAIL, "exp_type", PS_DATA_STRING, NULL, "64")) { psError(PS_ERR_UNKNOWN, false, "failed to add item exp_type"); @@ -8407,9 +8432,4 @@ return false; } - if (!psMetadataAdd(md, PS_LIST_TAIL, "workdir", PS_DATA_STRING, "destination for output files", "255")) { - psError(PS_ERR_UNKNOWN, false, "failed to add item workdir"); - psFree(md); - return false; - } if (!psMetadataAdd(md, PS_LIST_TAIL, "filter", PS_DATA_STRING, NULL, "64")) { psError(PS_ERR_UNKNOWN, false, "failed to add item filter"); @@ -8417,26 +8437,41 @@ return false; } - if (!psMetadataAdd(md, PS_LIST_TAIL, "airmass", PS_DATA_F32, NULL, 0.0)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item airmass"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "exp_time", PS_DATA_F32, NULL, 0.0)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item exp_time"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "ccd_temp", PS_DATA_F32, NULL, 0.0)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item ccd_temp"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "posang", PS_DATA_F64, NULL, 0.0)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item posang"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "object", PS_DATA_STRING, NULL, "64")) { - psError(PS_ERR_UNKNOWN, false, "failed to add item object"); + if (!psMetadataAdd(md, PS_LIST_TAIL, "airmass_min", PS_DATA_F32, NULL, 0.0)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item airmass_min"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "airmass_max", PS_DATA_F32, NULL, 0.0)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item airmass_max"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "exp_time_min", PS_DATA_F32, NULL, 0.0)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item exp_time_min"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "exp_time_max", PS_DATA_F32, NULL, 0.0)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item exp_time_max"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "ccd_temp_min", PS_DATA_F32, NULL, 0.0)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item ccd_temp_min"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "ccd_temp_max", PS_DATA_F32, NULL, 0.0)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item ccd_temp_max"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "posang_min", PS_DATA_F64, NULL, 0.0)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item posang_min"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "posang_max", PS_DATA_F64, NULL, 0.0)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item posang_max"); psFree(md); return false; @@ -8447,4 +8482,14 @@ return false; } + if (!psMetadataAdd(md, PS_LIST_TAIL, "time_begin", PS_DATA_TIME, NULL, NULL)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item time_begin"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "time_end", PS_DATA_TIME, NULL, NULL)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item time_end"); + psFree(md); + return false; + } if (!psMetadataAdd(md, PS_LIST_TAIL, "use_begin", PS_DATA_TIME, NULL, NULL)) { psError(PS_ERR_UNKNOWN, false, "failed to add item use_begin"); @@ -8470,5 +8515,5 @@ } -bool detRunInsert(psDB * dbh, psS32 det_id, psS32 iteration, const char *det_type, const char *mode, const char *state, const char *exp_type, const char *workdir, const char *filter, psF32 airmass, psF32 exp_time, psF32 ccd_temp, psF64 posang, const char *object, psTime* registered, psTime* use_begin, psTime* use_end) +bool detRunInsert(psDB * dbh, psS32 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) { psMetadata *md = psMetadataAlloc(); @@ -8498,4 +8543,19 @@ return false; } + if (!psMetadataAdd(md, PS_LIST_TAIL, "workdir", PS_DATA_STRING, NULL, workdir)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item workdir"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "camera", PS_DATA_STRING, NULL, camera)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item camera"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "telescope", PS_DATA_STRING, NULL, telescope)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item telescope"); + psFree(md); + return false; + } if (!psMetadataAdd(md, PS_LIST_TAIL, "exp_type", PS_DATA_STRING, NULL, exp_type)) { psError(PS_ERR_UNKNOWN, false, "failed to add item exp_type"); @@ -8503,9 +8563,4 @@ return false; } - if (!psMetadataAdd(md, PS_LIST_TAIL, "workdir", PS_DATA_STRING, NULL, workdir)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item workdir"); - psFree(md); - return false; - } if (!psMetadataAdd(md, PS_LIST_TAIL, "filter", PS_DATA_STRING, NULL, filter)) { psError(PS_ERR_UNKNOWN, false, "failed to add item filter"); @@ -8513,26 +8568,41 @@ return false; } - if (!psMetadataAdd(md, PS_LIST_TAIL, "airmass", PS_DATA_F32, NULL, airmass)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item airmass"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "exp_time", PS_DATA_F32, NULL, exp_time)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item exp_time"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "ccd_temp", PS_DATA_F32, NULL, ccd_temp)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item ccd_temp"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "posang", PS_DATA_F64, NULL, posang)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item posang"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "object", PS_DATA_STRING, NULL, object)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item object"); + if (!psMetadataAdd(md, PS_LIST_TAIL, "airmass_min", PS_DATA_F32, NULL, airmass_min)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item airmass_min"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "airmass_max", PS_DATA_F32, NULL, airmass_max)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item airmass_max"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "exp_time_min", PS_DATA_F32, NULL, exp_time_min)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item exp_time_min"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "exp_time_max", PS_DATA_F32, NULL, exp_time_max)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item exp_time_max"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "ccd_temp_min", PS_DATA_F32, NULL, ccd_temp_min)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item ccd_temp_min"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "ccd_temp_max", PS_DATA_F32, NULL, ccd_temp_max)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item ccd_temp_max"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "posang_min", PS_DATA_F64, NULL, posang_min)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item posang_min"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "posang_max", PS_DATA_F64, NULL, posang_max)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item posang_max"); psFree(md); return false; @@ -8540,4 +8610,14 @@ if (!psMetadataAdd(md, PS_LIST_TAIL, "registered", PS_DATA_TIME, NULL, registered)) { psError(PS_ERR_UNKNOWN, false, "failed to add item registered"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "time_begin", PS_DATA_TIME, NULL, time_begin)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item time_begin"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "time_end", PS_DATA_TIME, NULL, time_end)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item time_end"); psFree(md); return false; @@ -8576,5 +8656,5 @@ bool detRunInsertObject(psDB *dbh, detRunRow *object) { - return detRunInsert(dbh, object->det_id, object->iteration, object->det_type, object->mode, object->state, object->exp_type, object->workdir, object->filter, object->airmass, object->exp_time, object->ccd_temp, object->posang, object->object, object->registered, object->use_begin, object->use_end); + 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); } @@ -8674,4 +8754,19 @@ return false; } + if (!psMetadataAdd(md, PS_LIST_TAIL, "workdir", PS_DATA_STRING, NULL, object->workdir)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item workdir"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "camera", PS_DATA_STRING, NULL, object->camera)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item camera"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "telescope", PS_DATA_STRING, NULL, object->telescope)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item telescope"); + psFree(md); + return false; + } if (!psMetadataAdd(md, PS_LIST_TAIL, "exp_type", PS_DATA_STRING, NULL, object->exp_type)) { psError(PS_ERR_UNKNOWN, false, "failed to add item exp_type"); @@ -8679,9 +8774,4 @@ return false; } - if (!psMetadataAdd(md, PS_LIST_TAIL, "workdir", PS_DATA_STRING, NULL, object->workdir)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item workdir"); - psFree(md); - return false; - } if (!psMetadataAdd(md, PS_LIST_TAIL, "filter", PS_DATA_STRING, NULL, object->filter)) { psError(PS_ERR_UNKNOWN, false, "failed to add item filter"); @@ -8689,26 +8779,41 @@ return false; } - if (!psMetadataAdd(md, PS_LIST_TAIL, "airmass", PS_DATA_F32, NULL, object->airmass)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item airmass"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "exp_time", PS_DATA_F32, NULL, object->exp_time)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item exp_time"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "ccd_temp", PS_DATA_F32, NULL, object->ccd_temp)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item ccd_temp"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "posang", PS_DATA_F64, NULL, object->posang)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item posang"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "object", PS_DATA_STRING, NULL, object->object)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item object"); + if (!psMetadataAdd(md, PS_LIST_TAIL, "airmass_min", PS_DATA_F32, NULL, object->airmass_min)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item airmass_min"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "airmass_max", PS_DATA_F32, NULL, object->airmass_max)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item airmass_max"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "exp_time_min", PS_DATA_F32, NULL, object->exp_time_min)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item exp_time_min"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "exp_time_max", PS_DATA_F32, NULL, object->exp_time_max)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item exp_time_max"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "ccd_temp_min", PS_DATA_F32, NULL, object->ccd_temp_min)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item ccd_temp_min"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "ccd_temp_max", PS_DATA_F32, NULL, object->ccd_temp_max)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item ccd_temp_max"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "posang_min", PS_DATA_F64, NULL, object->posang_min)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item posang_min"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "posang_max", PS_DATA_F64, NULL, object->posang_max)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item posang_max"); psFree(md); return false; @@ -8719,4 +8824,14 @@ return false; } + if (!psMetadataAdd(md, PS_LIST_TAIL, "time_begin", PS_DATA_TIME, NULL, object->time_begin)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item time_begin"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "time_end", PS_DATA_TIME, NULL, object->time_end)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item time_end"); + psFree(md); + return false; + } if (!psMetadataAdd(md, PS_LIST_TAIL, "use_begin", PS_DATA_TIME, NULL, object->use_begin)) { psError(PS_ERR_UNKNOWN, false, "failed to add item use_begin"); @@ -8763,4 +8878,19 @@ return false; } + char* workdir = psMetadataLookupPtr(&status, md, "workdir"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item workdir"); + return false; + } + char* camera = psMetadataLookupPtr(&status, md, "camera"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item camera"); + return false; + } + char* telescope = psMetadataLookupPtr(&status, md, "telescope"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item telescope"); + return false; + } char* exp_type = psMetadataLookupPtr(&status, md, "exp_type"); if (!status) { @@ -8768,9 +8898,4 @@ return false; } - char* workdir = psMetadataLookupPtr(&status, md, "workdir"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item workdir"); - return false; - } char* filter = psMetadataLookupPtr(&status, md, "filter"); if (!status) { @@ -8778,27 +8903,42 @@ return false; } - psF32 airmass = psMetadataLookupF32(&status, md, "airmass"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item airmass"); - return false; - } - psF32 exp_time = psMetadataLookupF32(&status, md, "exp_time"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item exp_time"); - return false; - } - psF32 ccd_temp = psMetadataLookupF32(&status, md, "ccd_temp"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item ccd_temp"); - return false; - } - psF64 posang = psMetadataLookupF64(&status, md, "posang"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item posang"); - return false; - } - char* object = psMetadataLookupPtr(&status, md, "object"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item object"); + psF32 airmass_min = psMetadataLookupF32(&status, md, "airmass_min"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item airmass_min"); + return false; + } + psF32 airmass_max = psMetadataLookupF32(&status, md, "airmass_max"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item airmass_max"); + return false; + } + psF32 exp_time_min = psMetadataLookupF32(&status, md, "exp_time_min"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item exp_time_min"); + return false; + } + psF32 exp_time_max = psMetadataLookupF32(&status, md, "exp_time_max"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item exp_time_max"); + return false; + } + psF32 ccd_temp_min = psMetadataLookupF32(&status, md, "ccd_temp_min"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item ccd_temp_min"); + return false; + } + psF32 ccd_temp_max = psMetadataLookupF32(&status, md, "ccd_temp_max"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item ccd_temp_max"); + return false; + } + psF64 posang_min = psMetadataLookupF64(&status, md, "posang_min"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item posang_min"); + return false; + } + psF64 posang_max = psMetadataLookupF64(&status, md, "posang_max"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item posang_max"); return false; } @@ -8808,4 +8948,14 @@ return false; } + psTime* time_begin = psMetadataLookupPtr(&status, md, "time_begin"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item time_begin"); + return false; + } + psTime* time_end = psMetadataLookupPtr(&status, md, "time_end"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item time_end"); + return false; + } psTime* use_begin = psMetadataLookupPtr(&status, md, "use_begin"); if (!status) { @@ -8819,5 +8969,5 @@ } - return detRunRowAlloc(det_id, iteration, det_type, mode, state, exp_type, workdir, filter, airmass, exp_time, ccd_temp, posang, object, registered, use_begin, use_end); + 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); } psArray *detRunSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) Index: /trunk/ippdb/src/ippdb.h =================================================================== --- /trunk/ippdb/src/ippdb.h (revision 11192) +++ /trunk/ippdb/src/ippdb.h (revision 11193) @@ -4399,13 +4399,20 @@ char *mode; char *state; + char *workdir; + char *camera; + char *telescope; char *exp_type; - char *workdir; char *filter; - psF32 airmass; - psF32 exp_time; - psF32 ccd_temp; - psF64 posang; - char *object; + 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; @@ -4423,13 +4430,20 @@ const char *mode, const char *state, + const char *workdir, + const char *camera, + const char *telescope, const char *exp_type, - const char *workdir, const char *filter, - psF32 airmass, - psF32 exp_time, - psF32 ccd_temp, - psF64 posang, - const char *object, + 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 @@ -4468,13 +4482,20 @@ const char *mode, const char *state, + const char *workdir, + const char *camera, + const char *telescope, const char *exp_type, - const char *workdir, const char *filter, - psF32 airmass, - psF32 exp_time, - psF32 ccd_temp, - psF64 posang, - const char *object, + 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 Index: /trunk/ippdb/tests/alloc.c =================================================================== --- /trunk/ippdb/tests/alloc.c (revision 11192) +++ /trunk/ippdb/tests/alloc.c (revision 11193) @@ -827,5 +827,5 @@ detRunRow *object; - object = detRunRowAlloc(-32, -32, "a string", "a string", "a string", "a string", "a string", "a string", 32.32, 32.32, 32.32, 64.64, "a string", "0001-01-01T00:00:00Z", "0001-01-01T00:00:00Z", "0001-01-01T00:00:00Z" ); + object = detRunRowAlloc(-32, -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" ); if (!object) { @@ -853,33 +853,59 @@ exit(EXIT_FAILURE); } + if (strncmp(object->workdir, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->camera, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->telescope, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } if (strncmp(object->exp_type, "a string", MAX_STRING_LENGTH)) { psFree(object); exit(EXIT_FAILURE); } - if (strncmp(object->workdir, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } if (strncmp(object->filter, "a string", MAX_STRING_LENGTH)) { psFree(object); exit(EXIT_FAILURE); } - if (!object->airmass == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->exp_time == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->ccd_temp == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->posang == 64.64) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->object, "a string", MAX_STRING_LENGTH)) { + if (!object->airmass_min == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->airmass_max == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->exp_time_min == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->exp_time_max == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->ccd_temp_min == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->ccd_temp_max == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->posang_min == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->posang_max == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + psFree(object); + exit(EXIT_FAILURE); + } psFree(object); exit(EXIT_FAILURE); Index: /trunk/ippdb/tests/insert.c =================================================================== --- /trunk/ippdb/tests/insert.c (revision 11192) +++ /trunk/ippdb/tests/insert.c (revision 11193) @@ -313,5 +313,5 @@ } - if (!detRunInsert(dbh, -32, -32, "a string", "a string", "a string", "a string", "a string", "a string", 32.32, 32.32, 32.32, 64.64, "a string", "0001-01-01T00:00:00Z", "0001-01-01T00:00:00Z", "0001-01-01T00:00:00Z")) { + if (!detRunInsert(dbh, -32, -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")) { exit(EXIT_FAILURE); } Index: /trunk/ippdb/tests/insertobject.c =================================================================== --- /trunk/ippdb/tests/insertobject.c (revision 11192) +++ /trunk/ippdb/tests/insertobject.c (revision 11193) @@ -454,5 +454,5 @@ } - object = detRunRowAlloc(-32, -32, "a string", "a string", "a string", "a string", "a string", "a string", 32.32, 32.32, 32.32, 64.64, "a string", "0001-01-01T00:00:00Z", "0001-01-01T00:00:00Z", "0001-01-01T00:00:00Z"); + object = detRunRowAlloc(-32, -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"); if (!object) { exit(EXIT_FAILURE); Index: /trunk/ippdb/tests/metadatafromobject.c =================================================================== --- /trunk/ippdb/tests/metadatafromobject.c (revision 11192) +++ /trunk/ippdb/tests/metadatafromobject.c (revision 11193) @@ -989,5 +989,5 @@ bool status; - object = detRunRowAlloc(-32, -32, "a string", "a string", "a string", "a string", "a string", "a string", 32.32, 32.32, 32.32, 64.64, "a string", "0001-01-01T00:00:00Z", "0001-01-01T00:00:00Z", "0001-01-01T00:00:00Z"); + object = detRunRowAlloc(-32, -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"); if (!object) { exit(EXIT_FAILURE); @@ -1021,33 +1021,59 @@ exit(EXIT_FAILURE); } + if (strncmp(psMetadataLookupPtr(&status, md, "workdir"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "camera"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "telescope"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } if (strncmp(psMetadataLookupPtr(&status, md, "exp_type"), "a string", MAX_STRING_LENGTH)) { psFree(md); exit(EXIT_FAILURE); } - if (strncmp(psMetadataLookupPtr(&status, md, "workdir"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } if (strncmp(psMetadataLookupPtr(&status, md, "filter"), "a string", MAX_STRING_LENGTH)) { psFree(md); exit(EXIT_FAILURE); } - if (!psMetadataLookupF32(&status, md, "airmass") == 32.32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupF32(&status, md, "exp_time") == 32.32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupF32(&status, md, "ccd_temp") == 32.32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupF64(&status, md, "posang") == 64.64) { - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "object"), "a string", MAX_STRING_LENGTH)) { + if (!psMetadataLookupF32(&status, md, "airmass_min") == 32.32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF32(&status, md, "airmass_max") == 32.32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF32(&status, md, "exp_time_min") == 32.32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF32(&status, md, "exp_time_max") == 32.32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF32(&status, md, "ccd_temp_min") == 32.32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF32(&status, md, "ccd_temp_max") == 32.32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF64(&status, md, "posang_min") == 64.64) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF64(&status, md, "posang_max") == 64.64) { + psFree(md); + exit(EXIT_FAILURE); + } + psFree(md); + exit(EXIT_FAILURE); + } psFree(md); exit(EXIT_FAILURE); Index: /trunk/ippdb/tests/objectfrommetadata.c =================================================================== --- /trunk/ippdb/tests/objectfrommetadata.c (revision 11192) +++ /trunk/ippdb/tests/objectfrommetadata.c (revision 11193) @@ -1505,33 +1505,59 @@ exit(EXIT_FAILURE); } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "workdir", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "camera", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "telescope", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } if (!psMetadataAddStr(md, PS_LIST_TAIL, "exp_type", 0, NULL, "a string")) { psFree(md); exit(EXIT_FAILURE); } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "workdir", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } if (!psMetadataAddStr(md, PS_LIST_TAIL, "filter", 0, NULL, "a string")) { psFree(md); exit(EXIT_FAILURE); } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "airmass", 0, NULL, 32.32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "exp_time", 0, NULL, 32.32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "ccd_temp", 0, NULL, 32.32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddF64(md, PS_LIST_TAIL, "posang", 0, NULL, 64.64)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "object", 0, NULL, "a string")) { + if (!psMetadataAddF32(md, PS_LIST_TAIL, "airmass_min", 0, NULL, 32.32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF32(md, PS_LIST_TAIL, "airmass_max", 0, NULL, 32.32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF32(md, PS_LIST_TAIL, "exp_time_min", 0, NULL, 32.32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF32(md, PS_LIST_TAIL, "exp_time_max", 0, NULL, 32.32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF32(md, PS_LIST_TAIL, "ccd_temp_min", 0, NULL, 32.32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF32(md, PS_LIST_TAIL, "ccd_temp_max", 0, NULL, 32.32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "posang_min", 0, NULL, 64.64)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "posang_max", 0, NULL, 64.64)) { + psFree(md); + exit(EXIT_FAILURE); + } + psFree(md); + exit(EXIT_FAILURE); + } psFree(md); exit(EXIT_FAILURE); @@ -1575,33 +1601,59 @@ exit(EXIT_FAILURE); } + if (strncmp(object->workdir, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->camera, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->telescope, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } if (strncmp(object->exp_type, "a string", MAX_STRING_LENGTH)) { psFree(object); exit(EXIT_FAILURE); } - if (strncmp(object->workdir, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } if (strncmp(object->filter, "a string", MAX_STRING_LENGTH)) { psFree(object); exit(EXIT_FAILURE); } - if (!object->airmass == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->exp_time == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->ccd_temp == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->posang == 64.64) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->object, "a string", MAX_STRING_LENGTH)) { + if (!object->airmass_min == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->airmass_max == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->exp_time_min == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->exp_time_max == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->ccd_temp_min == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->ccd_temp_max == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->posang_min == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->posang_max == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + psFree(object); + exit(EXIT_FAILURE); + } psFree(object); exit(EXIT_FAILURE);