Index: /trunk/ippdb/configure.ac =================================================================== --- /trunk/ippdb/configure.ac (revision 8227) +++ /trunk/ippdb/configure.ac (revision 8228) @@ -1,5 +1,5 @@ AC_PREREQ(2.59) -AC_INIT([ippdb], [0.0.22], [pan-starrs.ifa.hawaii.edu]) +AC_INIT([ippdb], [0.0.23], [pan-starrs.ifa.hawaii.edu]) AC_CONFIG_SRCDIR([ippdb.pc.in]) Index: /trunk/ippdb/src/ippdb.c =================================================================== --- /trunk/ippdb/src/ippdb.c (revision 8227) +++ /trunk/ippdb/src/ippdb.c (revision 8228) @@ -8010,5 +8010,5 @@ static void rawImfileRowFree(rawImfileRow *object); -rawImfileRow *rawImfileRowAlloc(const char *exp_id, const char *class, const char *class_id, const char *uri) +rawImfileRow *rawImfileRowAlloc(const char *exp_id, const char *class, const char *class_id, const char *uri, 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) { rawImfileRow *object; @@ -8021,4 +8021,16 @@ object->class_id = psStringCopy(class_id); object->uri = psStringCopy(uri); + object->filter = psStringCopy(filter); + object->airmass = airmass; + object->ra = ra; + object->decl = decl; + object->exp_time = exp_time; + object->bg = bg; + object->bg_stdev = bg_stdev; + object->bg_mean_stdev = bg_mean_stdev; + object->alt = alt; + object->az = az; + object->ccd_temp = ccd_temp; + object->posang = posang; return object; @@ -8031,4 +8043,5 @@ psFree(object->class_id); psFree(object->uri); + psFree(object->filter); } @@ -8064,4 +8077,64 @@ return false; } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "filter", 0, NULL, "255")) { + psError(PS_ERR_UNKNOWN, false, "failed to add item filter"); + psFree(md); + return false; + } + if (!psMetadataAddF32(md, PS_LIST_TAIL, "airmass", 0, NULL, 0.0)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item airmass"); + psFree(md); + return false; + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "ra", 0, NULL, 0.0)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item ra"); + psFree(md); + return false; + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "decl", 0, NULL, 0.0)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item decl"); + psFree(md); + return false; + } + if (!psMetadataAddF32(md, PS_LIST_TAIL, "exp_time", 0, NULL, 0.0)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item exp_time"); + psFree(md); + return false; + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "bg", 0, NULL, 0.0)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item bg"); + psFree(md); + return false; + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "bg_stdev", 0, NULL, 0.0)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item bg_stdev"); + psFree(md); + return false; + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "bg_mean_stdev", 0, NULL, 0.0)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item bg_mean_stdev"); + psFree(md); + return false; + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "alt", 0, NULL, 0.0)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item alt"); + psFree(md); + return false; + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "az", 0, NULL, 0.0)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item az"); + psFree(md); + return false; + } + if (!psMetadataAddF32(md, PS_LIST_TAIL, "ccd_temp", 0, NULL, 0.0)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item ccd_temp"); + psFree(md); + return false; + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "posang", 0, NULL, 0.0)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item posang"); + psFree(md); + return false; + } status = psDBCreateTable(dbh, RAWIMFILE_TABLE_NAME, md); @@ -8077,5 +8150,5 @@ } -bool rawImfileInsert(psDB * dbh, const char *exp_id, const char *class, const char *class_id, const char *uri) +bool rawImfileInsert(psDB * dbh, const char *exp_id, const char *class, const char *class_id, const char *uri, 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) { psMetadata *md; @@ -8100,4 +8173,64 @@ if (!psMetadataAddStr(md, PS_LIST_TAIL, "uri", 0, NULL, uri)) { psError(PS_ERR_UNKNOWN, false, "failed to add item uri"); + psFree(md); + return false; + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "filter", 0, NULL, filter)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item filter"); + psFree(md); + return false; + } + if (!psMetadataAddF32(md, PS_LIST_TAIL, "airmass", 0, NULL, airmass)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item airmass"); + psFree(md); + return false; + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "ra", 0, NULL, ra)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item ra"); + psFree(md); + return false; + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "decl", 0, NULL, decl)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item decl"); + psFree(md); + return false; + } + if (!psMetadataAddF32(md, PS_LIST_TAIL, "exp_time", 0, NULL, exp_time)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item exp_time"); + psFree(md); + return false; + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "bg", 0, NULL, bg)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item bg"); + psFree(md); + return false; + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "bg_stdev", 0, NULL, bg_stdev)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item bg_stdev"); + psFree(md); + return false; + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "bg_mean_stdev", 0, NULL, bg_mean_stdev)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item bg_mean_stdev"); + psFree(md); + return false; + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "alt", 0, NULL, alt)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item alt"); + psFree(md); + return false; + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "az", 0, NULL, az)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item az"); + psFree(md); + return false; + } + if (!psMetadataAddF32(md, PS_LIST_TAIL, "ccd_temp", 0, NULL, ccd_temp)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item ccd_temp"); + psFree(md); + return false; + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "posang", 0, NULL, posang)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item posang"); psFree(md); return false; @@ -8124,5 +8257,5 @@ return deleted; } -bool rawImfilePop(psDB *dbh, char **exp_id, char **class, char **class_id, char **uri) +bool rawImfilePop(psDB *dbh, char **exp_id, char **class, char **class_id, char **uri, 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) { psArray *rowSet; @@ -8192,4 +8325,76 @@ return false; } + *filter = psMetadataLookupPtr(&status, row, "filter"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item filter"); + psFree(row); + return false; + } + *airmass = psMetadataLookupF32(&status, row, "airmass"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item airmass"); + psFree(row); + return false; + } + *ra = psMetadataLookupF64(&status, row, "ra"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item ra"); + psFree(row); + return false; + } + *decl = psMetadataLookupF64(&status, row, "decl"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item decl"); + psFree(row); + return false; + } + *exp_time = psMetadataLookupF32(&status, row, "exp_time"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item exp_time"); + psFree(row); + return false; + } + *bg = psMetadataLookupF64(&status, row, "bg"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item bg"); + psFree(row); + return false; + } + *bg_stdev = psMetadataLookupF64(&status, row, "bg_stdev"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item bg_stdev"); + psFree(row); + return false; + } + *bg_mean_stdev = psMetadataLookupF64(&status, row, "bg_mean_stdev"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item bg_mean_stdev"); + psFree(row); + return false; + } + *alt = psMetadataLookupF64(&status, row, "alt"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item alt"); + psFree(row); + return false; + } + *az = psMetadataLookupF64(&status, row, "az"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item az"); + psFree(row); + return false; + } + *ccd_temp = psMetadataLookupF32(&status, row, "ccd_temp"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item ccd_temp"); + psFree(row); + return false; + } + *posang = psMetadataLookupF64(&status, row, "posang"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item posang"); + psFree(row); + return false; + } psFree(row); @@ -8200,5 +8405,5 @@ bool rawImfileInsertObject(psDB *dbh, rawImfileRow *object) { - return rawImfileInsert(dbh, object->exp_id, object->class, object->class_id, object->uri); + return rawImfileInsert(dbh, object->exp_id, object->class, object->class_id, object->uri, 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); } @@ -8209,11 +8414,23 @@ char class_id[256]; char uri[256]; - - if (!rawImfilePop(dbh, (char **)&exp_id, (char **)&class, (char **)&class_id, (char **)&uri)) { + char filter[256]; + 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; + + if (!rawImfilePop(dbh, (char **)&exp_id, (char **)&class, (char **)&class_id, (char **)&uri, (char **)&filter, &airmass, &ra, &decl, &exp_time, &bg, &bg_stdev, &bg_mean_stdev, &alt, &az, &ccd_temp, &posang)) { psError(PS_ERR_UNKNOWN, false, "failed to pop a database row"); return NULL; } - return rawImfileRowAlloc(exp_id, class, class_id, uri); + return rawImfileRowAlloc(exp_id, class, class_id, uri, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang); } @@ -8334,4 +8551,64 @@ return NULL; } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "filter", 0, NULL, object->filter)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item filter"); + psFree(md); + return NULL; + } + if (!psMetadataAddF32(md, PS_LIST_TAIL, "airmass", 0, NULL, object->airmass)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item airmass"); + psFree(md); + return NULL; + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "ra", 0, NULL, object->ra)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item ra"); + psFree(md); + return NULL; + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "decl", 0, NULL, object->decl)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item decl"); + psFree(md); + return NULL; + } + if (!psMetadataAddF32(md, PS_LIST_TAIL, "exp_time", 0, NULL, object->exp_time)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item exp_time"); + psFree(md); + return NULL; + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "bg", 0, NULL, object->bg)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item bg"); + psFree(md); + return NULL; + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "bg_stdev", 0, NULL, object->bg_stdev)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item bg_stdev"); + psFree(md); + return NULL; + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "bg_mean_stdev", 0, NULL, object->bg_mean_stdev)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item bg_mean_stdev"); + psFree(md); + return NULL; + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "alt", 0, NULL, object->alt)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item alt"); + psFree(md); + return NULL; + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "az", 0, NULL, object->az)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item az"); + psFree(md); + return NULL; + } + if (!psMetadataAddF32(md, PS_LIST_TAIL, "ccd_temp", 0, NULL, object->ccd_temp)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item ccd_temp"); + psFree(md); + return NULL; + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "posang", 0, NULL, object->posang)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item posang"); + psFree(md); + return NULL; + } return md; @@ -8345,4 +8622,16 @@ char *class_id; char *uri; + 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; exp_id = psMetadataLookupPtr(&status, md, "exp_id"); @@ -8366,6 +8655,66 @@ return false; } - - return rawImfileRowAlloc(exp_id, class, class_id, uri); + filter = psMetadataLookupPtr(&status, md, "filter"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item filter"); + return false; + } + airmass = psMetadataLookupF32(&status, md, "airmass"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item airmass"); + return false; + } + ra = psMetadataLookupF64(&status, md, "ra"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item ra"); + return false; + } + decl = psMetadataLookupF64(&status, md, "decl"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item decl"); + return false; + } + exp_time = psMetadataLookupF32(&status, md, "exp_time"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item exp_time"); + return false; + } + bg = psMetadataLookupF64(&status, md, "bg"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item bg"); + return false; + } + bg_stdev = psMetadataLookupF64(&status, md, "bg_stdev"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item bg_stdev"); + return false; + } + bg_mean_stdev = psMetadataLookupF64(&status, md, "bg_mean_stdev"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item bg_mean_stdev"); + return false; + } + alt = psMetadataLookupF64(&status, md, "alt"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item alt"); + return false; + } + az = psMetadataLookupF64(&status, md, "az"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item az"); + return false; + } + ccd_temp = psMetadataLookupF32(&status, md, "ccd_temp"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item ccd_temp"); + return false; + } + posang = psMetadataLookupF64(&status, md, "posang"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item posang"); + return false; + } + + return rawImfileRowAlloc(exp_id, class, class_id, uri, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang); } psArray *rawImfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) Index: /trunk/ippdb/src/ippdb.h =================================================================== --- /trunk/ippdb/src/ippdb.h (revision 8227) +++ /trunk/ippdb/src/ippdb.h (revision 8228) @@ -3304,4 +3304,16 @@ char *class_id; char *uri; + 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; } rawImfileRow; @@ -3315,5 +3327,17 @@ const char *class, const char *class_id, - const char *uri + const char *uri, + 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 ); @@ -3348,5 +3372,17 @@ const char *class, const char *class_id, - const char *uri + const char *uri, + 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 ); @@ -3372,5 +3408,17 @@ char **class, char **class_id, - char **uri + char **uri, + 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 ); Index: /trunk/ippdb/tests/alloc.c =================================================================== --- /trunk/ippdb/tests/alloc.c (revision 8227) +++ /trunk/ippdb/tests/alloc.c (revision 8228) @@ -597,5 +597,5 @@ rawImfileRow *object; - object = rawImfileRowAlloc("a string", "a string", "a string", "a string" ); + 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 ); if (!object) { @@ -616,4 +616,52 @@ } if (strncmp(object->uri, "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->ra == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->decl == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->exp_time == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->bg == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->bg_stdev == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->bg_mean_stdev == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->alt == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->az == 64.64) { + 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); Index: /trunk/ippdb/tests/insert.c =================================================================== --- /trunk/ippdb/tests/insert.c (revision 8227) +++ /trunk/ippdb/tests/insert.c (revision 8228) @@ -238,5 +238,5 @@ } - if (!rawImfileInsert(dbh, "a string", "a string", "a string", "a string")) { + 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)) { exit(EXIT_FAILURE); } Index: /trunk/ippdb/tests/insertobject.c =================================================================== --- /trunk/ippdb/tests/insertobject.c (revision 8227) +++ /trunk/ippdb/tests/insertobject.c (revision 8228) @@ -344,5 +344,5 @@ } - object = rawImfileRowAlloc("a string", "a string", "a string", "a string"); + 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); if (!object) { exit(EXIT_FAILURE); Index: /trunk/ippdb/tests/metadatafromobject.c =================================================================== --- /trunk/ippdb/tests/metadatafromobject.c (revision 8227) +++ /trunk/ippdb/tests/metadatafromobject.c (revision 8228) @@ -720,5 +720,5 @@ bool status; - object = rawImfileRowAlloc("a string", "a string", "a string", "a string"); + 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); if (!object) { exit(EXIT_FAILURE); @@ -745,4 +745,52 @@ } if (strncmp(psMetadataLookupPtr(&status, md, "uri"), "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 (!psMetadataLookupF64(&status, md, "ra") == 64.64) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF64(&status, md, "decl") == 64.64) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF32(&status, md, "exp_time") == 32.32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF64(&status, md, "bg") == 64.64) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF64(&status, md, "bg_stdev") == 64.64) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF64(&status, md, "bg_mean_stdev") == 64.64) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF64(&status, md, "alt") == 64.64) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF64(&status, md, "az") == 64.64) { + 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); Index: /trunk/ippdb/tests/objectfrommetadata.c =================================================================== --- /trunk/ippdb/tests/objectfrommetadata.c (revision 8227) +++ /trunk/ippdb/tests/objectfrommetadata.c (revision 8228) @@ -1083,4 +1083,52 @@ 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 (!psMetadataAddF64(md, PS_LIST_TAIL, "ra", 0, NULL, 64.64)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "decl", 0, NULL, 64.64)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF32(md, PS_LIST_TAIL, "exp_time", 0, NULL, 32.32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "bg", 0, NULL, 64.64)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "bg_stdev", 0, NULL, 64.64)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "bg_mean_stdev", 0, NULL, 64.64)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "alt", 0, NULL, 64.64)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "az", 0, NULL, 64.64)) { + 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); + } object = rawImfileObjectFromMetadata(md); @@ -1105,4 +1153,52 @@ } if (strncmp(object->uri, "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->ra == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->decl == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->exp_time == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->bg == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->bg_stdev == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->bg_mean_stdev == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->alt == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->az == 64.64) { + 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); Index: /trunk/ippdb/tests/pop.c =================================================================== --- /trunk/ippdb/tests/pop.c (revision 8227) +++ /trunk/ippdb/tests/pop.c (revision 8228) @@ -334,11 +334,23 @@ char class_id[256]; char uri[256]; - - dbh = psDBInit("localhost", "test", NULL, "test"); - if (!dbh) { - exit(EXIT_FAILURE); - } - - if (!rawImfilePop(dbh, (char **)&exp_id, (char **)&class, (char **)&class_id, (char **)&uri)) { + char filter[256]; + 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; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if (!rawImfilePop(dbh, (char **)&exp_id, (char **)&class, (char **)&class_id, (char **)&uri, (char **)&filter, &airmass, &ra, &decl, &exp_time, &bg, &bg_stdev, &bg_mean_stdev, &alt, &az, &ccd_temp, &posang)) { exit(EXIT_FAILURE); }