Index: trunk/ippdb/src/ippdb.c =================================================================== --- trunk/ippdb/src/ippdb.c (revision 8306) +++ trunk/ippdb/src/ippdb.c (revision 8319) @@ -8793,5 +8793,5 @@ static void rawImfileRowFree(rawImfileRow *object); -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 *rawImfileRowAlloc(const char *exp_id, const char *class, const char *class_id, const char *exp_type, 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; @@ -8803,4 +8803,5 @@ object->class = psStringCopy(class); object->class_id = psStringCopy(class_id); + object->exp_type = psStringCopy(exp_type); object->uri = psStringCopy(uri); object->filter = psStringCopy(filter); @@ -8825,4 +8826,5 @@ psFree(object->class); psFree(object->class_id); + psFree(object->exp_type); psFree(object->uri); psFree(object->filter); @@ -8855,4 +8857,9 @@ return false; } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "exp_type", 0, NULL, "64")) { + psError(PS_ERR_UNKNOWN, false, "failed to add item exp_type"); + psFree(md); + return false; + } if (!psMetadataAddStr(md, PS_LIST_TAIL, "uri", 0, NULL, "255")) { psError(PS_ERR_UNKNOWN, false, "failed to add item uri"); @@ -8933,5 +8940,5 @@ } -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) +bool rawImfileInsert(psDB * dbh, const char *exp_id, const char *class, const char *class_id, const char *exp_type, 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; @@ -8951,4 +8958,9 @@ if (!psMetadataAddStr(md, PS_LIST_TAIL, "class_id", 0, NULL, class_id)) { psError(PS_ERR_UNKNOWN, false, "failed to add item class_id"); + psFree(md); + return false; + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "exp_type", 0, NULL, exp_type)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item exp_type"); psFree(md); return false; @@ -9040,5 +9052,5 @@ return deleted; } -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) +bool rawImfilePop(psDB *dbh, char **exp_id, char **class, char **class_id, char **exp_type, 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; @@ -9102,4 +9114,10 @@ return false; } + *exp_type = psMetadataLookupPtr(&status, row, "exp_type"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item exp_type"); + psFree(row); + return false; + } *uri = psMetadataLookupPtr(&status, row, "uri"); if (!status) { @@ -9188,5 +9206,5 @@ bool rawImfileInsertObject(psDB *dbh, rawImfileRow *object) { - 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); + return rawImfileInsert(dbh, object->exp_id, object->class, object->class_id, object->exp_type, 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); } @@ -9207,4 +9225,5 @@ char class[256]; char class_id[256]; + char exp_type[256]; char uri[256]; char filter[256]; @@ -9221,10 +9240,10 @@ 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)) { + if (!rawImfilePop(dbh, (char **)&exp_id, (char **)&class, (char **)&class_id, (char **)&exp_type, (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, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang); + return rawImfileRowAlloc(exp_id, class, class_id, exp_type, uri, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang); } @@ -9340,4 +9359,9 @@ return NULL; } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "exp_type", 0, NULL, object->exp_type)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item exp_type"); + psFree(md); + return NULL; + } if (!psMetadataAddStr(md, PS_LIST_TAIL, "uri", 0, NULL, object->uri)) { psError(PS_ERR_UNKNOWN, false, "failed to add item uri"); @@ -9415,4 +9439,5 @@ char *class; char *class_id; + char *exp_type; char *uri; char *filter; @@ -9444,4 +9469,9 @@ return false; } + exp_type = psMetadataLookupPtr(&status, md, "exp_type"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item exp_type"); + return false; + } uri = psMetadataLookupPtr(&status, md, "uri"); if (!status) { @@ -9510,5 +9540,5 @@ } - 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); + return rawImfileRowAlloc(exp_id, class, class_id, exp_type, 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) @@ -13461,5 +13491,5 @@ static void detProcessedImfileRowFree(detProcessedImfileRow *object); -detProcessedImfileRow *detProcessedImfileRowAlloc(psS32 det_id, const char *exp_id, const char *class_id, const char *uri, const char *recipe) +detProcessedImfileRow *detProcessedImfileRowAlloc(psS32 det_id, const char *exp_id, const char *class_id, const char *uri, const char *recipe, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev) { detProcessedImfileRow *object; @@ -13473,4 +13503,7 @@ object->uri = psStringCopy(uri); object->recipe = psStringCopy(recipe); + object->bg = bg; + object->bg_stdev = bg_stdev; + object->bg_mean_stdev = bg_mean_stdev; return object; @@ -13521,4 +13554,19 @@ 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; + } status = psDBCreateTable(dbh, DETPROCESSEDIMFILE_TABLE_NAME, md); @@ -13534,5 +13582,5 @@ } -bool detProcessedImfileInsert(psDB * dbh, psS32 det_id, const char *exp_id, const char *class_id, const char *uri, const char *recipe) +bool detProcessedImfileInsert(psDB * dbh, psS32 det_id, const char *exp_id, const char *class_id, const char *uri, const char *recipe, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev) { psMetadata *md; @@ -13562,4 +13610,19 @@ if (!psMetadataAddStr(md, PS_LIST_TAIL, "recipe", 0, NULL, recipe)) { psError(PS_ERR_UNKNOWN, false, "failed to add item recipe"); + 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; @@ -13586,5 +13649,5 @@ return deleted; } -bool detProcessedImfilePop(psDB *dbh, psS32 *det_id, char **exp_id, char **class_id, char **uri, char **recipe) +bool detProcessedImfilePop(psDB *dbh, psS32 *det_id, char **exp_id, char **class_id, char **uri, char **recipe, psF64 *bg, psF64 *bg_stdev, psF64 *bg_mean_stdev) { psArray *rowSet; @@ -13660,4 +13723,22 @@ 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; + } psFree(row); @@ -13668,5 +13749,5 @@ bool detProcessedImfileInsertObject(psDB *dbh, detProcessedImfileRow *object) { - return detProcessedImfileInsert(dbh, object->det_id, object->exp_id, object->class_id, object->uri, object->recipe); + return detProcessedImfileInsert(dbh, object->det_id, object->exp_id, object->class_id, object->uri, object->recipe, object->bg, object->bg_stdev, object->bg_mean_stdev); } @@ -13689,11 +13770,14 @@ char uri[256]; char recipe[256]; - - if (!detProcessedImfilePop(dbh, &det_id, (char **)&exp_id, (char **)&class_id, (char **)&uri, (char **)&recipe)) { + psF64 bg; + psF64 bg_stdev; + psF64 bg_mean_stdev; + + if (!detProcessedImfilePop(dbh, &det_id, (char **)&exp_id, (char **)&class_id, (char **)&uri, (char **)&recipe, &bg, &bg_stdev, &bg_mean_stdev)) { psError(PS_ERR_UNKNOWN, false, "failed to pop a database row"); return NULL; } - return detProcessedImfileRowAlloc(det_id, exp_id, class_id, uri, recipe); + return detProcessedImfileRowAlloc(det_id, exp_id, class_id, uri, recipe, bg, bg_stdev, bg_mean_stdev); } @@ -13819,4 +13903,19 @@ 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; + } return md; @@ -13831,4 +13930,7 @@ char *uri; char *recipe; + psF64 bg; + psF64 bg_stdev; + psF64 bg_mean_stdev; det_id = psMetadataLookupS32(&status, md, "det_id"); @@ -13857,6 +13959,21 @@ return false; } - - return detProcessedImfileRowAlloc(det_id, exp_id, class_id, uri, recipe); + 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; + } + + return detProcessedImfileRowAlloc(det_id, exp_id, class_id, uri, recipe, bg, bg_stdev, bg_mean_stdev); } psArray *detProcessedImfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)