Index: trunk/ippdb/Makefile.am =================================================================== --- trunk/ippdb/Makefile.am (revision 8380) +++ trunk/ippdb/Makefile.am (revision 8528) @@ -41,8 +41,9 @@ $(top_builddir)/docs/man/man3/detMasterImfileRow.3 \ $(top_builddir)/docs/man/man3/detResidImfileRow.3 \ - $(top_builddir)/docs/man/man3/detResidExpRow.3 + $(top_builddir)/docs/man/man3/detResidExpRow.3 \ + $(top_builddir)/docs/man/man3/detRunSummaryRow.3 -docs/man/man3/ippdb.3 docs/man/man3/weatherRow.3 docs/man/man3/skyp_transparencyRow.3 docs/man/man3/skyp_absorptionRow.3 docs/man/man3/skyp_emissionRow.3 docs/man/man3/dimmRow.3 docs/man/man3/skyp_irRow.3 docs/man/man3/domeRow.3 docs/man/man3/telescopeRow.3 docs/man/man3/summitExpRow.3 docs/man/man3/pzPendingExpRow.3 docs/man/man3/pzPendingImfileRow.3 docs/man/man3/newExpRow.3 docs/man/man3/newImfileRow.3 docs/man/man3/rawDetrendExpRow.3 docs/man/man3/rawScienceExpRow.3 docs/man/man3/rawImfileRow.3 docs/man/man3/p1PendingExpRow.3 docs/man/man3/p2PendingExpRow.3 docs/man/man3/p2PendingImfileRow.3 docs/man/man3/p2DoneExpRow.3 docs/man/man3/p2DoneImfileRow.3 docs/man/man3/p3PendingExpRow.3 docs/man/man3/detRunRow.3 docs/man/man3/detInputExpRow.3 docs/man/man3/detProcessedImfileRow.3 docs/man/man3/detStackedImfileRow.3 docs/man/man3/detNormalizedStatImfileRow.3 docs/man/man3/detNormalizedImfileRow.3 docs/man/man3/detMasterFrameRow.3 docs/man/man3/detMasterImfileRow.3 docs/man/man3/detResidImfileRow.3 docs/man/man3/detResidExpRow.3: +docs/man/man3/ippdb.3 docs/man/man3/weatherRow.3 docs/man/man3/skyp_transparencyRow.3 docs/man/man3/skyp_absorptionRow.3 docs/man/man3/skyp_emissionRow.3 docs/man/man3/dimmRow.3 docs/man/man3/skyp_irRow.3 docs/man/man3/domeRow.3 docs/man/man3/telescopeRow.3 docs/man/man3/summitExpRow.3 docs/man/man3/pzPendingExpRow.3 docs/man/man3/pzPendingImfileRow.3 docs/man/man3/newExpRow.3 docs/man/man3/newImfileRow.3 docs/man/man3/rawDetrendExpRow.3 docs/man/man3/rawScienceExpRow.3 docs/man/man3/rawImfileRow.3 docs/man/man3/p1PendingExpRow.3 docs/man/man3/p2PendingExpRow.3 docs/man/man3/p2PendingImfileRow.3 docs/man/man3/p2DoneExpRow.3 docs/man/man3/p2DoneImfileRow.3 docs/man/man3/p3PendingExpRow.3 docs/man/man3/detRunRow.3 docs/man/man3/detInputExpRow.3 docs/man/man3/detProcessedImfileRow.3 docs/man/man3/detStackedImfileRow.3 docs/man/man3/detNormalizedStatImfileRow.3 docs/man/man3/detNormalizedImfileRow.3 docs/man/man3/detMasterFrameRow.3 docs/man/man3/detMasterImfileRow.3 docs/man/man3/detResidImfileRow.3 docs/man/man3/detResidExpRow.3 docs/man/man3/detRunSummaryRow.3: $(DOXYGEN) Index: trunk/ippdb/configure.ac =================================================================== --- trunk/ippdb/configure.ac (revision 8380) +++ trunk/ippdb/configure.ac (revision 8528) @@ -1,5 +1,5 @@ AC_PREREQ(2.59) -AC_INIT([ippdb], [0.0.30], [pan-starrs.ifa.hawaii.edu]) +AC_INIT([ippdb], [0.0.32], [pan-starrs.ifa.hawaii.edu]) AC_CONFIG_SRCDIR([ippdb.pc.in]) Index: trunk/ippdb/src/ippdb.c =================================================================== --- trunk/ippdb/src/ippdb.c (revision 8380) +++ trunk/ippdb/src/ippdb.c (revision 8528) @@ -68,4 +68,6 @@ #define DETRESIDEXP_TABLE_NAME "detResidExp" #define DETRESIDEXP_INDEX_NAME IPPDB_DEFAULT_INDEX_NAME +#define DETRUNSUMMARY_TABLE_NAME "detRunSummary" +#define DETRUNSUMMARY_INDEX_NAME IPPDB_DEFAULT_INDEX_NAME #define MAX_STRING_LENGTH 1024 @@ -12607,5 +12609,5 @@ return false; } - if (!psMetadataAddS32(md, PS_LIST_TAIL, "iteration", 0, NULL, 0)) { + if (!psMetadataAddS32(md, PS_LIST_TAIL, "iteration", 0, "Key", 0)) { psError(PS_ERR_UNKNOWN, false, "failed to add item iteration"); psFree(md); @@ -12992,5 +12994,5 @@ static void detInputExpRowFree(detInputExpRow *object); -detInputExpRow *detInputExpRowAlloc(psS32 det_id, psS32 iteration, const char *exp_id, bool include, bool accept) +detInputExpRow *detInputExpRowAlloc(psS32 det_id, psS32 iteration, const char *exp_id, bool include) { detInputExpRow *object; @@ -13003,5 +13005,4 @@ object->exp_id = psStringCopy(exp_id); object->include = include; - object->accept = accept; return object; @@ -13044,9 +13045,4 @@ return false; } - if (!psMetadataAdd(md, PS_LIST_TAIL, "accept", PS_DATA_BOOL, NULL, false)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item accept"); - psFree(md); - return false; - } status = psDBCreateTable(dbh, DETINPUTEXP_TABLE_NAME, md); @@ -13062,5 +13058,5 @@ } -bool detInputExpInsert(psDB * dbh, psS32 det_id, psS32 iteration, const char *exp_id, bool include, bool accept) +bool detInputExpInsert(psDB * dbh, psS32 det_id, psS32 iteration, const char *exp_id, bool include) { psMetadata *md; @@ -13085,9 +13081,4 @@ if (!psMetadataAdd(md, PS_LIST_TAIL, "include", PS_DATA_BOOL, NULL, include)) { psError(PS_ERR_UNKNOWN, false, "failed to add item include"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "accept", PS_DATA_BOOL, NULL, accept)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item accept"); psFree(md); return false; @@ -13114,5 +13105,5 @@ return deleted; } -bool detInputExpPop(psDB *dbh, psS32 *det_id, psS32 *iteration, char **exp_id, bool *include, bool *accept) +bool detInputExpPop(psDB *dbh, psS32 *det_id, psS32 *iteration, char **exp_id, bool *include) { psArray *rowSet; @@ -13182,10 +13173,4 @@ return false; } - *accept = psMetadataLookupBool(&status, row, "accept"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item accept"); - psFree(row); - return false; - } psFree(row); @@ -13196,5 +13181,5 @@ bool detInputExpInsertObject(psDB *dbh, detInputExpRow *object) { - return detInputExpInsert(dbh, object->det_id, object->iteration, object->exp_id, object->include, object->accept); + return detInputExpInsert(dbh, object->det_id, object->iteration, object->exp_id, object->include); } @@ -13216,12 +13201,11 @@ char exp_id[256]; bool include; - bool accept; - - if (!detInputExpPop(dbh, &det_id, &iteration, (char **)&exp_id, &include, &accept)) { + + if (!detInputExpPop(dbh, &det_id, &iteration, (char **)&exp_id, &include)) { psError(PS_ERR_UNKNOWN, false, "failed to pop a database row"); return NULL; } - return detInputExpRowAlloc(det_id, iteration, exp_id, include, accept); + return detInputExpRowAlloc(det_id, iteration, exp_id, include); } @@ -13342,9 +13326,4 @@ return NULL; } - if (!psMetadataAdd(md, PS_LIST_TAIL, "accept", PS_DATA_BOOL, NULL, object->accept)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item accept"); - psFree(md); - return NULL; - } return md; @@ -13358,5 +13337,4 @@ char *exp_id; bool include; - bool accept; det_id = psMetadataLookupS32(&status, md, "det_id"); @@ -13380,11 +13358,6 @@ return false; } - accept = psMetadataLookupBool(&status, md, "accept"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item accept"); - return false; - } - - return detInputExpRowAlloc(det_id, iteration, exp_id, include, accept); + + return detInputExpRowAlloc(det_id, iteration, exp_id, include); } psArray *detInputExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) @@ -14084,5 +14057,5 @@ static void detStackedImfileRowFree(detStackedImfileRow *object); -detStackedImfileRow *detStackedImfileRowAlloc(psS32 det_id, psS32 iteration, const char *class_id, const char *uri, const char *recipe) +detStackedImfileRow *detStackedImfileRowAlloc(psS32 det_id, psS32 iteration, const char *class_id, const char *uri, const char *recipe, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev) { detStackedImfileRow *object; @@ -14096,4 +14069,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; @@ -14143,4 +14119,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, DETSTACKEDIMFILE_TABLE_NAME, md); @@ -14156,5 +14147,5 @@ } -bool detStackedImfileInsert(psDB * dbh, psS32 det_id, psS32 iteration, const char *class_id, const char *uri, const char *recipe) +bool detStackedImfileInsert(psDB * dbh, psS32 det_id, psS32 iteration, const char *class_id, const char *uri, const char *recipe, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev) { psMetadata *md; @@ -14184,4 +14175,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; @@ -14208,5 +14214,5 @@ return deleted; } -bool detStackedImfilePop(psDB *dbh, psS32 *det_id, psS32 *iteration, char **class_id, char **uri, char **recipe) +bool detStackedImfilePop(psDB *dbh, psS32 *det_id, psS32 *iteration, char **class_id, char **uri, char **recipe, psF64 *bg, psF64 *bg_stdev, psF64 *bg_mean_stdev) { psArray *rowSet; @@ -14282,4 +14288,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); @@ -14290,5 +14314,5 @@ bool detStackedImfileInsertObject(psDB *dbh, detStackedImfileRow *object) { - return detStackedImfileInsert(dbh, object->det_id, object->iteration, object->class_id, object->uri, object->recipe); + return detStackedImfileInsert(dbh, object->det_id, object->iteration, object->class_id, object->uri, object->recipe, object->bg, object->bg_stdev, object->bg_mean_stdev); } @@ -14311,11 +14335,14 @@ char uri[256]; char recipe[256]; - - if (!detStackedImfilePop(dbh, &det_id, &iteration, (char **)&class_id, (char **)&uri, (char **)&recipe)) { + psF64 bg; + psF64 bg_stdev; + psF64 bg_mean_stdev; + + if (!detStackedImfilePop(dbh, &det_id, &iteration, (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 detStackedImfileRowAlloc(det_id, iteration, class_id, uri, recipe); + return detStackedImfileRowAlloc(det_id, iteration, class_id, uri, recipe, bg, bg_stdev, bg_mean_stdev); } @@ -14441,4 +14468,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; @@ -14453,4 +14495,7 @@ char *uri; char *recipe; + psF64 bg; + psF64 bg_stdev; + psF64 bg_mean_stdev; det_id = psMetadataLookupS32(&status, md, "det_id"); @@ -14479,6 +14524,21 @@ return false; } - - return detStackedImfileRowAlloc(det_id, iteration, 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 detStackedImfileRowAlloc(det_id, iteration, class_id, uri, recipe, bg, bg_stdev, bg_mean_stdev); } psArray *detStackedImfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) @@ -16449,5 +16509,5 @@ static void detResidImfileRowFree(detResidImfileRow *object); -detResidImfileRow *detResidImfileRowAlloc(psS32 det_id, psS32 iteration, const char *exp_id, const char *class_id, const char *recipe, const char *uri, const char *b1_uri, const char *b2_uri) +detResidImfileRow *detResidImfileRowAlloc(psS32 det_id, psS32 iteration, const char *exp_id, const char *class_id, const char *uri, const char *recipe, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, const char *b1_uri, const char *b2_uri) { detResidImfileRow *object; @@ -16460,6 +16520,9 @@ object->exp_id = psStringCopy(exp_id); object->class_id = psStringCopy(class_id); + object->uri = psStringCopy(uri); object->recipe = psStringCopy(recipe); - object->uri = psStringCopy(uri); + object->bg = bg; + object->bg_stdev = bg_stdev; + object->bg_mean_stdev = bg_mean_stdev; object->b1_uri = psStringCopy(b1_uri); object->b2_uri = psStringCopy(b2_uri); @@ -16472,6 +16535,6 @@ psFree(object->exp_id); psFree(object->class_id); + psFree(object->uri); psFree(object->recipe); - psFree(object->uri); psFree(object->b1_uri); psFree(object->b2_uri); @@ -16509,4 +16572,9 @@ return false; } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "uri", 0, NULL, "64")) { + psError(PS_ERR_UNKNOWN, false, "failed to add item uri"); + psFree(md); + return false; + } if (!psMetadataAddStr(md, PS_LIST_TAIL, "recipe", 0, NULL, "64")) { psError(PS_ERR_UNKNOWN, false, "failed to add item recipe"); @@ -16514,6 +16582,16 @@ return false; } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "uri", 0, NULL, "64")) { - psError(PS_ERR_UNKNOWN, false, "failed to add item uri"); + 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; @@ -16542,5 +16620,5 @@ } -bool detResidImfileInsert(psDB * dbh, psS32 det_id, psS32 iteration, const char *exp_id, const char *class_id, const char *recipe, const char *uri, const char *b1_uri, const char *b2_uri) +bool detResidImfileInsert(psDB * dbh, psS32 det_id, psS32 iteration, const char *exp_id, const char *class_id, const char *uri, const char *recipe, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, const char *b1_uri, const char *b2_uri) { psMetadata *md; @@ -16568,4 +16646,9 @@ return false; } + 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, "recipe", 0, NULL, recipe)) { psError(PS_ERR_UNKNOWN, false, "failed to add item recipe"); @@ -16573,6 +16656,16 @@ return false; } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "uri", 0, NULL, uri)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item uri"); + 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; @@ -16609,5 +16702,5 @@ return deleted; } -bool detResidImfilePop(psDB *dbh, psS32 *det_id, psS32 *iteration, char **exp_id, char **class_id, char **recipe, char **uri, char **b1_uri, char **b2_uri) +bool detResidImfilePop(psDB *dbh, psS32 *det_id, psS32 *iteration, char **exp_id, char **class_id, char **uri, char **recipe, psF64 *bg, psF64 *bg_stdev, psF64 *bg_mean_stdev, char **b1_uri, char **b2_uri) { psArray *rowSet; @@ -16677,4 +16770,10 @@ return false; } + *uri = psMetadataLookupPtr(&status, row, "uri"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item uri"); + psFree(row); + return false; + } *recipe = psMetadataLookupPtr(&status, row, "recipe"); if (!status) { @@ -16683,7 +16782,19 @@ return false; } - *uri = psMetadataLookupPtr(&status, row, "uri"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item uri"); + *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; @@ -16709,5 +16820,5 @@ bool detResidImfileInsertObject(psDB *dbh, detResidImfileRow *object) { - return detResidImfileInsert(dbh, object->det_id, object->iteration, object->exp_id, object->class_id, object->recipe, object->uri, object->b1_uri, object->b2_uri); + return detResidImfileInsert(dbh, object->det_id, object->iteration, object->exp_id, object->class_id, object->uri, object->recipe, object->bg, object->bg_stdev, object->bg_mean_stdev, object->b1_uri, object->b2_uri); } @@ -16729,15 +16840,18 @@ char exp_id[256]; char class_id[256]; + char uri[256]; char recipe[256]; - char uri[256]; + psF64 bg; + psF64 bg_stdev; + psF64 bg_mean_stdev; char b1_uri[256]; char b2_uri[256]; - if (!detResidImfilePop(dbh, &det_id, &iteration, (char **)&exp_id, (char **)&class_id, (char **)&recipe, (char **)&uri, (char **)&b1_uri, (char **)&b2_uri)) { + if (!detResidImfilePop(dbh, &det_id, &iteration, (char **)&exp_id, (char **)&class_id, (char **)&uri, (char **)&recipe, &bg, &bg_stdev, &bg_mean_stdev, (char **)&b1_uri, (char **)&b2_uri)) { psError(PS_ERR_UNKNOWN, false, "failed to pop a database row"); return NULL; } - return detResidImfileRowAlloc(det_id, iteration, exp_id, class_id, recipe, uri, b1_uri, b2_uri); + return detResidImfileRowAlloc(det_id, iteration, exp_id, class_id, uri, recipe, bg, bg_stdev, bg_mean_stdev, b1_uri, b2_uri); } @@ -16858,4 +16972,9 @@ return NULL; } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "uri", 0, NULL, object->uri)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item uri"); + psFree(md); + return NULL; + } if (!psMetadataAddStr(md, PS_LIST_TAIL, "recipe", 0, NULL, object->recipe)) { psError(PS_ERR_UNKNOWN, false, "failed to add item recipe"); @@ -16863,6 +16982,16 @@ return NULL; } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "uri", 0, NULL, object->uri)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item uri"); + 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; @@ -16889,6 +17018,9 @@ char *exp_id; char *class_id; + char *uri; char *recipe; - char *uri; + psF64 bg; + psF64 bg_stdev; + psF64 bg_mean_stdev; char *b1_uri; char *b2_uri; @@ -16914,4 +17046,9 @@ return false; } + uri = psMetadataLookupPtr(&status, md, "uri"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item uri"); + return false; + } recipe = psMetadataLookupPtr(&status, md, "recipe"); if (!status) { @@ -16919,7 +17056,17 @@ return false; } - uri = psMetadataLookupPtr(&status, md, "uri"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item uri"); + 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; } @@ -16935,5 +17082,5 @@ } - return detResidImfileRowAlloc(det_id, iteration, exp_id, class_id, recipe, uri, b1_uri, b2_uri); + return detResidImfileRowAlloc(det_id, iteration, exp_id, class_id, uri, recipe, bg, bg_stdev, bg_mean_stdev, b1_uri, b2_uri); } psArray *detResidImfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) @@ -17042,5 +17189,5 @@ static void detResidExpRowFree(detResidExpRow *object); -detResidExpRow *detResidExpRowAlloc(psS32 det_id, psS32 iteration, const char *exp_id, const char *recipe, bool keep, bool accept) +detResidExpRow *detResidExpRowAlloc(psS32 det_id, psS32 iteration, const char *exp_id, const char *recipe, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, const char *b1_uri, const char *b2_uri, bool accept) { detResidExpRow *object; @@ -17053,5 +17200,9 @@ object->exp_id = psStringCopy(exp_id); object->recipe = psStringCopy(recipe); - object->keep = keep; + object->bg = bg; + object->bg_stdev = bg_stdev; + object->bg_mean_stdev = bg_mean_stdev; + object->b1_uri = psStringCopy(b1_uri); + object->b2_uri = psStringCopy(b2_uri); object->accept = accept; @@ -17063,4 +17214,6 @@ psFree(object->exp_id); psFree(object->recipe); + psFree(object->b1_uri); + psFree(object->b2_uri); } @@ -17096,6 +17249,26 @@ return false; } - if (!psMetadataAdd(md, PS_LIST_TAIL, "keep", PS_DATA_BOOL, NULL, false)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item keep"); + 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 (!psMetadataAddStr(md, PS_LIST_TAIL, "b1_uri", 0, NULL, "64")) { + psError(PS_ERR_UNKNOWN, false, "failed to add item b1_uri"); + psFree(md); + return false; + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "b2_uri", 0, NULL, "64")) { + psError(PS_ERR_UNKNOWN, false, "failed to add item b2_uri"); psFree(md); return false; @@ -17119,5 +17292,5 @@ } -bool detResidExpInsert(psDB * dbh, psS32 det_id, psS32 iteration, const char *exp_id, const char *recipe, bool keep, bool accept) +bool detResidExpInsert(psDB * dbh, psS32 det_id, psS32 iteration, const char *exp_id, const char *recipe, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, const char *b1_uri, const char *b2_uri, bool accept) { psMetadata *md; @@ -17145,6 +17318,26 @@ return false; } - if (!psMetadataAdd(md, PS_LIST_TAIL, "keep", PS_DATA_BOOL, NULL, keep)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item keep"); + 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 (!psMetadataAddStr(md, PS_LIST_TAIL, "b1_uri", 0, NULL, b1_uri)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item b1_uri"); + psFree(md); + return false; + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "b2_uri", 0, NULL, b2_uri)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item b2_uri"); psFree(md); return false; @@ -17176,5 +17369,5 @@ return deleted; } -bool detResidExpPop(psDB *dbh, psS32 *det_id, psS32 *iteration, char **exp_id, char **recipe, bool *keep, bool *accept) +bool detResidExpPop(psDB *dbh, psS32 *det_id, psS32 *iteration, char **exp_id, char **recipe, psF64 *bg, psF64 *bg_stdev, psF64 *bg_mean_stdev, char **b1_uri, char **b2_uri, bool *accept) { psArray *rowSet; @@ -17244,7 +17437,31 @@ return false; } - *keep = psMetadataLookupBool(&status, row, "keep"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item keep"); + *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; + } + *b1_uri = psMetadataLookupPtr(&status, row, "b1_uri"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item b1_uri"); + psFree(row); + return false; + } + *b2_uri = psMetadataLookupPtr(&status, row, "b2_uri"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item b2_uri"); psFree(row); return false; @@ -17264,5 +17481,5 @@ bool detResidExpInsertObject(psDB *dbh, detResidExpRow *object) { - return detResidExpInsert(dbh, object->det_id, object->iteration, object->exp_id, object->recipe, object->keep, object->accept); + return detResidExpInsert(dbh, object->det_id, object->iteration, object->exp_id, object->recipe, object->bg, object->bg_stdev, object->bg_mean_stdev, object->b1_uri, object->b2_uri, object->accept); } @@ -17284,13 +17501,17 @@ char exp_id[256]; char recipe[256]; - bool keep; + psF64 bg; + psF64 bg_stdev; + psF64 bg_mean_stdev; + char b1_uri[256]; + char b2_uri[256]; bool accept; - if (!detResidExpPop(dbh, &det_id, &iteration, (char **)&exp_id, (char **)&recipe, &keep, &accept)) { + if (!detResidExpPop(dbh, &det_id, &iteration, (char **)&exp_id, (char **)&recipe, &bg, &bg_stdev, &bg_mean_stdev, (char **)&b1_uri, (char **)&b2_uri, &accept)) { psError(PS_ERR_UNKNOWN, false, "failed to pop a database row"); return NULL; } - return detResidExpRowAlloc(det_id, iteration, exp_id, recipe, keep, accept); + return detResidExpRowAlloc(det_id, iteration, exp_id, recipe, bg, bg_stdev, bg_mean_stdev, b1_uri, b2_uri, accept); } @@ -17411,6 +17632,26 @@ return NULL; } - if (!psMetadataAdd(md, PS_LIST_TAIL, "keep", PS_DATA_BOOL, NULL, object->keep)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item keep"); + 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 (!psMetadataAddStr(md, PS_LIST_TAIL, "b1_uri", 0, NULL, object->b1_uri)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item b1_uri"); + psFree(md); + return NULL; + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "b2_uri", 0, NULL, object->b2_uri)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item b2_uri"); psFree(md); return NULL; @@ -17432,5 +17673,9 @@ char *exp_id; char *recipe; - bool keep; + psF64 bg; + psF64 bg_stdev; + psF64 bg_mean_stdev; + char *b1_uri; + char *b2_uri; bool accept; @@ -17455,7 +17700,27 @@ return false; } - keep = psMetadataLookupBool(&status, md, "keep"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item keep"); + 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; + } + b1_uri = psMetadataLookupPtr(&status, md, "b1_uri"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item b1_uri"); + return false; + } + b2_uri = psMetadataLookupPtr(&status, md, "b2_uri"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item b2_uri"); return false; } @@ -17466,5 +17731,5 @@ } - return detResidExpRowAlloc(det_id, iteration, exp_id, recipe, keep, accept); + return detResidExpRowAlloc(det_id, iteration, exp_id, recipe, bg, bg_stdev, bg_mean_stdev, b1_uri, b2_uri, accept); } psArray *detResidExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) @@ -17571,2 +17836,531 @@ return true; } +static void detRunSummaryRowFree(detRunSummaryRow *object); + +detRunSummaryRow *detRunSummaryRowAlloc(psS32 det_id, psS32 iteration, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, bool accept) +{ + detRunSummaryRow *object; + + object = psAlloc(sizeof(detRunSummaryRow)); + psMemSetDeallocator(object, (psFreeFunc)detRunSummaryRowFree); + + object->det_id = det_id; + object->iteration = iteration; + object->bg = bg; + object->bg_stdev = bg_stdev; + object->bg_mean_stdev = bg_mean_stdev; + object->accept = accept; + + return object; +} + +static void detRunSummaryRowFree(detRunSummaryRow *object) +{ +} + +bool detRunSummaryCreateTable(psDB *dbh) +{ + psMetadata *md; + bool status; + + md = psMetadataAlloc(); + if (!psMetadataAdd(md, PS_LIST_TAIL, DETRUNSUMMARY_INDEX_NAME, PS_DATA_S32, "AUTO_INCREMENT", 0.0)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item %s", DETRUNSUMMARY_INDEX_NAME); + psFree(md); + return false; + } + if (!psMetadataAddS32(md, PS_LIST_TAIL, "det_id", 0, "Primary Key", 0)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item det_id"); + psFree(md); + return false; + } + if (!psMetadataAddS32(md, PS_LIST_TAIL, "iteration", 0, "Primary Key", 0)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item iteration"); + 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 (!psMetadataAdd(md, PS_LIST_TAIL, "accept", PS_DATA_BOOL, NULL, false)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item accept"); + psFree(md); + return false; + } + + status = psDBCreateTable(dbh, DETRUNSUMMARY_TABLE_NAME, md); + + psFree(md); + + return status; +} + +bool detRunSummaryDropTable(psDB *dbh) +{ + return psDBDropTable(dbh, DETRUNSUMMARY_TABLE_NAME); +} + +bool detRunSummaryInsert(psDB * dbh, psS32 det_id, psS32 iteration, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, bool accept) +{ + psMetadata *md; + bool status; + + md = psMetadataAlloc(); + if (!psMetadataAddS32(md, PS_LIST_TAIL, "det_id", 0, NULL, det_id)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item det_id"); + psFree(md); + return false; + } + if (!psMetadataAddS32(md, PS_LIST_TAIL, "iteration", 0, NULL, iteration)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item iteration"); + 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 (!psMetadataAdd(md, PS_LIST_TAIL, "accept", PS_DATA_BOOL, NULL, accept)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item accept"); + psFree(md); + return false; + } + + status = psDBInsertOneRow(dbh, DETRUNSUMMARY_TABLE_NAME, md); + psFree(md); + + return status; +} + +long long detRunSummaryDelete(psDB *dbh, const psMetadata *where, unsigned long long limit) +{ + long long deleted = 0; + + long long count = psDBDeleteRows(dbh, DETRUNSUMMARY_TABLE_NAME, where, limit); + if (count < 0) { + psError(PS_ERR_UNKNOWN, true, "failed to delete row from detRunSummary"); + return count; + + deleted += count; + } + + return deleted; +} +bool detRunSummaryPop(psDB *dbh, psS32 *det_id, psS32 *iteration, psF64 *bg, psF64 *bg_stdev, psF64 *bg_mean_stdev, bool *accept) +{ + psArray *rowSet; + psMetadata *row; + psMetadata *popped; + long deleted; + bool status; + int rowID; + + rowSet = psDBSelectRows(dbh, DETRUNSUMMARY_TABLE_NAME, NULL, 1); + if (!rowSet) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item %s", DETRUNSUMMARY_INDEX_NAME); + psFree(rowSet); + return NULL; + } + + row = psArrayGet(rowSet, 0); + psMemIncrRefCounter(row); + if (!row) { + psError(PS_ERR_UNKNOWN, true, "database error or table is empty"); + return NULL; + } + psFree(rowSet); + + rowID = psMetadataLookupS32(&status, row, DETRUNSUMMARY_INDEX_NAME); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item %s", DETRUNSUMMARY_INDEX_NAME); + psFree(row); + return NULL; + } + + popped = psMetadataAlloc(); + psMetadataAddS32(popped, PS_LIST_TAIL, DETRUNSUMMARY_INDEX_NAME, 0, NULL, rowID); + + deleted = psDBDeleteRows(dbh, DETRUNSUMMARY_TABLE_NAME, popped, 0); + if (deleted != 1) { + psError(PS_ERR_UNKNOWN, false, "database failed to delete row"); + psFree(popped); + psFree(row); + return NULL; + } + + psFree(popped); + + *det_id = psMetadataLookupS32(&status, row, "det_id"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item det_id"); + psFree(row); + return false; + } + *iteration = psMetadataLookupS32(&status, row, "iteration"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item iteration"); + 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; + } + *accept = psMetadataLookupBool(&status, row, "accept"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item accept"); + psFree(row); + return false; + } + + psFree(row); + + return true; +} + +bool detRunSummaryInsertObject(psDB *dbh, detRunSummaryRow *object) +{ + return detRunSummaryInsert(dbh, object->det_id, object->iteration, object->bg, object->bg_stdev, object->bg_mean_stdev, object->accept); +} + +bool detRunSummaryInsertObjects(psDB *dbh, psArray *objects) +{ + for (long i = 0; i < psArrayLength(objects); i++) { + if (!detRunSummaryInsertObject(dbh, objects->data[i])) { + return false; + } + } + + return true; +} + +detRunSummaryRow *detRunSummaryPopObject(psDB *dbh) +{ + psS32 det_id; + psS32 iteration; + psF64 bg; + psF64 bg_stdev; + psF64 bg_mean_stdev; + bool accept; + + if (!detRunSummaryPop(dbh, &det_id, &iteration, &bg, &bg_stdev, &bg_mean_stdev, &accept)) { + psError(PS_ERR_UNKNOWN, false, "failed to pop a database row"); + return NULL; + } + + return detRunSummaryRowAlloc(det_id, iteration, bg, bg_stdev, bg_mean_stdev, accept); +} + +bool detRunSummaryInsertFits(psDB *dbh, const psFits *fits) +{ + psArray *rowSet; + + // move to (the first?) extension named DETRUNSUMMARY_TABLE_NAME + if (!psFitsMoveExtName(fits, DETRUNSUMMARY_TABLE_NAME)) { + psError(PS_ERR_UNKNOWN, true, "failed to find FITS extension %s", DETRUNSUMMARY_TABLE_NAME); + return false; + } + + // check HDU type + if (psFitsGetExtType(fits) != PS_FITS_TYPE_BINARY_TABLE) { + psError(PS_ERR_UNKNOWN, true, "FITS HDU type is not PS_FITS_TYPE_BINARY_TABLE"); + return false; + } + + // read fits table + rowSet = psFitsReadTable(fits); + if (!rowSet) { + psError(PS_ERR_UNKNOWN, true, "FITS read error or FITS table is empty"); + psFree(rowSet); + return false; + } + + if (!psDBInsertRows(dbh, DETRUNSUMMARY_TABLE_NAME, rowSet)) { + psError(PS_ERR_UNKNOWN, false, "databse insert failed"); + psFree(rowSet); + return false; + } + + psFree(rowSet); + + return true; +} + +bool detRunSummaryPopFits(psDB *dbh, psFits *fits, unsigned long long limit) +{ + char query[MAX_STRING_LENGTH]; + + if (!detRunSummarySelectRowsFits(dbh, fits, NULL, limit)) { + psError(PS_ERR_UNKNOWN, true, "database error or table is empty"); + return false; + } + + // remove limit rows from the end of the database + if (snprintf(query, MAX_STRING_LENGTH, + "DELETE FROM %s ORDER BY %s DESC LIMIT %lld", + DETRUNSUMMARY_TABLE_NAME, DETRUNSUMMARY_INDEX_NAME, limit) < 0) { + psError(PS_ERR_UNKNOWN, true, "query value attempted to exceed %s bytes", MAX_STRING_LENGTH); + return false; + } + + if (!p_psDBRunQuery(dbh, query)) { + psError(PS_ERR_UNKNOWN, false, "database query failed"); + return false; + } + + return true; +} + +bool detRunSummarySelectRowsFits(psDB *dbh, psFits *fits, const psMetadata *where, unsigned long long limit) +{ + psArray *rowSet; + psU64 i; + + rowSet = psDBSelectRows(dbh, DETRUNSUMMARY_TABLE_NAME, where, limit); + if (!rowSet) { + return false; + } + + // strip index column + for (i = 0; i < rowSet->n; i++) { + if (!psMetadataRemove((psMetadata *)rowSet->data[i], 0, DETRUNSUMMARY_INDEX_NAME)) { + psError(PS_ERR_UNKNOWN, true, "failed to remove item %s", DETRUNSUMMARY_INDEX_NAME); + psFree(rowSet); + return false; + } + } + + // output to fits + if (!psFitsWriteTable(fits, NULL, rowSet, DETRUNSUMMARY_TABLE_NAME)) { + psError(PS_ERR_UNKNOWN, false, "FITS table write failed"); + psFree(rowSet); + return false; + } + + psFree(rowSet); + + return true; +} + +psMetadata *detRunSummaryMetadataFromObject(const detRunSummaryRow *object) +{ + psMetadata *md; + + md = psMetadataAlloc(); + if (!psMetadataAddS32(md, PS_LIST_TAIL, "det_id", 0, NULL, object->det_id)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item det_id"); + psFree(md); + return NULL; + } + if (!psMetadataAddS32(md, PS_LIST_TAIL, "iteration", 0, NULL, object->iteration)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item iteration"); + 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 (!psMetadataAdd(md, PS_LIST_TAIL, "accept", PS_DATA_BOOL, NULL, object->accept)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item accept"); + psFree(md); + return NULL; + } + + return md; +} + +detRunSummaryRow *detRunSummaryObjectFromMetadata(psMetadata *md) +{ + bool status; + psS32 det_id; + psS32 iteration; + psF64 bg; + psF64 bg_stdev; + psF64 bg_mean_stdev; + bool accept; + + det_id = psMetadataLookupS32(&status, md, "det_id"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item det_id"); + return false; + } + iteration = psMetadataLookupS32(&status, md, "iteration"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item iteration"); + 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; + } + accept = psMetadataLookupBool(&status, md, "accept"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item accept"); + return false; + } + + return detRunSummaryRowAlloc(det_id, iteration, bg, bg_stdev, bg_mean_stdev, accept); +} +psArray *detRunSummarySelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) +{ + psArray *rowSet; + psArray *returnSet; + psU64 i; + + rowSet = psDBSelectRows(dbh, DETRUNSUMMARY_TABLE_NAME, where, limit); + if (!rowSet) { + return NULL; + } + + // strip index column + for (i = 0; i < rowSet->n; i++) { + if (!psMetadataRemove((psMetadata *)(rowSet->data[i]), 0, DETRUNSUMMARY_INDEX_NAME)) { + psError(PS_ERR_UNKNOWN, true, "failed to remove item %s", DETRUNSUMMARY_INDEX_NAME); + psFree(rowSet); + return false; + } + } + + // convert psMetadata rows to row objects + + returnSet = psArrayAlloc(rowSet->n); + returnSet->n = 0; + + for (i = 0; i < rowSet->n; i++) { + detRunSummaryRow *object = detRunSummaryObjectFromMetadata(rowSet->data[i]); + psArrayAdd(returnSet, 0, object); + psFree(object); + } + + psFree(rowSet); + + return returnSet; +} +bool detRunSummaryDeleteObject(psDB *dbh, const detRunSummaryRow *object) +{ + psMetadata *where = detRunSummaryMetadataFromObject(object); + long long count = psDBDeleteRows(dbh, DETRUNSUMMARY_TABLE_NAME, where, 0); + psFree(where) + if (count < 0) { + psError(PS_ERR_UNKNOWN, true, "failed to delete row from detRunSummary"); + return false; + } + if (count > 1) { + // XXX should this be a psAbort() instead? It is possible that + // having an object match multiple rows was by design. + psError(PS_ERR_UNKNOWN, true, "detRunSummaryRow object matched more then one row. Check your database schema"); + return false; + } + + return true; +} +long long detRunSummaryDeleteRowObjects(psDB *dbh, const psArray *objects, unsigned long long limit) +{ + long long deleted = 0; + + for (long long i = 0; i < objects->n; i++) { + detRunSummaryRow *object = objects->data[i]; + psMetadata *where = detRunSummaryMetadataFromObject(object); + long long count = psDBDeleteRows(dbh, DETRUNSUMMARY_TABLE_NAME, where, limit); + psFree(where) + if (count < 0) { + psError(PS_ERR_UNKNOWN, true, "failed to delete row from detRunSummary"); + return count; + } + + deleted += count; + } + + return deleted; +} +bool detRunSummaryPrintObjects(FILE *stream, psArray *objects, bool mdcf) +{ + PS_ASSERT_PTR_NON_NULL(objects, false); + + psMetadata *output = psMetadataAlloc(); + for (long i = 0; i < psArrayLength(objects); i++) { + psMetadata *md = detRunSummaryMetadataFromObject(objects->data[i]); + if (!psMetadataAddMetadata( + output, + PS_LIST_TAIL, + DETRUNSUMMARY_TABLE_NAME, + PS_META_DUPLICATE_OK, + NULL, + md + )) { + psError(PS_ERR_UNKNOWN, false, "failed to add metadata"); + psFree(md); + psFree(output); + return false; + } + psFree(md); + } + + if (!ippdbPrintMetadataRaw(stream, output, mdcf)) { + psError(PS_ERR_UNKNOWN, false, "failed to print metadata"); + psFree(output); + } + psFree(output); + + return true; +} Index: trunk/ippdb/src/ippdb.h =================================================================== --- trunk/ippdb/src/ippdb.h (revision 8380) +++ trunk/ippdb/src/ippdb.h (revision 8528) @@ -5584,5 +5584,4 @@ char *exp_id; bool include; - bool accept; } detInputExpRow; @@ -5596,6 +5595,5 @@ psS32 iteration, const char *exp_id, - bool include, - bool accept + bool include ); @@ -5630,6 +5628,5 @@ psS32 iteration, const char *exp_id, - bool include, - bool accept + bool include ); @@ -5655,6 +5652,5 @@ psS32 *iteration, char **exp_id, - bool *include, - bool *accept + bool *include ); @@ -6059,4 +6055,7 @@ char *uri; char *recipe; + psF64 bg; + psF64 bg_stdev; + psF64 bg_mean_stdev; } detStackedImfileRow; @@ -6071,5 +6070,8 @@ const char *class_id, const char *uri, - const char *recipe + const char *recipe, + psF64 bg, + psF64 bg_stdev, + psF64 bg_mean_stdev ); @@ -6105,5 +6107,8 @@ const char *class_id, const char *uri, - const char *recipe + const char *recipe, + psF64 bg, + psF64 bg_stdev, + psF64 bg_mean_stdev ); @@ -6130,5 +6135,8 @@ char **class_id, char **uri, - char **recipe + char **recipe, + psF64 *bg, + psF64 *bg_stdev, + psF64 *bg_mean_stdev ); @@ -7193,6 +7201,9 @@ char *exp_id; char *class_id; + char *uri; char *recipe; - char *uri; + psF64 bg; + psF64 bg_stdev; + psF64 bg_mean_stdev; char *b1_uri; char *b2_uri; @@ -7209,6 +7220,9 @@ const char *exp_id, const char *class_id, + const char *uri, const char *recipe, - const char *uri, + psF64 bg, + psF64 bg_stdev, + psF64 bg_mean_stdev, const char *b1_uri, const char *b2_uri @@ -7246,6 +7260,9 @@ const char *exp_id, const char *class_id, + const char *uri, const char *recipe, - const char *uri, + psF64 bg, + psF64 bg_stdev, + psF64 bg_mean_stdev, const char *b1_uri, const char *b2_uri @@ -7274,6 +7291,9 @@ char **exp_id, char **class_id, + char **uri, char **recipe, - char **uri, + psF64 *bg, + psF64 *bg_stdev, + psF64 *bg_mean_stdev, char **b1_uri, char **b2_uri @@ -7436,5 +7456,9 @@ char *exp_id; char *recipe; - bool keep; + psF64 bg; + psF64 bg_stdev; + psF64 bg_mean_stdev; + char *b1_uri; + char *b2_uri; bool accept; } detResidExpRow; @@ -7450,5 +7474,9 @@ const char *exp_id, const char *recipe, - bool keep, + psF64 bg, + psF64 bg_stdev, + psF64 bg_mean_stdev, + const char *b1_uri, + const char *b2_uri, bool accept ); @@ -7485,5 +7513,9 @@ const char *exp_id, const char *recipe, - bool keep, + psF64 bg, + psF64 bg_stdev, + psF64 bg_mean_stdev, + const char *b1_uri, + const char *b2_uri, bool accept ); @@ -7511,5 +7543,9 @@ char **exp_id, char **recipe, - bool *keep, + psF64 *bg, + psF64 *bg_stdev, + psF64 *bg_mean_stdev, + char **b1_uri, + char **b2_uri, bool *accept ); @@ -7661,4 +7697,239 @@ bool mdcf ///< format as mdconfig or simple ); +/** detRunSummaryRow data structure + * + * Structure for representing a single row of detRunSummary table data. + */ + +typedef struct { + psS32 det_id; + psS32 iteration; + psF64 bg; + psF64 bg_stdev; + psF64 bg_mean_stdev; + bool accept; +} detRunSummaryRow; + +/** Creates a new detRunSummaryRow object + * + * @return A new detRunSummaryRow object or NULL on failure. + */ + +detRunSummaryRow *detRunSummaryRowAlloc( + psS32 det_id, + psS32 iteration, + psF64 bg, + psF64 bg_stdev, + psF64 bg_mean_stdev, + bool accept +); + +/** Creates a new detRunSummary table + * + * @return true on success + */ + +bool detRunSummaryCreateTable( + psDB *dbh ///< Database handle +); + +/** Deletes a detRunSummary table + * + * @return true on success + */ + +bool detRunSummaryDropTable( + psDB *dbh ///< Database handle +); + +/** Insert a single row into a table + * + * This function constructs and inserts a single row based on it's parameters. + * + * @return true on success + */ + +bool detRunSummaryInsert( + psDB *dbh, ///< Database handle + psS32 det_id, + psS32 iteration, + psF64 bg, + psF64 bg_stdev, + psF64 bg_mean_stdev, + bool accept +); + +/** Deletes up to limit rows from the database and returns the number of rows actually deleted. + * + * @return A The number of rows removed or a negative value on error + */ + +long long detRunSummaryDelete( + psDB *dbh, ///< Database handle + const psMetadata *where, ///< Row match criteria + unsigned long long limit ///< Maximum number of elements to delete +); + +/** Removes the last row from the database and returns it + * + * @return true on success + */ + +bool detRunSummaryPop( + psDB *dbh, ///< Database handle + psS32 *det_id, + psS32 *iteration, + psF64 *bg, + psF64 *bg_stdev, + psF64 *bg_mean_stdev, + bool *accept +); + +/** Insert a single detRunSummaryRow object into a table + * + * This function constructs and inserts a single row based on it's parameters. + * + * @return true on success + */ + +bool detRunSummaryInsertObject( + psDB *dbh, ///< Database handle + detRunSummaryRow *object ///< detRunSummaryRow object +); + +/** Insert an array of detRunSummaryRow object into a table + * + * This function constructs and inserts multiple rows based on it's parameters. + * + * @return true on success + */ + +bool detRunSummaryInsertObjects( + psDB *dbh, ///< Database handle + psArray *objects ///< array of detRunSummaryRow objects +); + +/** Removes the last row from the database and returns it + * + * @return A new detRunSummaryRow on success or NULL on failure. + */ + +detRunSummaryRow *detRunSummaryPopObject( + psDB *dbh ///< Database handle +); + +/** Insert data from a binary FITS table detRunSummaryRow into the database + * + * This function expects a psFits object with a FITS table as the first + * extension. The table must have at least one row of data in it, that is of + * the appropriate format (number of columns and their type). All other + * extensions are ignored. + * + * @return true on success + */ + +bool detRunSummaryInsertFits( + psDB *dbh, ///< Database handle + const psFits *fits ///< psFits object +); + +/** Removes the last limit row from the database and returns them in a binary FITS table. + * + * This function assumes an empty psFits object and will create a FITS table as + * the first extension. + * + * @return true on success + */ + +bool detRunSummaryPopFits( + psDB *dbh, ///< Database handle + psFits *fits, ///< psFits object + unsigned long long limit ///< Maximum number of elements to return +); + +/** Selects up to limit from the database and returns them in a binary FITS table + * + * This function assumes an empty psFits object and will create a FITS table + * as the first extension. + * + * See psDBSelectRows() for documentation on the format of where. + * + * @return true on success + */ + +bool detRunSummarySelectRowsFits( + psDB *dbh, ///< Database handle + psFits *fits, ///< psFits object + const psMetadata *where, ///< Row match criteria + unsigned long long limit ///< Maximum number of elements to return +); + +/** Convert a detRunSummaryRow into an equivalent psMetadata + * + * @return A psMetadata pointer or NULL on error + */ + +psMetadata *detRunSummaryMetadataFromObject( + const detRunSummaryRow *object ///< fooRow to convert into a psMetadata +); + +/** Convert a psMetadata into an equivalent fooRow + * + * @return A detRunSummaryRow pointer or NULL on error + */ + +detRunSummaryRow *detRunSummaryObjectFromMetadata( + psMetadata *md ///< psMetadata to convert into a fooRow +); +/** Selects up to limit rows from the database and returns as detRunSummaryRow objects in a psArray + * + * See psDBSelectRows() for documentation on the format of where. + * + * @return A psArray pointer or NULL on error + */ + +psArray *detRunSummarySelectRowObjects( + psDB *dbh, ///< Database handle + const psMetadata *where, ///< Row match criteria + unsigned long long limit ///< Maximum number of elements to return +); +/** Deletes a row from the database coresponding to an detRunSummary + * + * Note that a 'where' search psMetadata is constructed from each object and + * used to find rows to delete. + * + * @return A The number of rows removed or a negative value on error + */ + +bool detRunSummaryDeleteObject( + psDB *dbh, ///< Database handle + const detRunSummaryRow *object ///< Object to delete +); +/** Deletes up to limit rows from the database and returns the number of rows actually deleted. + * + * Note that a 'where' search psMetadata is constructed from each object and + * used to find rows to delete. + * + * @return A The number of rows removed or a negative value on error + */ + +long long detRunSummaryDeleteRowObjects( + psDB *dbh, ///< Database handle + const psArray *objects, ///< Array of objects to delete + unsigned long long limit ///< Maximum number of elements to delete +); +/** Formats and prints an array of detRunSummaryRow objects + * + * When mdcf is set the formated output is in psMetadataConfig + * format, otherwise it is in a simple tabular format. + * + * @return true on success + */ + +bool detRunSummaryPrintObjects( + FILE *stream, ///< a stream + psArray *objects, ///< An array of detRunSummaryRow objects + bool mdcf ///< format as mdconfig or simple +); /// @} @@ -7668,3 +7939,3 @@ #endif -#endif // DETRESIDEXP_DB_H +#endif // DETRUNSUMMARY_DB_H Index: trunk/ippdb/tests/alloc.c =================================================================== --- trunk/ippdb/tests/alloc.c (revision 8380) +++ trunk/ippdb/tests/alloc.c (revision 8528) @@ -933,5 +933,5 @@ detInputExpRow *object; - object = detInputExpRowAlloc(-32, -32, "a string", true, true ); + object = detInputExpRowAlloc(-32, -32, "a string", true ); if (!object) { @@ -955,4 +955,312 @@ exit(EXIT_FAILURE); } + + psFree(object); + } + + { + detProcessedImfileRow *object; + + object = detProcessedImfileRowAlloc(-32, "a string", "a string", "a string", "a string", 64.64, 64.64, 64.64 ); + + if (!object) { + exit(EXIT_FAILURE); + } + + if (!object->det_id == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->exp_id, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->class_id, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->uri, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->recipe, "a string", MAX_STRING_LENGTH)) { + 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); + } + + psFree(object); + } + + { + detStackedImfileRow *object; + + object = detStackedImfileRowAlloc(-32, -32, "a string", "a string", "a string", 64.64, 64.64, 64.64 ); + + if (!object) { + exit(EXIT_FAILURE); + } + + if (!object->det_id == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->iteration == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->class_id, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->uri, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->recipe, "a string", MAX_STRING_LENGTH)) { + 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); + } + + psFree(object); + } + + { + detNormalizedStatImfileRow *object; + + object = detNormalizedStatImfileRowAlloc(-32, -32, "a string", 32.32 ); + + if (!object) { + exit(EXIT_FAILURE); + } + + if (!object->det_id == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->iteration == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->class_id, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->norm == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + detNormalizedImfileRow *object; + + object = detNormalizedImfileRowAlloc(-32, -32, "a string", "a string" ); + + if (!object) { + exit(EXIT_FAILURE); + } + + if (!object->det_id == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->iteration == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->class_id, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->uri, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + detMasterFrameRow *object; + + object = detMasterFrameRowAlloc(-32, -32, "a string" ); + + if (!object) { + exit(EXIT_FAILURE); + } + + if (!object->det_id == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->iteration == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->comment, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + detMasterImfileRow *object; + + object = detMasterImfileRowAlloc(-32, "a string", "a string", "a string" ); + + if (!object) { + exit(EXIT_FAILURE); + } + + if (!object->det_id == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->class_id, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->uri, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->recipe, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + detResidImfileRow *object; + + object = detResidImfileRowAlloc(-32, -32, "a string", "a string", "a string", "a string", 64.64, 64.64, 64.64, "a string", "a string" ); + + if (!object) { + exit(EXIT_FAILURE); + } + + if (!object->det_id == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->iteration == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->exp_id, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->class_id, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->uri, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->recipe, "a string", MAX_STRING_LENGTH)) { + 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 (strncmp(object->b1_uri, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->b2_uri, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + detResidExpRow *object; + + object = detResidExpRowAlloc(-32, -32, "a string", "a string", 64.64, 64.64, 64.64, "a string", "a string", true ); + + if (!object) { + exit(EXIT_FAILURE); + } + + if (!object->det_id == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->iteration == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->exp_id, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->recipe, "a string", MAX_STRING_LENGTH)) { + 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 (strncmp(object->b1_uri, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->b2_uri, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } if (!object->accept == true) { psFree(object); @@ -964,7 +1272,7 @@ { - detProcessedImfileRow *object; - - object = detProcessedImfileRowAlloc(-32, "a string", "a string", "a string", "a string", 64.64, 64.64, 64.64 ); + detRunSummaryRow *object; + + object = detRunSummaryRowAlloc(-32, -32, 64.64, 64.64, 64.64, true ); if (!object) { @@ -976,17 +1284,5 @@ exit(EXIT_FAILURE); } - if (strncmp(object->exp_id, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->class_id, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->uri, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->recipe, "a string", MAX_STRING_LENGTH)) { + if (!object->iteration == -32) { psFree(object); exit(EXIT_FAILURE); @@ -1001,227 +1297,4 @@ } if (!object->bg_mean_stdev == 64.64) { - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - detStackedImfileRow *object; - - object = detStackedImfileRowAlloc(-32, -32, "a string", "a string", "a string" ); - - if (!object) { - exit(EXIT_FAILURE); - } - - if (!object->det_id == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->iteration == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->class_id, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->uri, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->recipe, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - detNormalizedStatImfileRow *object; - - object = detNormalizedStatImfileRowAlloc(-32, -32, "a string", 32.32 ); - - if (!object) { - exit(EXIT_FAILURE); - } - - if (!object->det_id == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->iteration == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->class_id, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->norm == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - detNormalizedImfileRow *object; - - object = detNormalizedImfileRowAlloc(-32, -32, "a string", "a string" ); - - if (!object) { - exit(EXIT_FAILURE); - } - - if (!object->det_id == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->iteration == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->class_id, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->uri, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - detMasterFrameRow *object; - - object = detMasterFrameRowAlloc(-32, -32, "a string" ); - - if (!object) { - exit(EXIT_FAILURE); - } - - if (!object->det_id == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->iteration == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->comment, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - detMasterImfileRow *object; - - object = detMasterImfileRowAlloc(-32, "a string", "a string", "a string" ); - - if (!object) { - exit(EXIT_FAILURE); - } - - if (!object->det_id == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->class_id, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->uri, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->recipe, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - detResidImfileRow *object; - - object = detResidImfileRowAlloc(-32, -32, "a string", "a string", "a string", "a string", "a string", "a string" ); - - if (!object) { - exit(EXIT_FAILURE); - } - - if (!object->det_id == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->iteration == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->exp_id, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->class_id, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->recipe, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->uri, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->b1_uri, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->b2_uri, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - detResidExpRow *object; - - object = detResidExpRowAlloc(-32, -32, "a string", "a string", true, true ); - - if (!object) { - exit(EXIT_FAILURE); - } - - if (!object->det_id == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->iteration == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->exp_id, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->recipe, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->keep == true) { psFree(object); exit(EXIT_FAILURE); Index: trunk/ippdb/tests/createtable.c =================================================================== --- trunk/ippdb/tests/createtable.c (revision 8380) +++ trunk/ippdb/tests/createtable.c (revision 8528) @@ -485,4 +485,19 @@ } + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if(!detRunSummaryCreateTable(dbh)) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + exit(EXIT_SUCCESS); } Index: trunk/ippdb/tests/dbcleanup.c =================================================================== --- trunk/ippdb/tests/dbcleanup.c (revision 8380) +++ trunk/ippdb/tests/dbcleanup.c (revision 8528) @@ -43,4 +43,5 @@ p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS detResidImfile"); p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS detResidExp"); + p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS detRunSummary"); psDBCleanup(dbh); Index: trunk/ippdb/tests/dbsetup.c =================================================================== --- trunk/ippdb/tests/dbsetup.c (revision 8380) +++ trunk/ippdb/tests/dbsetup.c (revision 8528) @@ -109,4 +109,7 @@ detResidExpCreateTable(dbh); + p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS detRunSummary"); + detRunSummaryCreateTable(dbh); + psDBCleanup(dbh); Index: trunk/ippdb/tests/droptable.c =================================================================== --- trunk/ippdb/tests/droptable.c (revision 8380) +++ trunk/ippdb/tests/droptable.c (revision 8528) @@ -485,4 +485,19 @@ } + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if (!detRunSummaryDropTable(dbh)) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + exit(EXIT_SUCCESS); } Index: trunk/ippdb/tests/insert.c =================================================================== --- trunk/ippdb/tests/insert.c (revision 8380) +++ trunk/ippdb/tests/insert.c (revision 8528) @@ -358,5 +358,5 @@ } - if (!detInputExpInsert(dbh, -32, -32, "a string", true, true)) { + if (!detInputExpInsert(dbh, -32, -32, "a string", true)) { exit(EXIT_FAILURE); } @@ -388,5 +388,5 @@ } - if (!detStackedImfileInsert(dbh, -32, -32, "a string", "a string", "a string")) { + if (!detStackedImfileInsert(dbh, -32, -32, "a string", "a string", "a string", 64.64, 64.64, 64.64)) { exit(EXIT_FAILURE); } @@ -463,20 +463,35 @@ } - if (!detResidImfileInsert(dbh, -32, -32, "a string", "a string", "a string", "a string", "a string", "a string")) { - exit(EXIT_FAILURE); - } - - psDBCleanup(dbh); - } - - { - psDB *dbh; - - dbh = psDBInit("localhost", "test", NULL, "test"); - if (!dbh) { - exit(EXIT_FAILURE); - } - - if (!detResidExpInsert(dbh, -32, -32, "a string", "a string", true, true)) { + if (!detResidImfileInsert(dbh, -32, -32, "a string", "a string", "a string", "a string", 64.64, 64.64, 64.64, "a string", "a string")) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if (!detResidExpInsert(dbh, -32, -32, "a string", "a string", 64.64, 64.64, 64.64, "a string", "a string", true)) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if (!detRunSummaryInsert(dbh, -32, -32, 64.64, 64.64, 64.64, true)) { exit(EXIT_FAILURE); } Index: trunk/ippdb/tests/insertfits.c =================================================================== --- trunk/ippdb/tests/insertfits.c (revision 8380) +++ trunk/ippdb/tests/insertfits.c (revision 8528) @@ -841,4 +841,30 @@ } + { + psDB *dbh; + psFits *fits; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + // open a temp + fits = psFitsOpen(TMP_FILENAME, "r"); + if (!fits) { + exit(EXIT_FAILURE); + } + + if (!detRunSummaryInsertFits(dbh, fits)) { + exit(EXIT_FAILURE); + } + + if (!psFitsClose(fits)) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + exit(EXIT_SUCCESS); } Index: trunk/ippdb/tests/insertobject.c =================================================================== --- trunk/ippdb/tests/insertobject.c (revision 8380) +++ trunk/ippdb/tests/insertobject.c (revision 8528) @@ -520,5 +520,5 @@ } - object = detInputExpRowAlloc(-32, -32, "a string", true, true); + object = detInputExpRowAlloc(-32, -32, "a string", true); if (!object) { exit(EXIT_FAILURE); @@ -564,5 +564,5 @@ } - object = detStackedImfileRowAlloc(-32, -32, "a string", "a string", "a string"); + object = detStackedImfileRowAlloc(-32, -32, "a string", "a string", "a string", 64.64, 64.64, 64.64); if (!object) { exit(EXIT_FAILURE); @@ -674,5 +674,5 @@ } - object = detResidImfileRowAlloc(-32, -32, "a string", "a string", "a string", "a string", "a string", "a string"); + object = detResidImfileRowAlloc(-32, -32, "a string", "a string", "a string", "a string", 64.64, 64.64, 64.64, "a string", "a string"); if (!object) { exit(EXIT_FAILURE); @@ -696,5 +696,5 @@ } - object = detResidExpRowAlloc(-32, -32, "a string", "a string", true, true); + object = detResidExpRowAlloc(-32, -32, "a string", "a string", 64.64, 64.64, 64.64, "a string", "a string", true); if (!object) { exit(EXIT_FAILURE); @@ -702,4 +702,26 @@ if (!detResidExpInsertObject(dbh, object)) { + exit(EXIT_FAILURE); + } + + psFree(object); + psDBCleanup(dbh); + } + + { + psDB *dbh; + detRunSummaryRow *object; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + object = detRunSummaryRowAlloc(-32, -32, 64.64, 64.64, 64.64, true); + if (!object) { + exit(EXIT_FAILURE); + } + + if (!detRunSummaryInsertObject(dbh, object)) { exit(EXIT_FAILURE); } Index: trunk/ippdb/tests/metadatafromobject.c =================================================================== --- trunk/ippdb/tests/metadatafromobject.c (revision 8380) +++ trunk/ippdb/tests/metadatafromobject.c (revision 8528) @@ -1120,5 +1120,5 @@ bool status; - object = detInputExpRowAlloc(-32, -32, "a string", true, true); + object = detInputExpRowAlloc(-32, -32, "a string", true); if (!object) { exit(EXIT_FAILURE); @@ -1148,4 +1148,376 @@ exit(EXIT_FAILURE); } + + psFree(md); + } + + { + psMetadata *md; + detProcessedImfileRow *object; + bool status; + + object = detProcessedImfileRowAlloc(-32, "a string", "a string", "a string", "a string", 64.64, 64.64, 64.64); + if (!object) { + exit(EXIT_FAILURE); + } + + md = detProcessedImfileMetadataFromObject(object); + if (!md) { + exit(EXIT_FAILURE); + } + + psFree(object); + + if (!psMetadataLookupS32(&status, md, "det_id") == -32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "exp_id"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "class_id"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "uri"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "recipe"), "a string", MAX_STRING_LENGTH)) { + 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); + } + + psFree(md); + } + + { + psMetadata *md; + detStackedImfileRow *object; + bool status; + + object = detStackedImfileRowAlloc(-32, -32, "a string", "a string", "a string", 64.64, 64.64, 64.64); + if (!object) { + exit(EXIT_FAILURE); + } + + md = detStackedImfileMetadataFromObject(object); + if (!md) { + exit(EXIT_FAILURE); + } + + psFree(object); + + if (!psMetadataLookupS32(&status, md, "det_id") == -32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupS32(&status, md, "iteration") == -32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "class_id"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "uri"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "recipe"), "a string", MAX_STRING_LENGTH)) { + 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); + } + + psFree(md); + } + + { + psMetadata *md; + detNormalizedStatImfileRow *object; + bool status; + + object = detNormalizedStatImfileRowAlloc(-32, -32, "a string", 32.32); + if (!object) { + exit(EXIT_FAILURE); + } + + md = detNormalizedStatImfileMetadataFromObject(object); + if (!md) { + exit(EXIT_FAILURE); + } + + psFree(object); + + if (!psMetadataLookupS32(&status, md, "det_id") == -32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupS32(&status, md, "iteration") == -32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "class_id"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF32(&status, md, "norm") == 32.32) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + } + + { + psMetadata *md; + detNormalizedImfileRow *object; + bool status; + + object = detNormalizedImfileRowAlloc(-32, -32, "a string", "a string"); + if (!object) { + exit(EXIT_FAILURE); + } + + md = detNormalizedImfileMetadataFromObject(object); + if (!md) { + exit(EXIT_FAILURE); + } + + psFree(object); + + if (!psMetadataLookupS32(&status, md, "det_id") == -32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupS32(&status, md, "iteration") == -32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "class_id"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "uri"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + } + + { + psMetadata *md; + detMasterFrameRow *object; + bool status; + + object = detMasterFrameRowAlloc(-32, -32, "a string"); + if (!object) { + exit(EXIT_FAILURE); + } + + md = detMasterFrameMetadataFromObject(object); + if (!md) { + exit(EXIT_FAILURE); + } + + psFree(object); + + if (!psMetadataLookupS32(&status, md, "det_id") == -32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupS32(&status, md, "iteration") == -32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "comment"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + } + + { + psMetadata *md; + detMasterImfileRow *object; + bool status; + + object = detMasterImfileRowAlloc(-32, "a string", "a string", "a string"); + if (!object) { + exit(EXIT_FAILURE); + } + + md = detMasterImfileMetadataFromObject(object); + if (!md) { + exit(EXIT_FAILURE); + } + + psFree(object); + + if (!psMetadataLookupS32(&status, md, "det_id") == -32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "class_id"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "uri"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "recipe"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + } + + { + psMetadata *md; + detResidImfileRow *object; + bool status; + + object = detResidImfileRowAlloc(-32, -32, "a string", "a string", "a string", "a string", 64.64, 64.64, 64.64, "a string", "a string"); + if (!object) { + exit(EXIT_FAILURE); + } + + md = detResidImfileMetadataFromObject(object); + if (!md) { + exit(EXIT_FAILURE); + } + + psFree(object); + + if (!psMetadataLookupS32(&status, md, "det_id") == -32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupS32(&status, md, "iteration") == -32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "exp_id"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "class_id"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "uri"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "recipe"), "a string", MAX_STRING_LENGTH)) { + 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 (strncmp(psMetadataLookupPtr(&status, md, "b1_uri"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "b2_uri"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + } + + { + psMetadata *md; + detResidExpRow *object; + bool status; + + object = detResidExpRowAlloc(-32, -32, "a string", "a string", 64.64, 64.64, 64.64, "a string", "a string", true); + if (!object) { + exit(EXIT_FAILURE); + } + + md = detResidExpMetadataFromObject(object); + if (!md) { + exit(EXIT_FAILURE); + } + + psFree(object); + + if (!psMetadataLookupS32(&status, md, "det_id") == -32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupS32(&status, md, "iteration") == -32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "exp_id"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "recipe"), "a string", MAX_STRING_LENGTH)) { + 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 (strncmp(psMetadataLookupPtr(&status, md, "b1_uri"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "b2_uri"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } if (!psMetadataLookupBool(&status, md, "accept") == true) { psFree(md); @@ -1158,13 +1530,13 @@ { psMetadata *md; - detProcessedImfileRow *object; - bool status; - - object = detProcessedImfileRowAlloc(-32, "a string", "a string", "a string", "a string", 64.64, 64.64, 64.64); - if (!object) { - exit(EXIT_FAILURE); - } - - md = detProcessedImfileMetadataFromObject(object); + detRunSummaryRow *object; + bool status; + + object = detRunSummaryRowAlloc(-32, -32, 64.64, 64.64, 64.64, true); + if (!object) { + exit(EXIT_FAILURE); + } + + md = detRunSummaryMetadataFromObject(object); if (!md) { exit(EXIT_FAILURE); @@ -1177,17 +1549,5 @@ exit(EXIT_FAILURE); } - if (strncmp(psMetadataLookupPtr(&status, md, "exp_id"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "class_id"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "uri"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "recipe"), "a string", MAX_STRING_LENGTH)) { + if (!psMetadataLookupS32(&status, md, "iteration") == -32) { psFree(md); exit(EXIT_FAILURE); @@ -1202,283 +1562,4 @@ } if (!psMetadataLookupF64(&status, md, "bg_mean_stdev") == 64.64) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - } - - { - psMetadata *md; - detStackedImfileRow *object; - bool status; - - object = detStackedImfileRowAlloc(-32, -32, "a string", "a string", "a string"); - if (!object) { - exit(EXIT_FAILURE); - } - - md = detStackedImfileMetadataFromObject(object); - if (!md) { - exit(EXIT_FAILURE); - } - - psFree(object); - - if (!psMetadataLookupS32(&status, md, "det_id") == -32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupS32(&status, md, "iteration") == -32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "class_id"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "uri"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "recipe"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - } - - { - psMetadata *md; - detNormalizedStatImfileRow *object; - bool status; - - object = detNormalizedStatImfileRowAlloc(-32, -32, "a string", 32.32); - if (!object) { - exit(EXIT_FAILURE); - } - - md = detNormalizedStatImfileMetadataFromObject(object); - if (!md) { - exit(EXIT_FAILURE); - } - - psFree(object); - - if (!psMetadataLookupS32(&status, md, "det_id") == -32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupS32(&status, md, "iteration") == -32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "class_id"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupF32(&status, md, "norm") == 32.32) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - } - - { - psMetadata *md; - detNormalizedImfileRow *object; - bool status; - - object = detNormalizedImfileRowAlloc(-32, -32, "a string", "a string"); - if (!object) { - exit(EXIT_FAILURE); - } - - md = detNormalizedImfileMetadataFromObject(object); - if (!md) { - exit(EXIT_FAILURE); - } - - psFree(object); - - if (!psMetadataLookupS32(&status, md, "det_id") == -32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupS32(&status, md, "iteration") == -32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "class_id"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "uri"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - } - - { - psMetadata *md; - detMasterFrameRow *object; - bool status; - - object = detMasterFrameRowAlloc(-32, -32, "a string"); - if (!object) { - exit(EXIT_FAILURE); - } - - md = detMasterFrameMetadataFromObject(object); - if (!md) { - exit(EXIT_FAILURE); - } - - psFree(object); - - if (!psMetadataLookupS32(&status, md, "det_id") == -32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupS32(&status, md, "iteration") == -32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "comment"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - } - - { - psMetadata *md; - detMasterImfileRow *object; - bool status; - - object = detMasterImfileRowAlloc(-32, "a string", "a string", "a string"); - if (!object) { - exit(EXIT_FAILURE); - } - - md = detMasterImfileMetadataFromObject(object); - if (!md) { - exit(EXIT_FAILURE); - } - - psFree(object); - - if (!psMetadataLookupS32(&status, md, "det_id") == -32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "class_id"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "uri"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "recipe"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - } - - { - psMetadata *md; - detResidImfileRow *object; - bool status; - - object = detResidImfileRowAlloc(-32, -32, "a string", "a string", "a string", "a string", "a string", "a string"); - if (!object) { - exit(EXIT_FAILURE); - } - - md = detResidImfileMetadataFromObject(object); - if (!md) { - exit(EXIT_FAILURE); - } - - psFree(object); - - if (!psMetadataLookupS32(&status, md, "det_id") == -32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupS32(&status, md, "iteration") == -32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "exp_id"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "class_id"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "recipe"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "uri"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "b1_uri"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "b2_uri"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - } - - { - psMetadata *md; - detResidExpRow *object; - bool status; - - object = detResidExpRowAlloc(-32, -32, "a string", "a string", true, true); - if (!object) { - exit(EXIT_FAILURE); - } - - md = detResidExpMetadataFromObject(object); - if (!md) { - exit(EXIT_FAILURE); - } - - psFree(object); - - if (!psMetadataLookupS32(&status, md, "det_id") == -32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupS32(&status, md, "iteration") == -32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "exp_id"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "recipe"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupBool(&status, md, "keep") == true) { psFree(md); exit(EXIT_FAILURE); Index: trunk/ippdb/tests/objectfrommetadata.c =================================================================== --- trunk/ippdb/tests/objectfrommetadata.c (revision 8380) +++ trunk/ippdb/tests/objectfrommetadata.c (revision 8528) @@ -1691,4 +1691,536 @@ exit(EXIT_FAILURE); } + + object = detInputExpObjectFromMetadata(md); + if (!object) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + + if (!object->det_id == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->iteration == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->exp_id, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->include == true) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + psMetadata *md; + detProcessedImfileRow *object; + + md = psMetadataAlloc(); + if (!psMetadataAddS32(md, PS_LIST_TAIL, "det_id", 0, NULL, -32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "exp_id", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "class_id", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "uri", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "recipe", 0, NULL, "a string")) { + 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); + } + + object = detProcessedImfileObjectFromMetadata(md); + if (!object) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + + if (!object->det_id == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->exp_id, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->class_id, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->uri, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->recipe, "a string", MAX_STRING_LENGTH)) { + 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); + } + + psFree(object); + } + + { + psMetadata *md; + detStackedImfileRow *object; + + md = psMetadataAlloc(); + if (!psMetadataAddS32(md, PS_LIST_TAIL, "det_id", 0, NULL, -32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddS32(md, PS_LIST_TAIL, "iteration", 0, NULL, -32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "class_id", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "uri", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "recipe", 0, NULL, "a string")) { + 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); + } + + object = detStackedImfileObjectFromMetadata(md); + if (!object) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + + if (!object->det_id == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->iteration == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->class_id, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->uri, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->recipe, "a string", MAX_STRING_LENGTH)) { + 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); + } + + psFree(object); + } + + { + psMetadata *md; + detNormalizedStatImfileRow *object; + + md = psMetadataAlloc(); + if (!psMetadataAddS32(md, PS_LIST_TAIL, "det_id", 0, NULL, -32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddS32(md, PS_LIST_TAIL, "iteration", 0, NULL, -32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "class_id", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF32(md, PS_LIST_TAIL, "norm", 0, NULL, 32.32)) { + psFree(md); + exit(EXIT_FAILURE); + } + + object = detNormalizedStatImfileObjectFromMetadata(md); + if (!object) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + + if (!object->det_id == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->iteration == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->class_id, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->norm == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + psMetadata *md; + detNormalizedImfileRow *object; + + md = psMetadataAlloc(); + if (!psMetadataAddS32(md, PS_LIST_TAIL, "det_id", 0, NULL, -32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddS32(md, PS_LIST_TAIL, "iteration", 0, NULL, -32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "class_id", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "uri", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + + object = detNormalizedImfileObjectFromMetadata(md); + if (!object) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + + if (!object->det_id == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->iteration == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->class_id, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->uri, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + psMetadata *md; + detMasterFrameRow *object; + + md = psMetadataAlloc(); + if (!psMetadataAddS32(md, PS_LIST_TAIL, "det_id", 0, NULL, -32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddS32(md, PS_LIST_TAIL, "iteration", 0, NULL, -32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "comment", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + + object = detMasterFrameObjectFromMetadata(md); + if (!object) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + + if (!object->det_id == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->iteration == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->comment, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + psMetadata *md; + detMasterImfileRow *object; + + md = psMetadataAlloc(); + if (!psMetadataAddS32(md, PS_LIST_TAIL, "det_id", 0, NULL, -32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "class_id", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "uri", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "recipe", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + + object = detMasterImfileObjectFromMetadata(md); + if (!object) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + + if (!object->det_id == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->class_id, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->uri, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->recipe, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + psMetadata *md; + detResidImfileRow *object; + + md = psMetadataAlloc(); + if (!psMetadataAddS32(md, PS_LIST_TAIL, "det_id", 0, NULL, -32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddS32(md, PS_LIST_TAIL, "iteration", 0, NULL, -32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "exp_id", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "class_id", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "uri", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "recipe", 0, NULL, "a string")) { + 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 (!psMetadataAddStr(md, PS_LIST_TAIL, "b1_uri", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "b2_uri", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + + object = detResidImfileObjectFromMetadata(md); + if (!object) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + + if (!object->det_id == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->iteration == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->exp_id, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->class_id, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->uri, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->recipe, "a string", MAX_STRING_LENGTH)) { + 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 (strncmp(object->b1_uri, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->b2_uri, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + psMetadata *md; + detResidExpRow *object; + + md = psMetadataAlloc(); + if (!psMetadataAddS32(md, PS_LIST_TAIL, "det_id", 0, NULL, -32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddS32(md, PS_LIST_TAIL, "iteration", 0, NULL, -32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "exp_id", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "recipe", 0, NULL, "a string")) { + 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 (!psMetadataAddStr(md, PS_LIST_TAIL, "b1_uri", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "b2_uri", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } if (!psMetadataAdd(md, PS_LIST_TAIL, "accept", PS_DATA_BOOL, NULL, true)) { psFree(md); @@ -1696,5 +2228,5 @@ } - object = detInputExpObjectFromMetadata(md); + object = detResidExpObjectFromMetadata(md); if (!object) { psFree(md); @@ -1716,5 +2248,25 @@ exit(EXIT_FAILURE); } - if (!object->include == true) { + if (strncmp(object->recipe, "a string", MAX_STRING_LENGTH)) { + 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 (strncmp(object->b1_uri, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->b2_uri, "a string", MAX_STRING_LENGTH)) { psFree(object); exit(EXIT_FAILURE); @@ -1730,5 +2282,5 @@ { psMetadata *md; - detProcessedImfileRow *object; + detRunSummaryRow *object; md = psMetadataAlloc(); @@ -1737,17 +2289,5 @@ exit(EXIT_FAILURE); } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "exp_id", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "class_id", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "uri", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "recipe", 0, NULL, "a string")) { + if (!psMetadataAddS32(md, PS_LIST_TAIL, "iteration", 0, NULL, -32)) { psFree(md); exit(EXIT_FAILURE); @@ -1765,6 +2305,10 @@ exit(EXIT_FAILURE); } - - object = detProcessedImfileObjectFromMetadata(md); + if (!psMetadataAdd(md, PS_LIST_TAIL, "accept", PS_DATA_BOOL, NULL, true)) { + psFree(md); + exit(EXIT_FAILURE); + } + + object = detRunSummaryObjectFromMetadata(md); if (!object) { psFree(md); @@ -1778,17 +2322,5 @@ exit(EXIT_FAILURE); } - if (strncmp(object->exp_id, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->class_id, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->uri, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->recipe, "a string", MAX_STRING_LENGTH)) { + if (!object->iteration == -32) { psFree(object); exit(EXIT_FAILURE); @@ -1803,398 +2335,4 @@ } if (!object->bg_mean_stdev == 64.64) { - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - psMetadata *md; - detStackedImfileRow *object; - - md = psMetadataAlloc(); - if (!psMetadataAddS32(md, PS_LIST_TAIL, "det_id", 0, NULL, -32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddS32(md, PS_LIST_TAIL, "iteration", 0, NULL, -32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "class_id", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "uri", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "recipe", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - - object = detStackedImfileObjectFromMetadata(md); - if (!object) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - - if (!object->det_id == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->iteration == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->class_id, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->uri, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->recipe, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - psMetadata *md; - detNormalizedStatImfileRow *object; - - md = psMetadataAlloc(); - if (!psMetadataAddS32(md, PS_LIST_TAIL, "det_id", 0, NULL, -32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddS32(md, PS_LIST_TAIL, "iteration", 0, NULL, -32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "class_id", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "norm", 0, NULL, 32.32)) { - psFree(md); - exit(EXIT_FAILURE); - } - - object = detNormalizedStatImfileObjectFromMetadata(md); - if (!object) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - - if (!object->det_id == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->iteration == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->class_id, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->norm == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - psMetadata *md; - detNormalizedImfileRow *object; - - md = psMetadataAlloc(); - if (!psMetadataAddS32(md, PS_LIST_TAIL, "det_id", 0, NULL, -32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddS32(md, PS_LIST_TAIL, "iteration", 0, NULL, -32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "class_id", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "uri", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - - object = detNormalizedImfileObjectFromMetadata(md); - if (!object) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - - if (!object->det_id == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->iteration == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->class_id, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->uri, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - psMetadata *md; - detMasterFrameRow *object; - - md = psMetadataAlloc(); - if (!psMetadataAddS32(md, PS_LIST_TAIL, "det_id", 0, NULL, -32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddS32(md, PS_LIST_TAIL, "iteration", 0, NULL, -32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "comment", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - - object = detMasterFrameObjectFromMetadata(md); - if (!object) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - - if (!object->det_id == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->iteration == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->comment, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - psMetadata *md; - detMasterImfileRow *object; - - md = psMetadataAlloc(); - if (!psMetadataAddS32(md, PS_LIST_TAIL, "det_id", 0, NULL, -32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "class_id", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "uri", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "recipe", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - - object = detMasterImfileObjectFromMetadata(md); - if (!object) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - - if (!object->det_id == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->class_id, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->uri, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->recipe, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - psMetadata *md; - detResidImfileRow *object; - - md = psMetadataAlloc(); - if (!psMetadataAddS32(md, PS_LIST_TAIL, "det_id", 0, NULL, -32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddS32(md, PS_LIST_TAIL, "iteration", 0, NULL, -32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "exp_id", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "class_id", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "recipe", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "uri", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "b1_uri", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "b2_uri", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - - object = detResidImfileObjectFromMetadata(md); - if (!object) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - - if (!object->det_id == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->iteration == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->exp_id, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->class_id, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->recipe, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->uri, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->b1_uri, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->b2_uri, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - psMetadata *md; - detResidExpRow *object; - - md = psMetadataAlloc(); - if (!psMetadataAddS32(md, PS_LIST_TAIL, "det_id", 0, NULL, -32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddS32(md, PS_LIST_TAIL, "iteration", 0, NULL, -32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "exp_id", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "recipe", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "keep", PS_DATA_BOOL, NULL, true)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "accept", PS_DATA_BOOL, NULL, true)) { - psFree(md); - exit(EXIT_FAILURE); - } - - object = detResidExpObjectFromMetadata(md); - if (!object) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - - if (!object->det_id == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->iteration == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->exp_id, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->recipe, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->keep == true) { psFree(object); exit(EXIT_FAILURE); Index: trunk/ippdb/tests/pop.c =================================================================== --- trunk/ippdb/tests/pop.c (revision 8380) +++ trunk/ippdb/tests/pop.c (revision 8528) @@ -512,12 +512,11 @@ char exp_id[256]; bool include; - bool accept; - - dbh = psDBInit("localhost", "test", NULL, "test"); - if (!dbh) { - exit(EXIT_FAILURE); - } - - if (!detInputExpPop(dbh, &det_id, &iteration, (char **)&exp_id, &include, &accept)) { + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if (!detInputExpPop(dbh, &det_id, &iteration, (char **)&exp_id, &include)) { exit(EXIT_FAILURE); } @@ -556,11 +555,14 @@ char uri[256]; char recipe[256]; - - dbh = psDBInit("localhost", "test", NULL, "test"); - if (!dbh) { - exit(EXIT_FAILURE); - } - - if (!detStackedImfilePop(dbh, &det_id, &iteration, (char **)&class_id, (char **)&uri, (char **)&recipe)) { + psF64 bg; + psF64 bg_stdev; + psF64 bg_mean_stdev; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if (!detStackedImfilePop(dbh, &det_id, &iteration, (char **)&class_id, (char **)&uri, (char **)&recipe, &bg, &bg_stdev, &bg_mean_stdev)) { exit(EXIT_FAILURE); } @@ -650,6 +652,9 @@ char exp_id[256]; char class_id[256]; - char recipe[256]; - char uri[256]; + char uri[256]; + char recipe[256]; + psF64 bg; + psF64 bg_stdev; + psF64 bg_mean_stdev; char b1_uri[256]; char b2_uri[256]; @@ -660,18 +665,22 @@ } - if (!detResidImfilePop(dbh, &det_id, &iteration, (char **)&exp_id, (char **)&class_id, (char **)&recipe, (char **)&uri, (char **)&b1_uri, (char **)&b2_uri)) { - exit(EXIT_FAILURE); - } - - psDBCleanup(dbh); - } - - { - psDB *dbh; - psS32 det_id; - psS32 iteration; - char exp_id[256]; - char recipe[256]; - bool keep; + if (!detResidImfilePop(dbh, &det_id, &iteration, (char **)&exp_id, (char **)&class_id, (char **)&uri, (char **)&recipe, &bg, &bg_stdev, &bg_mean_stdev, (char **)&b1_uri, (char **)&b2_uri)) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + psS32 det_id; + psS32 iteration; + char exp_id[256]; + char recipe[256]; + psF64 bg; + psF64 bg_stdev; + psF64 bg_mean_stdev; + char b1_uri[256]; + char b2_uri[256]; bool accept; @@ -681,5 +690,26 @@ } - if (!detResidExpPop(dbh, &det_id, &iteration, (char **)&exp_id, (char **)&recipe, &keep, &accept)) { + if (!detResidExpPop(dbh, &det_id, &iteration, (char **)&exp_id, (char **)&recipe, &bg, &bg_stdev, &bg_mean_stdev, (char **)&b1_uri, (char **)&b2_uri, &accept)) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + psS32 det_id; + psS32 iteration; + psF64 bg; + psF64 bg_stdev; + psF64 bg_mean_stdev; + bool accept; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if (!detRunSummaryPop(dbh, &det_id, &iteration, &bg, &bg_stdev, &bg_mean_stdev, &accept)) { exit(EXIT_FAILURE); } Index: trunk/ippdb/tests/popfits.c =================================================================== --- trunk/ippdb/tests/popfits.c (revision 8380) +++ trunk/ippdb/tests/popfits.c (revision 8528) @@ -841,4 +841,30 @@ } + { + psDB *dbh; + psFits *fits; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + // allocate a temp + fits = psFitsOpen(TMP_FILENAME, "w"); + if (!fits) { + exit(EXIT_FAILURE); + } + + if (!detRunSummaryPopFits(dbh, fits, 1)) { + exit(EXIT_FAILURE); + } + + if (!psFitsClose(fits)) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + exit(EXIT_SUCCESS); } Index: trunk/ippdb/tests/popobject.c =================================================================== --- trunk/ippdb/tests/popobject.c (revision 8380) +++ trunk/ippdb/tests/popobject.c (revision 8528) @@ -581,4 +581,22 @@ } + { + psDB *dbh; + detRunSummaryRow *object; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + object = detRunSummaryPopObject(dbh); + if (!object) { + exit(EXIT_FAILURE); + } + + psFree(object); + psDBCleanup(dbh); + } + exit(EXIT_SUCCESS); } Index: trunk/ippdb/tests/selectrowsfits.c =================================================================== --- trunk/ippdb/tests/selectrowsfits.c (revision 8380) +++ trunk/ippdb/tests/selectrowsfits.c (revision 8528) @@ -711,4 +711,26 @@ } + { + psDB *dbh; + psFits *fits; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + fits = psFitsOpen(TMP_FILENAME, "w"); + if (!fits) { + exit(EXIT_FAILURE); + } + + if (!detRunSummarySelectRowsFits(dbh, fits, NULL, 1)) { + exit(EXIT_FAILURE); + } + + psFree(fits); + psDBCleanup(dbh); + } + exit(EXIT_SUCCESS); }