Index: /trunk/ippdb/Makefile.am =================================================================== --- /trunk/ippdb/Makefile.am (revision 14450) +++ /trunk/ippdb/Makefile.am (revision 14451) @@ -47,8 +47,9 @@ $(top_builddir)/docs/man/man3/detResidImfileRow.3 \ $(top_builddir)/docs/man/man3/detResidExpRow.3 \ - $(top_builddir)/docs/man/man3/detRunSummaryRow.3 + $(top_builddir)/docs/man/man3/detRunSummaryRow.3 \ + $(top_builddir)/docs/man/man3/detRegisteredImfileRow.3 -docs/man/man3/ippdb.3 docs/man/man3/summitExpRow.3 docs/man/man3/summitImfileRow.3 docs/man/man3/pzPendingExpRow.3 docs/man/man3/pzPendingImfileRow.3 docs/man/man3/pzDoneExpRow.3 docs/man/man3/pzDoneImfileRow.3 docs/man/man3/newExpRow.3 docs/man/man3/newImfileRow.3 docs/man/man3/rawExpRow.3 docs/man/man3/rawImfileRow.3 docs/man/man3/guidePendingExpRow.3 docs/man/man3/chipRunRow.3 docs/man/man3/chipProcessedImfileRow.3 docs/man/man3/chipMaskRow.3 docs/man/man3/camRunRow.3 docs/man/man3/camProcessedExpRow.3 docs/man/man3/camMaskRow.3 docs/man/man3/warpRunRow.3 docs/man/man3/warpInputExpRow.3 docs/man/man3/warpSkyCellMapRow.3 docs/man/man3/warpSkyfileRow.3 docs/man/man3/diffRunRow.3 docs/man/man3/diffInputSkyfileRow.3 docs/man/man3/diffSkyfileRow.3 docs/man/man3/stackRunRow.3 docs/man/man3/stackInputSkyfileRow.3 docs/man/man3/stackSumSkyfileRow.3 docs/man/man3/detRunRow.3 docs/man/man3/detInputExpRow.3 docs/man/man3/detProcessedImfileRow.3 docs/man/man3/detProcessedExpRow.3 docs/man/man3/detStackedImfileRow.3 docs/man/man3/detNormalizedStatImfileRow.3 docs/man/man3/detNormalizedImfileRow.3 docs/man/man3/detNormalizedExpRow.3 docs/man/man3/detResidImfileRow.3 docs/man/man3/detResidExpRow.3 docs/man/man3/detRunSummaryRow.3: +docs/man/man3/ippdb.3 docs/man/man3/summitExpRow.3 docs/man/man3/summitImfileRow.3 docs/man/man3/pzPendingExpRow.3 docs/man/man3/pzPendingImfileRow.3 docs/man/man3/pzDoneExpRow.3 docs/man/man3/pzDoneImfileRow.3 docs/man/man3/newExpRow.3 docs/man/man3/newImfileRow.3 docs/man/man3/rawExpRow.3 docs/man/man3/rawImfileRow.3 docs/man/man3/guidePendingExpRow.3 docs/man/man3/chipRunRow.3 docs/man/man3/chipProcessedImfileRow.3 docs/man/man3/chipMaskRow.3 docs/man/man3/camRunRow.3 docs/man/man3/camProcessedExpRow.3 docs/man/man3/camMaskRow.3 docs/man/man3/warpRunRow.3 docs/man/man3/warpInputExpRow.3 docs/man/man3/warpSkyCellMapRow.3 docs/man/man3/warpSkyfileRow.3 docs/man/man3/diffRunRow.3 docs/man/man3/diffInputSkyfileRow.3 docs/man/man3/diffSkyfileRow.3 docs/man/man3/stackRunRow.3 docs/man/man3/stackInputSkyfileRow.3 docs/man/man3/stackSumSkyfileRow.3 docs/man/man3/detRunRow.3 docs/man/man3/detInputExpRow.3 docs/man/man3/detProcessedImfileRow.3 docs/man/man3/detProcessedExpRow.3 docs/man/man3/detStackedImfileRow.3 docs/man/man3/detNormalizedStatImfileRow.3 docs/man/man3/detNormalizedImfileRow.3 docs/man/man3/detNormalizedExpRow.3 docs/man/man3/detResidImfileRow.3 docs/man/man3/detResidExpRow.3 docs/man/man3/detRunSummaryRow.3 docs/man/man3/detRegisteredImfileRow.3: $(DOXYGEN) Index: /trunk/ippdb/configure.ac =================================================================== --- /trunk/ippdb/configure.ac (revision 14450) +++ /trunk/ippdb/configure.ac (revision 14451) @@ -1,4 +1,4 @@ dnl -dnl This file was generated by glueforge 1.01 +dnl This file was generated by glueforge 1.03 dnl dnl Do NOT directly edit this file. @@ -24,4 +24,20 @@ PKG_CHECK_MODULES([PSLIB], [pslib >= 0.9.0]) + +dnl check to make sure that pslib declares HAVE_PSDB +TMP_CFLAGS=${CFLAGS} +CFLAGS="${CFLAGS=} ${PSLIB_CFLAGS}" + +AC_MSG_CHECKING([pslib's psDB support]) +AC_RUN_IFELSE( + [AC_LANG_PROGRAM([], [dnl +#ifndef HAVE_PSDB + return 1; +#endif])], + [AC_MSG_RESULT([yes])], + [AC_MSG_FAILURE([pslib was built without psDB support (HAVE_PSDB)])]) + +CFLAGS=${TMP_CFLAGS} + AC_PATH_PROG([PERL], [perl], [missing]) @@ -35,5 +51,6 @@ dnl is this the best was to setup recursive CFLAGS? IPP_STDOPTS -ippdb_CFLAGS="-Wall -Werror -pedantic -fno-strict-aliasing" +dnl -Werror causes problems on OSX as inttypes.h uses some non standard C types +ippdb_CFLAGS="-Wall -pedantic -fno-strict-aliasing" AC_SUBST([ippdb_CFLAGS]) Index: /trunk/ippdb/src/ippdb.c =================================================================== --- /trunk/ippdb/src/ippdb.c (revision 14450) +++ /trunk/ippdb/src/ippdb.c (revision 14451) @@ -20,5 +20,5 @@ /* * - * This file was generated by glueforge 1.01 + * This file was generated by glueforge 1.03 * * Do NOT directly edit this file. @@ -69,4 +69,5 @@ #define DETRESIDEXP_TABLE_NAME "detResidExp" #define DETRUNSUMMARY_TABLE_NAME "detRunSummary" +#define DETREGISTEREDIMFILE_TABLE_NAME "detRegisteredImfile" #define MAX_STRING_LENGTH 1024 @@ -5965,10 +5966,10 @@ return false; } - if (!psMetadataAdd(md, PS_LIST_TAIL, "fwhm", PS_DATA_F32, NULL, 0.0)) { + if (!psMetadataAdd(md, PS_LIST_TAIL, "fwhm", PS_DATA_F32, "# replace this with fwhm_major", 0.0)) { psError(PS_ERR_UNKNOWN, false, "failed to add item fwhm"); psFree(md); return false; } - if (!psMetadataAdd(md, PS_LIST_TAIL, "fwhm_range", PS_DATA_F32, NULL, 0.0)) { + if (!psMetadataAdd(md, PS_LIST_TAIL, "fwhm_range", PS_DATA_F32, "# replace this with fwhm_minor", 0.0)) { psError(PS_ERR_UNKNOWN, false, "failed to add item fwhm_range"); psFree(md); @@ -12064,5 +12065,5 @@ return false; } - if (!psMetadataAdd(md, PS_LIST_TAIL, "iteration", PS_DATA_S32, "Key", 0)) { + if (!psMetadataAdd(md, PS_LIST_TAIL, "iteration", PS_DATA_S32, "Key INDEX(det_id, iteration)", 0)) { psError(PS_ERR_UNKNOWN, false, "failed to add item iteration"); psFree(md); @@ -16416,5 +16417,5 @@ static void detResidImfileRowFree(detResidImfileRow *object); -detResidImfileRow *detResidImfileRowAlloc(psS64 det_id, psS32 iteration, psS64 exp_id, const char *class_id, const char *uri, const char *recipe, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 bin_stdev, psF64 fringe_0, psF64 fringe_1, psF64 fringe_2, psF64 user_1, psF64 user_2, psF64 user_3, psF64 user_4, psF64 user_5, const char *path_base, psS16 fault) +detResidImfileRow *detResidImfileRowAlloc(psS64 det_id, psS32 iteration, psS64 exp_id, const char *class_id, const char *uri, const char *recipe, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 bg_skewness, psF64 bg_kurtosis, psF64 bin_stdev, psF64 fringe_0, psF64 fringe_1, psF64 fringe_2, psF64 fringe_resid_0, psF64 fringe_resid_1, psF64 fringe_resid_2, psF64 user_1, psF64 user_2, psF64 user_3, psF64 user_4, psF64 user_5, const char *path_base, psS16 fault) { detResidImfileRow *_object; @@ -16432,8 +16433,13 @@ _object->bg_stdev = bg_stdev; _object->bg_mean_stdev = bg_mean_stdev; + _object->bg_skewness = bg_skewness; + _object->bg_kurtosis = bg_kurtosis; _object->bin_stdev = bin_stdev; _object->fringe_0 = fringe_0; _object->fringe_1 = fringe_1; _object->fringe_2 = fringe_2; + _object->fringe_resid_0 = fringe_resid_0; + _object->fringe_resid_1 = fringe_resid_1; + _object->fringe_resid_2 = fringe_resid_2; _object->user_1 = user_1; _object->user_2 = user_2; @@ -16503,4 +16509,14 @@ return false; } + if (!psMetadataAdd(md, PS_LIST_TAIL, "bg_skewness", PS_DATA_F64, NULL, 0.0)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item bg_skewness"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "bg_kurtosis", PS_DATA_F64, NULL, 0.0)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item bg_kurtosis"); + psFree(md); + return false; + } if (!psMetadataAdd(md, PS_LIST_TAIL, "bin_stdev", PS_DATA_F64, NULL, 0.0)) { psError(PS_ERR_UNKNOWN, false, "failed to add item bin_stdev"); @@ -16523,4 +16539,19 @@ return false; } + if (!psMetadataAdd(md, PS_LIST_TAIL, "fringe_resid_0", PS_DATA_F64, NULL, 0.0)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item fringe_resid_0"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "fringe_resid_1", PS_DATA_F64, NULL, 0.0)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item fringe_resid_1"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "fringe_resid_2", PS_DATA_F64, NULL, 0.0)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item fringe_resid_2"); + psFree(md); + return false; + } if (!psMetadataAdd(md, PS_LIST_TAIL, "user_1", PS_DATA_F64, NULL, 0.0)) { psError(PS_ERR_UNKNOWN, false, "failed to add item user_1"); @@ -16571,5 +16602,5 @@ } -bool detResidImfileInsert(psDB * dbh, psS64 det_id, psS32 iteration, psS64 exp_id, const char *class_id, const char *uri, const char *recipe, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 bin_stdev, psF64 fringe_0, psF64 fringe_1, psF64 fringe_2, psF64 user_1, psF64 user_2, psF64 user_3, psF64 user_4, psF64 user_5, const char *path_base, psS16 fault) +bool detResidImfileInsert(psDB * dbh, psS64 det_id, psS32 iteration, psS64 exp_id, const char *class_id, const char *uri, const char *recipe, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 bg_skewness, psF64 bg_kurtosis, psF64 bin_stdev, psF64 fringe_0, psF64 fringe_1, psF64 fringe_2, psF64 fringe_resid_0, psF64 fringe_resid_1, psF64 fringe_resid_2, psF64 user_1, psF64 user_2, psF64 user_3, psF64 user_4, psF64 user_5, const char *path_base, psS16 fault) { psMetadata *md = psMetadataAlloc(); @@ -16619,4 +16650,14 @@ return false; } + if (!psMetadataAdd(md, PS_LIST_TAIL, "bg_skewness", PS_DATA_F64, NULL, bg_skewness)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item bg_skewness"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "bg_kurtosis", PS_DATA_F64, NULL, bg_kurtosis)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item bg_kurtosis"); + psFree(md); + return false; + } if (!psMetadataAdd(md, PS_LIST_TAIL, "bin_stdev", PS_DATA_F64, NULL, bin_stdev)) { psError(PS_ERR_UNKNOWN, false, "failed to add item bin_stdev"); @@ -16636,4 +16677,19 @@ if (!psMetadataAdd(md, PS_LIST_TAIL, "fringe_2", PS_DATA_F64, NULL, fringe_2)) { psError(PS_ERR_UNKNOWN, false, "failed to add item fringe_2"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "fringe_resid_0", PS_DATA_F64, NULL, fringe_resid_0)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item fringe_resid_0"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "fringe_resid_1", PS_DATA_F64, NULL, fringe_resid_1)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item fringe_resid_1"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "fringe_resid_2", PS_DATA_F64, NULL, fringe_resid_2)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item fringe_resid_2"); psFree(md); return false; @@ -16697,5 +16753,5 @@ bool detResidImfileInsertObject(psDB *dbh, detResidImfileRow *object) { - 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->bin_stdev, object->fringe_0, object->fringe_1, object->fringe_2, object->user_1, object->user_2, object->user_3, object->user_4, object->user_5, object->path_base, object->fault); + 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->bg_skewness, object->bg_kurtosis, object->bin_stdev, object->fringe_0, object->fringe_1, object->fringe_2, object->fringe_resid_0, object->fringe_resid_1, object->fringe_resid_2, object->user_1, object->user_2, object->user_3, object->user_4, object->user_5, object->path_base, object->fault); } @@ -16815,4 +16871,14 @@ return false; } + if (!psMetadataAdd(md, PS_LIST_TAIL, "bg_skewness", PS_DATA_F64, NULL, object->bg_skewness)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item bg_skewness"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "bg_kurtosis", PS_DATA_F64, NULL, object->bg_kurtosis)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item bg_kurtosis"); + psFree(md); + return false; + } if (!psMetadataAdd(md, PS_LIST_TAIL, "bin_stdev", PS_DATA_F64, NULL, object->bin_stdev)) { psError(PS_ERR_UNKNOWN, false, "failed to add item bin_stdev"); @@ -16835,4 +16901,19 @@ return false; } + if (!psMetadataAdd(md, PS_LIST_TAIL, "fringe_resid_0", PS_DATA_F64, NULL, object->fringe_resid_0)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item fringe_resid_0"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "fringe_resid_1", PS_DATA_F64, NULL, object->fringe_resid_1)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item fringe_resid_1"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "fringe_resid_2", PS_DATA_F64, NULL, object->fringe_resid_2)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item fringe_resid_2"); + psFree(md); + return false; + } if (!psMetadataAdd(md, PS_LIST_TAIL, "user_1", PS_DATA_F64, NULL, object->user_1)) { psError(PS_ERR_UNKNOWN, false, "failed to add item user_1"); @@ -16924,4 +17005,14 @@ return false; } + psF64 bg_skewness = psMetadataLookupF64(&status, md, "bg_skewness"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item bg_skewness"); + return false; + } + psF64 bg_kurtosis = psMetadataLookupF64(&status, md, "bg_kurtosis"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item bg_kurtosis"); + return false; + } psF64 bin_stdev = psMetadataLookupF64(&status, md, "bin_stdev"); if (!status) { @@ -16944,4 +17035,19 @@ return false; } + psF64 fringe_resid_0 = psMetadataLookupF64(&status, md, "fringe_resid_0"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item fringe_resid_0"); + return false; + } + psF64 fringe_resid_1 = psMetadataLookupF64(&status, md, "fringe_resid_1"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item fringe_resid_1"); + return false; + } + psF64 fringe_resid_2 = psMetadataLookupF64(&status, md, "fringe_resid_2"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item fringe_resid_2"); + return false; + } psF64 user_1 = psMetadataLookupF64(&status, md, "user_1"); if (!status) { @@ -16980,5 +17086,5 @@ } - return detResidImfileRowAlloc(det_id, iteration, exp_id, class_id, uri, recipe, bg, bg_stdev, bg_mean_stdev, bin_stdev, fringe_0, fringe_1, fringe_2, user_1, user_2, user_3, user_4, user_5, path_base, fault); + return detResidImfileRowAlloc(det_id, iteration, exp_id, class_id, uri, recipe, bg, bg_stdev, bg_mean_stdev, bg_skewness, bg_kurtosis, bin_stdev, fringe_0, fringe_1, fringe_2, fringe_resid_0, fringe_resid_1, fringe_resid_2, user_1, user_2, user_3, user_4, user_5, path_base, fault); } psArray *detResidImfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) @@ -17092,5 +17198,5 @@ static void detResidExpRowFree(detResidExpRow *object); -detResidExpRow *detResidExpRowAlloc(psS64 det_id, psS32 iteration, psS64 exp_id, const char *recipe, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 bin_stdev, psF64 fringe_0, psF64 fringe_1, psF64 fringe_2, psF64 user_1, psF64 user_2, psF64 user_3, psF64 user_4, psF64 user_5, const char *path_base, bool accept, psS16 fault) +detResidExpRow *detResidExpRowAlloc(psS64 det_id, psS32 iteration, psS64 exp_id, const char *recipe, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 bg_skewness, psF64 bg_kurtosis, psF64 bin_stdev, psF64 fringe_0, psF64 fringe_1, psF64 fringe_2, psF64 fringe_resid_0, psF64 fringe_resid_1, psF64 fringe_resid_2, psF64 user_1, psF64 user_2, psF64 user_3, psF64 user_4, psF64 user_5, const char *path_base, bool accept, psS16 fault) { detResidExpRow *_object; @@ -17106,8 +17212,13 @@ _object->bg_stdev = bg_stdev; _object->bg_mean_stdev = bg_mean_stdev; + _object->bg_skewness = bg_skewness; + _object->bg_kurtosis = bg_kurtosis; _object->bin_stdev = bin_stdev; _object->fringe_0 = fringe_0; _object->fringe_1 = fringe_1; _object->fringe_2 = fringe_2; + _object->fringe_resid_0 = fringe_resid_0; + _object->fringe_resid_1 = fringe_resid_1; + _object->fringe_resid_2 = fringe_resid_2; _object->user_1 = user_1; _object->user_2 = user_2; @@ -17166,4 +17277,14 @@ return false; } + if (!psMetadataAdd(md, PS_LIST_TAIL, "bg_skewness", PS_DATA_F64, NULL, 0.0)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item bg_skewness"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "bg_kurtosis", PS_DATA_F64, NULL, 0.0)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item bg_kurtosis"); + psFree(md); + return false; + } if (!psMetadataAdd(md, PS_LIST_TAIL, "bin_stdev", PS_DATA_F64, NULL, 0.0)) { psError(PS_ERR_UNKNOWN, false, "failed to add item bin_stdev"); @@ -17186,4 +17307,19 @@ return false; } + if (!psMetadataAdd(md, PS_LIST_TAIL, "fringe_resid_0", PS_DATA_F64, NULL, 0.0)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item fringe_resid_0"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "fringe_resid_1", PS_DATA_F64, NULL, 0.0)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item fringe_resid_1"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "fringe_resid_2", PS_DATA_F64, NULL, 0.0)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item fringe_resid_2"); + psFree(md); + return false; + } if (!psMetadataAdd(md, PS_LIST_TAIL, "user_1", PS_DATA_F64, NULL, 0.0)) { psError(PS_ERR_UNKNOWN, false, "failed to add item user_1"); @@ -17239,5 +17375,5 @@ } -bool detResidExpInsert(psDB * dbh, psS64 det_id, psS32 iteration, psS64 exp_id, const char *recipe, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 bin_stdev, psF64 fringe_0, psF64 fringe_1, psF64 fringe_2, psF64 user_1, psF64 user_2, psF64 user_3, psF64 user_4, psF64 user_5, const char *path_base, bool accept, psS16 fault) +bool detResidExpInsert(psDB * dbh, psS64 det_id, psS32 iteration, psS64 exp_id, const char *recipe, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 bg_skewness, psF64 bg_kurtosis, psF64 bin_stdev, psF64 fringe_0, psF64 fringe_1, psF64 fringe_2, psF64 fringe_resid_0, psF64 fringe_resid_1, psF64 fringe_resid_2, psF64 user_1, psF64 user_2, psF64 user_3, psF64 user_4, psF64 user_5, const char *path_base, bool accept, psS16 fault) { psMetadata *md = psMetadataAlloc(); @@ -17277,4 +17413,14 @@ return false; } + if (!psMetadataAdd(md, PS_LIST_TAIL, "bg_skewness", PS_DATA_F64, NULL, bg_skewness)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item bg_skewness"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "bg_kurtosis", PS_DATA_F64, NULL, bg_kurtosis)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item bg_kurtosis"); + psFree(md); + return false; + } if (!psMetadataAdd(md, PS_LIST_TAIL, "bin_stdev", PS_DATA_F64, NULL, bin_stdev)) { psError(PS_ERR_UNKNOWN, false, "failed to add item bin_stdev"); @@ -17294,4 +17440,19 @@ if (!psMetadataAdd(md, PS_LIST_TAIL, "fringe_2", PS_DATA_F64, NULL, fringe_2)) { psError(PS_ERR_UNKNOWN, false, "failed to add item fringe_2"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "fringe_resid_0", PS_DATA_F64, NULL, fringe_resid_0)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item fringe_resid_0"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "fringe_resid_1", PS_DATA_F64, NULL, fringe_resid_1)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item fringe_resid_1"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "fringe_resid_2", PS_DATA_F64, NULL, fringe_resid_2)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item fringe_resid_2"); psFree(md); return false; @@ -17360,5 +17521,5 @@ bool detResidExpInsertObject(psDB *dbh, detResidExpRow *object) { - return detResidExpInsert(dbh, object->det_id, object->iteration, object->exp_id, object->recipe, object->bg, object->bg_stdev, object->bg_mean_stdev, object->bin_stdev, object->fringe_0, object->fringe_1, object->fringe_2, object->user_1, object->user_2, object->user_3, object->user_4, object->user_5, object->path_base, object->accept, object->fault); + return detResidExpInsert(dbh, object->det_id, object->iteration, object->exp_id, object->recipe, object->bg, object->bg_stdev, object->bg_mean_stdev, object->bg_skewness, object->bg_kurtosis, object->bin_stdev, object->fringe_0, object->fringe_1, object->fringe_2, object->fringe_resid_0, object->fringe_resid_1, object->fringe_resid_2, object->user_1, object->user_2, object->user_3, object->user_4, object->user_5, object->path_base, object->accept, object->fault); } @@ -17468,4 +17629,14 @@ return false; } + if (!psMetadataAdd(md, PS_LIST_TAIL, "bg_skewness", PS_DATA_F64, NULL, object->bg_skewness)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item bg_skewness"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "bg_kurtosis", PS_DATA_F64, NULL, object->bg_kurtosis)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item bg_kurtosis"); + psFree(md); + return false; + } if (!psMetadataAdd(md, PS_LIST_TAIL, "bin_stdev", PS_DATA_F64, NULL, object->bin_stdev)) { psError(PS_ERR_UNKNOWN, false, "failed to add item bin_stdev"); @@ -17488,4 +17659,19 @@ return false; } + if (!psMetadataAdd(md, PS_LIST_TAIL, "fringe_resid_0", PS_DATA_F64, NULL, object->fringe_resid_0)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item fringe_resid_0"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "fringe_resid_1", PS_DATA_F64, NULL, object->fringe_resid_1)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item fringe_resid_1"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "fringe_resid_2", PS_DATA_F64, NULL, object->fringe_resid_2)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item fringe_resid_2"); + psFree(md); + return false; + } if (!psMetadataAdd(md, PS_LIST_TAIL, "user_1", PS_DATA_F64, NULL, object->user_1)) { psError(PS_ERR_UNKNOWN, false, "failed to add item user_1"); @@ -17572,4 +17758,14 @@ return false; } + psF64 bg_skewness = psMetadataLookupF64(&status, md, "bg_skewness"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item bg_skewness"); + return false; + } + psF64 bg_kurtosis = psMetadataLookupF64(&status, md, "bg_kurtosis"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item bg_kurtosis"); + return false; + } psF64 bin_stdev = psMetadataLookupF64(&status, md, "bin_stdev"); if (!status) { @@ -17592,4 +17788,19 @@ return false; } + psF64 fringe_resid_0 = psMetadataLookupF64(&status, md, "fringe_resid_0"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item fringe_resid_0"); + return false; + } + psF64 fringe_resid_1 = psMetadataLookupF64(&status, md, "fringe_resid_1"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item fringe_resid_1"); + return false; + } + psF64 fringe_resid_2 = psMetadataLookupF64(&status, md, "fringe_resid_2"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item fringe_resid_2"); + return false; + } psF64 user_1 = psMetadataLookupF64(&status, md, "user_1"); if (!status) { @@ -17633,5 +17844,5 @@ } - return detResidExpRowAlloc(det_id, iteration, exp_id, recipe, bg, bg_stdev, bg_mean_stdev, bin_stdev, fringe_0, fringe_1, fringe_2, user_1, user_2, user_3, user_4, user_5, path_base, accept, fault); + return detResidExpRowAlloc(det_id, iteration, exp_id, recipe, bg, bg_stdev, bg_mean_stdev, bg_skewness, bg_kurtosis, bin_stdev, fringe_0, fringe_1, fringe_2, fringe_resid_0, fringe_resid_1, fringe_resid_2, user_1, user_2, user_3, user_4, user_5, path_base, accept, fault); } psArray *detResidExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) @@ -18142,2 +18353,551 @@ return true; } +static void detRegisteredImfileRowFree(detRegisteredImfileRow *object); + +detRegisteredImfileRow *detRegisteredImfileRowAlloc(psS64 det_id, psS32 iteration, const char *class_id, const char *uri, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 user_1, psF64 user_2, psF64 user_3, psF64 user_4, psF64 user_5, const char *path_base, psS16 fault) +{ + detRegisteredImfileRow *_object; + + _object = psAlloc(sizeof(detRegisteredImfileRow)); + psMemSetDeallocator(_object, (psFreeFunc)detRegisteredImfileRowFree); + + _object->det_id = det_id; + _object->iteration = iteration; + _object->class_id = psStringCopy(class_id); + _object->uri = psStringCopy(uri); + _object->bg = bg; + _object->bg_stdev = bg_stdev; + _object->bg_mean_stdev = bg_mean_stdev; + _object->user_1 = user_1; + _object->user_2 = user_2; + _object->user_3 = user_3; + _object->user_4 = user_4; + _object->user_5 = user_5; + _object->path_base = psStringCopy(path_base); + _object->fault = fault; + + return _object; +} + +static void detRegisteredImfileRowFree(detRegisteredImfileRow *object) +{ + psFree(object->class_id); + psFree(object->uri); + psFree(object->path_base); +} + +bool detRegisteredImfileCreateTable(psDB *dbh) +{ + psMetadata *md = psMetadataAlloc(); + if (!psMetadataAdd(md, PS_LIST_TAIL, "det_id", PS_DATA_S64, "Primary Key fkey(det_id, iteration) ref detRun(det_id, iteration)", 0)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item det_id"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "iteration", PS_DATA_S32, "Primary Key", 0)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item iteration"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "class_id", PS_DATA_STRING, "Primary Key", "64")) { + psError(PS_ERR_UNKNOWN, false, "failed to add item class_id"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "uri", PS_DATA_STRING, NULL, "255")) { + psError(PS_ERR_UNKNOWN, false, "failed to add item uri"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "bg", PS_DATA_F64, NULL, 0.0)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item bg"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "bg_stdev", PS_DATA_F64, NULL, 0.0)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item bg_stdev"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "bg_mean_stdev", PS_DATA_F64, 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, "user_1", PS_DATA_F64, NULL, 0.0)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item user_1"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "user_2", PS_DATA_F64, NULL, 0.0)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item user_2"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "user_3", PS_DATA_F64, NULL, 0.0)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item user_3"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "user_4", PS_DATA_F64, NULL, 0.0)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item user_4"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "user_5", PS_DATA_F64, NULL, 0.0)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item user_5"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "path_base", PS_DATA_STRING, NULL, "255")) { + psError(PS_ERR_UNKNOWN, false, "failed to add item path_base"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "fault", PS_DATA_S16, "Key NOT NULL", 0)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item fault"); + psFree(md); + return false; + } + + bool status = psDBCreateTable(dbh, DETREGISTEREDIMFILE_TABLE_NAME, md); + + psFree(md); + + return status; +} + +bool detRegisteredImfileDropTable(psDB *dbh) +{ + return psDBDropTable(dbh, DETREGISTEREDIMFILE_TABLE_NAME); +} + +bool detRegisteredImfileInsert(psDB * dbh, psS64 det_id, psS32 iteration, const char *class_id, const char *uri, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 user_1, psF64 user_2, psF64 user_3, psF64 user_4, psF64 user_5, const char *path_base, psS16 fault) +{ + psMetadata *md = psMetadataAlloc(); + if (!psMetadataAdd(md, PS_LIST_TAIL, "det_id", PS_DATA_S64, NULL, det_id)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item det_id"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "iteration", PS_DATA_S32, NULL, iteration)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item iteration"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "class_id", PS_DATA_STRING, NULL, class_id)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item class_id"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "uri", PS_DATA_STRING, NULL, uri)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item uri"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "bg", PS_DATA_F64, NULL, bg)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item bg"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "bg_stdev", PS_DATA_F64, NULL, bg_stdev)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item bg_stdev"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "bg_mean_stdev", PS_DATA_F64, 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, "user_1", PS_DATA_F64, NULL, user_1)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item user_1"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "user_2", PS_DATA_F64, NULL, user_2)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item user_2"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "user_3", PS_DATA_F64, NULL, user_3)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item user_3"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "user_4", PS_DATA_F64, NULL, user_4)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item user_4"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "user_5", PS_DATA_F64, NULL, user_5)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item user_5"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "path_base", PS_DATA_STRING, NULL, path_base)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item path_base"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "fault", PS_DATA_S16, NULL, fault)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item fault"); + psFree(md); + return false; + } + + bool status = psDBInsertOneRow(dbh, DETREGISTEREDIMFILE_TABLE_NAME, md); + psFree(md); + + return status; +} + +long long detRegisteredImfileDelete(psDB *dbh, const psMetadata *where, unsigned long long limit) +{ + long long deleted = 0; + + long long count = psDBDeleteRows(dbh, DETREGISTEREDIMFILE_TABLE_NAME, where, limit); + if (count < 0) { + psError(PS_ERR_UNKNOWN, true, "failed to delete row from detRegisteredImfile"); + return count; + + deleted += count; + } + + return deleted; +} +bool detRegisteredImfileInsertObject(psDB *dbh, detRegisteredImfileRow *object) +{ + return detRegisteredImfileInsert(dbh, object->det_id, object->iteration, object->class_id, object->uri, object->bg, object->bg_stdev, object->bg_mean_stdev, object->user_1, object->user_2, object->user_3, object->user_4, object->user_5, object->path_base, object->fault); +} + +bool detRegisteredImfileInsertObjects(psDB *dbh, psArray *objects) +{ + for (long i = 0; i < psArrayLength(objects); i++) { + if (!detRegisteredImfileInsertObject(dbh, objects->data[i])) { + return false; + } + } + + return true; +} + +bool detRegisteredImfileInsertFits(psDB *dbh, const psFits *fits) +{ + psArray *rowSet; + + // move to (the first?) extension named DETREGISTEREDIMFILE_TABLE_NAME + if (!psFitsMoveExtName(fits, DETREGISTEREDIMFILE_TABLE_NAME)) { + psError(PS_ERR_UNKNOWN, true, "failed to find FITS extension %s", DETREGISTEREDIMFILE_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, DETREGISTEREDIMFILE_TABLE_NAME, rowSet)) { + psError(PS_ERR_UNKNOWN, false, "databse insert failed"); + psFree(rowSet); + return false; + } + + psFree(rowSet); + + return true; +} + +bool detRegisteredImfileSelectRowsFits(psDB *dbh, psFits *fits, const psMetadata *where, unsigned long long limit) +{ + psArray *rowSet; + + rowSet = psDBSelectRows(dbh, DETREGISTEREDIMFILE_TABLE_NAME, where, limit); + if (!rowSet) { + return false; + } + + // output to fits + if (!psFitsWriteTable(fits, NULL, rowSet, DETREGISTEREDIMFILE_TABLE_NAME)) { + psError(PS_ERR_UNKNOWN, false, "FITS table write failed"); + psFree(rowSet); + return false; + } + + psFree(rowSet); + + return true; +} + +psMetadata *detRegisteredImfileMetadataFromObject(const detRegisteredImfileRow *object) +{ + psMetadata *md = psMetadataAlloc(); + if (!psMetadataAdd(md, PS_LIST_TAIL, "det_id", PS_DATA_S64, NULL, object->det_id)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item det_id"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "iteration", PS_DATA_S32, NULL, object->iteration)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item iteration"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "class_id", PS_DATA_STRING, NULL, object->class_id)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item class_id"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "uri", PS_DATA_STRING, NULL, object->uri)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item uri"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "bg", PS_DATA_F64, NULL, object->bg)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item bg"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "bg_stdev", PS_DATA_F64, NULL, object->bg_stdev)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item bg_stdev"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "bg_mean_stdev", PS_DATA_F64, NULL, object->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, "user_1", PS_DATA_F64, NULL, object->user_1)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item user_1"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "user_2", PS_DATA_F64, NULL, object->user_2)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item user_2"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "user_3", PS_DATA_F64, NULL, object->user_3)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item user_3"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "user_4", PS_DATA_F64, NULL, object->user_4)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item user_4"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "user_5", PS_DATA_F64, NULL, object->user_5)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item user_5"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "path_base", PS_DATA_STRING, NULL, object->path_base)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item path_base"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "fault", PS_DATA_S16, NULL, object->fault)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item fault"); + psFree(md); + return false; + } + + + return md; +} + +detRegisteredImfileRow *detRegisteredImfileObjectFromMetadata(psMetadata *md) +{ + +bool status = false; + psS64 det_id = psMetadataLookupS64(&status, md, "det_id"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item det_id"); + return false; + } + psS32 iteration = psMetadataLookupS32(&status, md, "iteration"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item iteration"); + return false; + } + char* class_id = psMetadataLookupPtr(&status, md, "class_id"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item class_id"); + return false; + } + char* uri = psMetadataLookupPtr(&status, md, "uri"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item uri"); + return false; + } + psF64 bg = psMetadataLookupF64(&status, md, "bg"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item bg"); + return false; + } + psF64 bg_stdev = psMetadataLookupF64(&status, md, "bg_stdev"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item bg_stdev"); + return false; + } + psF64 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; + } + psF64 user_1 = psMetadataLookupF64(&status, md, "user_1"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item user_1"); + return false; + } + psF64 user_2 = psMetadataLookupF64(&status, md, "user_2"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item user_2"); + return false; + } + psF64 user_3 = psMetadataLookupF64(&status, md, "user_3"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item user_3"); + return false; + } + psF64 user_4 = psMetadataLookupF64(&status, md, "user_4"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item user_4"); + return false; + } + psF64 user_5 = psMetadataLookupF64(&status, md, "user_5"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item user_5"); + return false; + } + char* path_base = psMetadataLookupPtr(&status, md, "path_base"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item path_base"); + return false; + } + psS16 fault = psMetadataLookupS16(&status, md, "fault"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item fault"); + return false; + } + + return detRegisteredImfileRowAlloc(det_id, iteration, class_id, uri, bg, bg_stdev, bg_mean_stdev, user_1, user_2, user_3, user_4, user_5, path_base, fault); +} +psArray *detRegisteredImfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) +{ + psArray *rowSet; + psArray *returnSet; + psU64 i; + + rowSet = psDBSelectRows(dbh, DETREGISTEREDIMFILE_TABLE_NAME, where, limit); + if (!rowSet) { + return NULL; + } + + // convert psMetadata rows to row objects + + returnSet = psArrayAllocEmpty(rowSet->n); + + for (i = 0; i < rowSet->n; i++) { + detRegisteredImfileRow *object = detRegisteredImfileObjectFromMetadata(rowSet->data[i]); + psArrayAdd(returnSet, 0, object); + psFree(object); + } + + psFree(rowSet); + + return returnSet; +} +bool detRegisteredImfileDeleteObject(psDB *dbh, const detRegisteredImfileRow *object) +{ + psMetadata *where = detRegisteredImfileMetadataFromObject(object); + long long count = psDBDeleteRows(dbh, DETREGISTEREDIMFILE_TABLE_NAME, where, 0); + psFree(where); + if (count < 0) { + psError(PS_ERR_UNKNOWN, true, "failed to delete row from detRegisteredImfile"); + 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, "detRegisteredImfileRow object matched more then one row. Check your database schema"); + return false; + } + + return true; +} +long long detRegisteredImfileDeleteRowObjects(psDB *dbh, const psArray *objects, unsigned long long limit) +{ + long long deleted = 0; + + for (long long i = 0; i < objects->n; i++) { + detRegisteredImfileRow *object = objects->data[i]; + psMetadata *where = detRegisteredImfileMetadataFromObject(object); + long long count = psDBDeleteRows(dbh, DETREGISTEREDIMFILE_TABLE_NAME, where, limit); + psFree(where); + if (count < 0) { + psError(PS_ERR_UNKNOWN, true, "failed to delete row from detRegisteredImfile"); + return count; + } + + deleted += count; + } + + return deleted; +} +bool detRegisteredImfilePrintObjects(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 = detRegisteredImfileMetadataFromObject(objects->data[i]); + if (!psMetadataAddMetadata( + output, + PS_LIST_TAIL, + DETREGISTEREDIMFILE_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; +} +bool detRegisteredImfilePrintObject(FILE *stream, detRegisteredImfileRow *object, bool mdcf) +{ + PS_ASSERT_PTR_NON_NULL(object, false); + + psMetadata *md = detRegisteredImfileMetadataFromObject(object); + + if (!ippdbPrintMetadataRaw(stream, md, mdcf)) { + psError(PS_ERR_UNKNOWN, false, "failed to print metadata"); + psFree(md); + } + + psFree(md); + + return true; +} Index: /trunk/ippdb/src/ippdb.h =================================================================== --- /trunk/ippdb/src/ippdb.h (revision 14450) +++ /trunk/ippdb/src/ippdb.h (revision 14451) @@ -20,5 +20,5 @@ /* * - * This file was generated by glueforge 1.01 + * This file was generated by glueforge 1.03 * * Do NOT directly edit this file. @@ -7889,8 +7889,13 @@ psF64 bg_stdev; psF64 bg_mean_stdev; + psF64 bg_skewness; + psF64 bg_kurtosis; psF64 bin_stdev; psF64 fringe_0; psF64 fringe_1; psF64 fringe_2; + psF64 fringe_resid_0; + psF64 fringe_resid_1; + psF64 fringe_resid_2; psF64 user_1; psF64 user_2; @@ -7917,8 +7922,13 @@ psF64 bg_stdev, psF64 bg_mean_stdev, + psF64 bg_skewness, + psF64 bg_kurtosis, psF64 bin_stdev, psF64 fringe_0, psF64 fringe_1, psF64 fringe_2, + psF64 fringe_resid_0, + psF64 fringe_resid_1, + psF64 fringe_resid_2, psF64 user_1, psF64 user_2, @@ -7966,8 +7976,13 @@ psF64 bg_stdev, psF64 bg_mean_stdev, + psF64 bg_skewness, + psF64 bg_kurtosis, psF64 bin_stdev, psF64 fringe_0, psF64 fringe_1, psF64 fringe_2, + psF64 fringe_resid_0, + psF64 fringe_resid_1, + psF64 fringe_resid_2, psF64 user_1, psF64 user_2, @@ -8139,8 +8154,13 @@ psF64 bg_stdev; psF64 bg_mean_stdev; + psF64 bg_skewness; + psF64 bg_kurtosis; psF64 bin_stdev; psF64 fringe_0; psF64 fringe_1; psF64 fringe_2; + psF64 fringe_resid_0; + psF64 fringe_resid_1; + psF64 fringe_resid_2; psF64 user_1; psF64 user_2; @@ -8166,8 +8186,13 @@ psF64 bg_stdev, psF64 bg_mean_stdev, + psF64 bg_skewness, + psF64 bg_kurtosis, psF64 bin_stdev, psF64 fringe_0, psF64 fringe_1, psF64 fringe_2, + psF64 fringe_resid_0, + psF64 fringe_resid_1, + psF64 fringe_resid_2, psF64 user_1, psF64 user_2, @@ -8214,8 +8239,13 @@ psF64 bg_stdev, psF64 bg_mean_stdev, + psF64 bg_skewness, + psF64 bg_kurtosis, psF64 bin_stdev, psF64 fringe_0, psF64 fringe_1, psF64 fringe_2, + psF64 fringe_resid_0, + psF64 fringe_resid_1, + psF64 fringe_resid_2, psF64 user_1, psF64 user_2, @@ -8588,4 +8618,238 @@ bool mdcf ///< format as mdconfig or simple ); +/** detRegisteredImfileRow data structure + * + * Structure for representing a single row of detRegisteredImfile table data. + */ + +typedef struct { + psS64 det_id; + psS32 iteration; + char *class_id; + char *uri; + psF64 bg; + psF64 bg_stdev; + psF64 bg_mean_stdev; + psF64 user_1; + psF64 user_2; + psF64 user_3; + psF64 user_4; + psF64 user_5; + char *path_base; + psS16 fault; +} detRegisteredImfileRow; + +/** Creates a new detRegisteredImfileRow object + * + * @return A new detRegisteredImfileRow object or NULL on failure. + */ + +detRegisteredImfileRow *detRegisteredImfileRowAlloc( + psS64 det_id, + psS32 iteration, + const char *class_id, + const char *uri, + psF64 bg, + psF64 bg_stdev, + psF64 bg_mean_stdev, + psF64 user_1, + psF64 user_2, + psF64 user_3, + psF64 user_4, + psF64 user_5, + const char *path_base, + psS16 fault +); + +/** Creates a new detRegisteredImfile table + * + * @return true on success + */ + +bool detRegisteredImfileCreateTable( + psDB *dbh ///< Database handle +); + +/** Deletes a detRegisteredImfile table + * + * @return true on success + */ + +bool detRegisteredImfileDropTable( + 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 detRegisteredImfileInsert( + psDB *dbh, ///< Database handle + psS64 det_id, + psS32 iteration, + const char *class_id, + const char *uri, + psF64 bg, + psF64 bg_stdev, + psF64 bg_mean_stdev, + psF64 user_1, + psF64 user_2, + psF64 user_3, + psF64 user_4, + psF64 user_5, + const char *path_base, + psS16 fault +); + +/** 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 detRegisteredImfileDelete( + psDB *dbh, ///< Database handle + const psMetadata *where, ///< Row match criteria + unsigned long long limit ///< Maximum number of elements to delete +); + +/** Insert a single detRegisteredImfileRow object into a table + * + * This function constructs and inserts a single row based on it's parameters. + * + * @return true on success + */ + +bool detRegisteredImfileInsertObject( + psDB *dbh, ///< Database handle + detRegisteredImfileRow *object ///< detRegisteredImfileRow object +); + +/** Insert an array of detRegisteredImfileRow object into a table + * + * This function constructs and inserts multiple rows based on it's parameters. + * + * @return true on success + */ + +bool detRegisteredImfileInsertObjects( + psDB *dbh, ///< Database handle + psArray *objects ///< array of detRegisteredImfileRow objects +); + +/** Insert data from a binary FITS table detRegisteredImfileRow 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 detRegisteredImfileInsertFits( + psDB *dbh, ///< Database handle + const psFits *fits ///< psFits object +); + +/** 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 detRegisteredImfileSelectRowsFits( + 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 detRegisteredImfileRow into an equivalent psMetadata + * + * @return A psMetadata pointer or NULL on error + */ + +psMetadata *detRegisteredImfileMetadataFromObject( + const detRegisteredImfileRow *object ///< fooRow to convert into a psMetadata +); + +/** Convert a psMetadata into an equivalent fooRow + * + * @return A detRegisteredImfileRow pointer or NULL on error + */ + +detRegisteredImfileRow *detRegisteredImfileObjectFromMetadata( + psMetadata *md ///< psMetadata to convert into a fooRow +); +/** Selects up to limit rows from the database and returns as detRegisteredImfileRow objects in a psArray + * + * See psDBSelectRows() for documentation on the format of where. + * + * @return A psArray pointer or NULL on error + */ + +psArray *detRegisteredImfileSelectRowObjects( + 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 detRegisteredImfile + * + * 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 detRegisteredImfileDeleteObject( + psDB *dbh, ///< Database handle + const detRegisteredImfileRow *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 detRegisteredImfileDeleteRowObjects( + 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 detRegisteredImfileRow 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 detRegisteredImfilePrintObjects( + FILE *stream, ///< a stream + psArray *objects, ///< An array of detRegisteredImfileRow objects + bool mdcf ///< format as mdconfig or simple +); +/** Formats and prints an detRegisteredImfileRow object + * + * When mdcf is set the formated output is in psMetadataConfig + * format, otherwise it is in a simple tabular format. + * + * @return true on success + */ + +bool detRegisteredImfilePrintObject( + FILE *stream, ///< a stream + detRegisteredImfileRow *object, ///< an detRegisteredImfileRow object + bool mdcf ///< format as mdconfig or simple +); /// @} @@ -8595,3 +8859,3 @@ #endif -#endif // DETRUNSUMMARY_DB_H +#endif // DETREGISTEREDIMFILE_DB_H Index: /trunk/ippdb/tests/alloc.c =================================================================== --- /trunk/ippdb/tests/alloc.c (revision 14450) +++ /trunk/ippdb/tests/alloc.c (revision 14451) @@ -1827,5 +1827,5 @@ detResidImfileRow *object; - object = detResidImfileRowAlloc(-64, -32, -64, "a string", "a string", "a string", 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, "a string", -16 ); + object = detResidImfileRowAlloc(-64, -32, -64, "a string", "a string", "a string", 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, "a string", -16 ); if (!object) { @@ -1869,4 +1869,12 @@ exit(EXIT_FAILURE); } + if (!object->bg_skewness == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->bg_kurtosis == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } if (!object->bin_stdev == 64.64) { psFree(object); @@ -1885,4 +1893,16 @@ exit(EXIT_FAILURE); } + if (!object->fringe_resid_0 == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->fringe_resid_1 == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->fringe_resid_2 == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } if (!object->user_1 == 64.64) { psFree(object); @@ -1920,5 +1940,5 @@ detResidExpRow *object; - object = detResidExpRowAlloc(-64, -32, -64, "a string", 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, "a string", true, -16 ); + object = detResidExpRowAlloc(-64, -32, -64, "a string", 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, "a string", true, -16 ); if (!object) { @@ -1954,4 +1974,12 @@ exit(EXIT_FAILURE); } + if (!object->bg_skewness == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->bg_kurtosis == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } if (!object->bin_stdev == 64.64) { psFree(object); @@ -1970,4 +1998,16 @@ exit(EXIT_FAILURE); } + if (!object->fringe_resid_0 == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->fringe_resid_1 == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->fringe_resid_2 == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } if (!object->user_1 == 64.64) { psFree(object); @@ -2036,4 +2076,73 @@ } if (!object->accept == true) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->fault == -16) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + detRegisteredImfileRow *object; + + object = detRegisteredImfileRowAlloc(-64, -32, "a string", "a string", 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, "a string", -16 ); + + if (!object) { + exit(EXIT_FAILURE); + } + + if (!object->det_id == -64) { + 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 (!object->bg == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->bg_stdev == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->bg_mean_stdev == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->user_1 == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->user_2 == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->user_3 == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->user_4 == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->user_5 == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->path_base, "a string", MAX_STRING_LENGTH)) { psFree(object); exit(EXIT_FAILURE); Index: /trunk/ippdb/tests/createtable.c =================================================================== --- /trunk/ippdb/tests/createtable.c (revision 14450) +++ /trunk/ippdb/tests/createtable.c (revision 14451) @@ -575,4 +575,19 @@ } + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if(!detRegisteredImfileCreateTable(dbh)) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + exit(EXIT_SUCCESS); } Index: /trunk/ippdb/tests/dbcleanup.c =================================================================== --- /trunk/ippdb/tests/dbcleanup.c (revision 14450) +++ /trunk/ippdb/tests/dbcleanup.c (revision 14451) @@ -49,4 +49,5 @@ p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS detResidExp"); p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS detRunSummary"); + p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS detRegisteredImfile"); psDBCleanup(dbh); Index: /trunk/ippdb/tests/dbsetup.c =================================================================== --- /trunk/ippdb/tests/dbsetup.c (revision 14450) +++ /trunk/ippdb/tests/dbsetup.c (revision 14451) @@ -127,4 +127,7 @@ detRunSummaryCreateTable(dbh); + p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS detRegisteredImfile"); + detRegisteredImfileCreateTable(dbh); + psDBCleanup(dbh); Index: /trunk/ippdb/tests/droptable.c =================================================================== --- /trunk/ippdb/tests/droptable.c (revision 14450) +++ /trunk/ippdb/tests/droptable.c (revision 14451) @@ -575,4 +575,19 @@ } + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if (!detRegisteredImfileDropTable(dbh)) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + exit(EXIT_SUCCESS); } Index: /trunk/ippdb/tests/insert.c =================================================================== --- /trunk/ippdb/tests/insert.c (revision 14450) +++ /trunk/ippdb/tests/insert.c (revision 14451) @@ -538,20 +538,20 @@ } - if (!detResidImfileInsert(dbh, -64, -32, -64, "a string", "a string", "a string", 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, "a string", -16)) { - exit(EXIT_FAILURE); - } - - psDBCleanup(dbh); - } - - { - psDB *dbh; - - dbh = psDBInit("localhost", "test", NULL, "test"); - if (!dbh) { - exit(EXIT_FAILURE); - } - - if (!detResidExpInsert(dbh, -64, -32, -64, "a string", 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, "a string", true, -16)) { + if (!detResidImfileInsert(dbh, -64, -32, -64, "a string", "a string", "a string", 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, "a string", -16)) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if (!detResidExpInsert(dbh, -64, -32, -64, "a string", 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, "a string", true, -16)) { exit(EXIT_FAILURE); } @@ -569,4 +569,19 @@ if (!detRunSummaryInsert(dbh, -64, -32, 64.64, 64.64, 64.64, true, -16)) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if (!detRegisteredImfileInsert(dbh, -64, -32, "a string", "a string", 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, "a string", -16)) { exit(EXIT_FAILURE); } Index: /trunk/ippdb/tests/insertfits.c =================================================================== --- /trunk/ippdb/tests/insertfits.c (revision 14450) +++ /trunk/ippdb/tests/insertfits.c (revision 14451) @@ -997,4 +997,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 (!detRegisteredImfileInsertFits(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 14450) +++ /trunk/ippdb/tests/insertobject.c (revision 14451) @@ -784,5 +784,5 @@ } - object = detResidImfileRowAlloc(-64, -32, -64, "a string", "a string", "a string", 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, "a string", -16); + object = detResidImfileRowAlloc(-64, -32, -64, "a string", "a string", "a string", 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, "a string", -16); if (!object) { exit(EXIT_FAILURE); @@ -806,5 +806,5 @@ } - object = detResidExpRowAlloc(-64, -32, -64, "a string", 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, "a string", true, -16); + object = detResidExpRowAlloc(-64, -32, -64, "a string", 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, "a string", true, -16); if (!object) { exit(EXIT_FAILURE); @@ -834,4 +834,26 @@ if (!detRunSummaryInsertObject(dbh, object)) { + exit(EXIT_FAILURE); + } + + psFree(object); + psDBCleanup(dbh); + } + + { + psDB *dbh; + detRegisteredImfileRow *object; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + object = detRegisteredImfileRowAlloc(-64, -32, "a string", "a string", 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, "a string", -16); + if (!object) { + exit(EXIT_FAILURE); + } + + if (!detRegisteredImfileInsertObject(dbh, object)) { exit(EXIT_FAILURE); } Index: /trunk/ippdb/tests/metadatafromobject.c =================================================================== --- /trunk/ippdb/tests/metadatafromobject.c (revision 14450) +++ /trunk/ippdb/tests/metadatafromobject.c (revision 14451) @@ -2053,5 +2053,5 @@ bool status; - object = detResidImfileRowAlloc(-64, -32, -64, "a string", "a string", "a string", 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, "a string", -16); + object = detResidImfileRowAlloc(-64, -32, -64, "a string", "a string", "a string", 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, "a string", -16); if (!object) { exit(EXIT_FAILURE); @@ -2099,4 +2099,12 @@ exit(EXIT_FAILURE); } + if (!psMetadataLookupF64(&status, md, "bg_skewness") == 64.64) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF64(&status, md, "bg_kurtosis") == 64.64) { + psFree(md); + exit(EXIT_FAILURE); + } if (!psMetadataLookupF64(&status, md, "bin_stdev") == 64.64) { psFree(md); @@ -2115,4 +2123,16 @@ exit(EXIT_FAILURE); } + if (!psMetadataLookupF64(&status, md, "fringe_resid_0") == 64.64) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF64(&status, md, "fringe_resid_1") == 64.64) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF64(&status, md, "fringe_resid_2") == 64.64) { + psFree(md); + exit(EXIT_FAILURE); + } if (!psMetadataLookupF64(&status, md, "user_1") == 64.64) { psFree(md); @@ -2151,5 +2171,5 @@ bool status; - object = detResidExpRowAlloc(-64, -32, -64, "a string", 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, "a string", true, -16); + object = detResidExpRowAlloc(-64, -32, -64, "a string", 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, "a string", true, -16); if (!object) { exit(EXIT_FAILURE); @@ -2189,4 +2209,12 @@ exit(EXIT_FAILURE); } + if (!psMetadataLookupF64(&status, md, "bg_skewness") == 64.64) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF64(&status, md, "bg_kurtosis") == 64.64) { + psFree(md); + exit(EXIT_FAILURE); + } if (!psMetadataLookupF64(&status, md, "bin_stdev") == 64.64) { psFree(md); @@ -2205,4 +2233,16 @@ exit(EXIT_FAILURE); } + if (!psMetadataLookupF64(&status, md, "fringe_resid_0") == 64.64) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF64(&status, md, "fringe_resid_1") == 64.64) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF64(&status, md, "fringe_resid_2") == 64.64) { + psFree(md); + exit(EXIT_FAILURE); + } if (!psMetadataLookupF64(&status, md, "user_1") == 64.64) { psFree(md); @@ -2277,4 +2317,79 @@ } if (!psMetadataLookupBool(&status, md, "accept") == true) { + psFree(md); + exit(EXIT_FAILURE); + } + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + } + + { + psMetadata *md; + detRegisteredImfileRow *object; + bool status; + + object = detRegisteredImfileRowAlloc(-64, -32, "a string", "a string", 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, "a string", -16); + if (!object) { + exit(EXIT_FAILURE); + } + + md = detRegisteredImfileMetadataFromObject(object); + if (!md) { + exit(EXIT_FAILURE); + } + + psFree(object); + + 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 (!psMetadataLookupF64(&status, md, "bg") == 64.64) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF64(&status, md, "bg_stdev") == 64.64) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF64(&status, md, "bg_mean_stdev") == 64.64) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF64(&status, md, "user_1") == 64.64) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF64(&status, md, "user_2") == 64.64) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF64(&status, md, "user_3") == 64.64) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF64(&status, md, "user_4") == 64.64) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF64(&status, md, "user_5") == 64.64) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "path_base"), "a string", MAX_STRING_LENGTH)) { psFree(md); exit(EXIT_FAILURE); Index: /trunk/ippdb/tests/objectfrommetadata.c =================================================================== --- /trunk/ippdb/tests/objectfrommetadata.c (revision 14450) +++ /trunk/ippdb/tests/objectfrommetadata.c (revision 14451) @@ -3287,4 +3287,12 @@ exit(EXIT_FAILURE); } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "bg_skewness", 0, NULL, 64.64)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "bg_kurtosis", 0, NULL, 64.64)) { + psFree(md); + exit(EXIT_FAILURE); + } if (!psMetadataAddF64(md, PS_LIST_TAIL, "bin_stdev", 0, NULL, 64.64)) { psFree(md); @@ -3300,4 +3308,16 @@ } if (!psMetadataAddF64(md, PS_LIST_TAIL, "fringe_2", 0, NULL, 64.64)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "fringe_resid_0", 0, NULL, 64.64)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "fringe_resid_1", 0, NULL, 64.64)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "fringe_resid_2", 0, NULL, 64.64)) { psFree(md); exit(EXIT_FAILURE); @@ -3373,4 +3393,12 @@ exit(EXIT_FAILURE); } + if (!object->bg_skewness == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->bg_kurtosis == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } if (!object->bin_stdev == 64.64) { psFree(object); @@ -3386,4 +3414,16 @@ } if (!object->fringe_2 == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->fringe_resid_0 == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->fringe_resid_1 == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->fringe_resid_2 == 64.64) { psFree(object); exit(EXIT_FAILURE); @@ -3451,4 +3491,12 @@ exit(EXIT_FAILURE); } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "bg_skewness", 0, NULL, 64.64)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "bg_kurtosis", 0, NULL, 64.64)) { + psFree(md); + exit(EXIT_FAILURE); + } if (!psMetadataAddF64(md, PS_LIST_TAIL, "bin_stdev", 0, NULL, 64.64)) { psFree(md); @@ -3464,4 +3512,16 @@ } if (!psMetadataAddF64(md, PS_LIST_TAIL, "fringe_2", 0, NULL, 64.64)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "fringe_resid_0", 0, NULL, 64.64)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "fringe_resid_1", 0, NULL, 64.64)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "fringe_resid_2", 0, NULL, 64.64)) { psFree(md); exit(EXIT_FAILURE); @@ -3533,4 +3593,12 @@ exit(EXIT_FAILURE); } + if (!object->bg_skewness == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->bg_kurtosis == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } if (!object->bin_stdev == 64.64) { psFree(object); @@ -3546,4 +3614,16 @@ } if (!object->fringe_2 == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->fringe_resid_0 == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->fringe_resid_1 == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->fringe_resid_2 == 64.64) { psFree(object); exit(EXIT_FAILURE); @@ -3654,4 +3734,130 @@ } + { + psMetadata *md; + detRegisteredImfileRow *object; + + md = psMetadataAlloc(); + 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 (!psMetadataAddF64(md, PS_LIST_TAIL, "bg", 0, NULL, 64.64)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "bg_stdev", 0, NULL, 64.64)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "bg_mean_stdev", 0, NULL, 64.64)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "user_1", 0, NULL, 64.64)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "user_2", 0, NULL, 64.64)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "user_3", 0, NULL, 64.64)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "user_4", 0, NULL, 64.64)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "user_5", 0, NULL, 64.64)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "path_base", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + psFree(md); + exit(EXIT_FAILURE); + } + + object = detRegisteredImfileObjectFromMetadata(md); + if (!object) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + + 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 (!object->bg == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->bg_stdev == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->bg_mean_stdev == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->user_1 == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->user_2 == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->user_3 == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->user_4 == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->user_5 == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->path_base, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + exit(EXIT_SUCCESS); } Index: /trunk/ippdb/tests/selectrowsfits.c =================================================================== --- /trunk/ippdb/tests/selectrowsfits.c (revision 14450) +++ /trunk/ippdb/tests/selectrowsfits.c (revision 14451) @@ -843,4 +843,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 (!detRegisteredImfileSelectRowsFits(dbh, fits, NULL, 1)) { + exit(EXIT_FAILURE); + } + + psFree(fits); + psDBCleanup(dbh); + } + exit(EXIT_SUCCESS); }