Index: trunk/dbconfig/changes.txt =================================================================== --- trunk/dbconfig/changes.txt (revision 17142) +++ trunk/dbconfig/changes.txt (revision 17144) @@ -142,2 +142,4 @@ ALTER TABLE warpRun ADD COLUMN label VARCHAR(64) AFTER workdir_state; ALTER TABLE warpRun ADD KEY(label); +CREATE TABLE warpMask (label VARCHAR(64), PRIMARY KEY(label)) ENGINE=innodb; + Index: trunk/dbconfig/warp.md =================================================================== --- trunk/dbconfig/warp.md (revision 17142) +++ trunk/dbconfig/warp.md (revision 17144) @@ -1,3 +1,3 @@ -# $Id: warp.md,v 1.14 2008-03-25 22:27:25 jhoblitt Exp $ +# $Id: warp.md,v 1.15 2008-03-25 23:14:07 jhoblitt Exp $ # @@ -51,2 +51,5 @@ END +warpMask METADATA + label STR 64 # Primary Key +END Index: trunk/ippdb/Makefile.am =================================================================== --- trunk/ippdb/Makefile.am (revision 17142) +++ trunk/ippdb/Makefile.am (revision 17144) @@ -29,4 +29,5 @@ $(top_builddir)/docs/man/man3/warpSkyCellMapRow.3 \ $(top_builddir)/docs/man/man3/warpSkyfileRow.3 \ + $(top_builddir)/docs/man/man3/warpMaskRow.3 \ $(top_builddir)/docs/man/man3/diffRunRow.3 \ $(top_builddir)/docs/man/man3/diffInputSkyfileRow.3 \ @@ -64,5 +65,5 @@ -docs/man/man3/ippdb.3 docs/man/man3/pzDataStoreRow.3 docs/man/man3/summitExpRow.3 docs/man/man3/summitImfileRow.3 docs/man/man3/pzDownloadExpRow.3 docs/man/man3/pzDownloadImfileRow.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/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 docs/man/man3/detCorrectedExpRow.3 docs/man/man3/detCorrectedImfileRow.3 docs/man/man3/magicRunRow.3 docs/man/man3/magicInputSkyfileRow.3 docs/man/man3/magicTreeRow.3 docs/man/man3/magicNodeResultRow.3 docs/man/man3/magicMaskRow.3 docs/man/man3/magicSkyfileMaskRow.3 docs/man/man3/calDBRow.3 docs/man/man3/calRunRow.3 docs/man/man3/flatcorrRunRow.3 docs/man/man3/flatcorrExpRow.3 docs/man/man3/pstampDataStoreRow.3 docs/man/man3/pstampRequestRow.3 docs/man/man3/pstampJobRow.3: +docs/man/man3/ippdb.3 docs/man/man3/pzDataStoreRow.3 docs/man/man3/summitExpRow.3 docs/man/man3/summitImfileRow.3 docs/man/man3/pzDownloadExpRow.3 docs/man/man3/pzDownloadImfileRow.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/warpSkyCellMapRow.3 docs/man/man3/warpSkyfileRow.3 docs/man/man3/warpMaskRow.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 docs/man/man3/detCorrectedExpRow.3 docs/man/man3/detCorrectedImfileRow.3 docs/man/man3/magicRunRow.3 docs/man/man3/magicInputSkyfileRow.3 docs/man/man3/magicTreeRow.3 docs/man/man3/magicNodeResultRow.3 docs/man/man3/magicMaskRow.3 docs/man/man3/magicSkyfileMaskRow.3 docs/man/man3/calDBRow.3 docs/man/man3/calRunRow.3 docs/man/man3/flatcorrRunRow.3 docs/man/man3/flatcorrExpRow.3 docs/man/man3/pstampDataStoreRow.3 docs/man/man3/pstampRequestRow.3 docs/man/man3/pstampJobRow.3: $(DOXYGEN) Index: trunk/ippdb/src/ippdb.c =================================================================== --- trunk/ippdb/src/ippdb.c (revision 17142) +++ trunk/ippdb/src/ippdb.c (revision 17144) @@ -50,4 +50,5 @@ #define WARPSKYCELLMAP_TABLE_NAME "warpSkyCellMap" #define WARPSKYFILE_TABLE_NAME "warpSkyfile" +#define WARPMASK_TABLE_NAME "warpMask" #define DIFFRUN_TABLE_NAME "diffRun" #define DIFFINPUTSKYFILE_TABLE_NAME "diffInputSkyfile" @@ -10922,4 +10923,284 @@ return true; } +static void warpMaskRowFree(warpMaskRow *object); + +warpMaskRow *warpMaskRowAlloc(const char *label) +{ + warpMaskRow *_object; + + _object = psAlloc(sizeof(warpMaskRow)); + psMemSetDeallocator(_object, (psFreeFunc)warpMaskRowFree); + + _object->label = psStringCopy(label); + + return _object; +} + +static void warpMaskRowFree(warpMaskRow *object) +{ + psFree(object->label); +} + +bool warpMaskCreateTable(psDB *dbh) +{ + psMetadata *md = psMetadataAlloc(); + if (!psMetadataAdd(md, PS_LIST_TAIL, "label", PS_DATA_STRING, "Primary Key", "64")) { + psError(PS_ERR_UNKNOWN, false, "failed to add item label"); + psFree(md); + return false; + } + + bool status = psDBCreateTable(dbh, WARPMASK_TABLE_NAME, md); + + psFree(md); + + return status; +} + +bool warpMaskDropTable(psDB *dbh) +{ + return psDBDropTable(dbh, WARPMASK_TABLE_NAME); +} + +bool warpMaskInsert(psDB * dbh, const char *label) +{ + psMetadata *md = psMetadataAlloc(); + if (!psMetadataAdd(md, PS_LIST_TAIL, "label", PS_DATA_STRING, NULL, label)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item label"); + psFree(md); + return false; + } + + bool status = psDBInsertOneRow(dbh, WARPMASK_TABLE_NAME, md); + psFree(md); + + return status; +} + +long long warpMaskDelete(psDB *dbh, const psMetadata *where, unsigned long long limit) +{ + long long deleted = 0; + + long long count = psDBDeleteRows(dbh, WARPMASK_TABLE_NAME, where, limit); + if (count < 0) { + psError(PS_ERR_UNKNOWN, true, "failed to delete row from warpMask"); + return count; + + deleted += count; + } + + return deleted; +} +bool warpMaskInsertObject(psDB *dbh, warpMaskRow *object) +{ + return warpMaskInsert(dbh, object->label); +} + +bool warpMaskInsertObjects(psDB *dbh, psArray *objects) +{ + for (long i = 0; i < psArrayLength(objects); i++) { + if (!warpMaskInsertObject(dbh, objects->data[i])) { + return false; + } + } + + return true; +} + +bool warpMaskInsertFits(psDB *dbh, const psFits *fits) +{ + psArray *rowSet; + + // move to (the first?) extension named WARPMASK_TABLE_NAME + if (!psFitsMoveExtName(fits, WARPMASK_TABLE_NAME)) { + psError(PS_ERR_UNKNOWN, true, "failed to find FITS extension %s", WARPMASK_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, WARPMASK_TABLE_NAME, rowSet)) { + psError(PS_ERR_UNKNOWN, false, "databse insert failed"); + psFree(rowSet); + return false; + } + + psFree(rowSet); + + return true; +} + +bool warpMaskSelectRowsFits(psDB *dbh, psFits *fits, const psMetadata *where, unsigned long long limit) +{ + psArray *rowSet; + + rowSet = psDBSelectRows(dbh, WARPMASK_TABLE_NAME, where, limit); + if (!rowSet) { + return false; + } + + // output to fits + if (!psFitsWriteTable(fits, NULL, rowSet, WARPMASK_TABLE_NAME)) { + psError(PS_ERR_UNKNOWN, false, "FITS table write failed"); + psFree(rowSet); + return false; + } + + psFree(rowSet); + + return true; +} + +psMetadata *warpMaskMetadataFromObject(const warpMaskRow *object) +{ + psMetadata *md = psMetadataAlloc(); + if (!psMetadataAdd(md, PS_LIST_TAIL, "label", PS_DATA_STRING, NULL, object->label)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item label"); + psFree(md); + return false; + } + + + return md; +} + +warpMaskRow *warpMaskObjectFromMetadata(psMetadata *md) +{ + +bool status = false; + char* label = psMetadataLookupPtr(&status, md, "label"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item label"); + return false; + } + + return warpMaskRowAlloc(label); +} +psArray *warpMaskSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) +{ + psArray *rowSet; + psArray *returnSet; + psU64 i; + + rowSet = psDBSelectRows(dbh, WARPMASK_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++) { + warpMaskRow *object = warpMaskObjectFromMetadata(rowSet->data[i]); + if (!object) { + psFree(object); + psFree(returnSet); + psError(PS_ERR_UNKNOWN, false, "database error"); + return NULL; + } + psArrayAdd(returnSet, 0, object); + psFree(object); + } + + psFree(rowSet); + + return returnSet; +} +bool warpMaskDeleteObject(psDB *dbh, const warpMaskRow *object) +{ + psMetadata *where = warpMaskMetadataFromObject(object); + long long count = psDBDeleteRows(dbh, WARPMASK_TABLE_NAME, where, 0); + psFree(where); + if (count < 0) { + psError(PS_ERR_UNKNOWN, true, "failed to delete row from warpMask"); + 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, "warpMaskRow object matched more then one row. Check your database schema"); + return false; + } + + return true; +} +long long warpMaskDeleteRowObjects(psDB *dbh, const psArray *objects, unsigned long long limit) +{ + long long deleted = 0; + + for (long long i = 0; i < objects->n; i++) { + warpMaskRow *object = objects->data[i]; + psMetadata *where = warpMaskMetadataFromObject(object); + long long count = psDBDeleteRows(dbh, WARPMASK_TABLE_NAME, where, limit); + psFree(where); + if (count < 0) { + psError(PS_ERR_UNKNOWN, true, "failed to delete row from warpMask"); + return count; + } + + deleted += count; + } + + return deleted; +} +bool warpMaskPrintObjects(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 = warpMaskMetadataFromObject(objects->data[i]); + if (!psMetadataAddMetadata( + output, + PS_LIST_TAIL, + WARPMASK_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 warpMaskPrintObject(FILE *stream, warpMaskRow *object, bool mdcf) +{ + PS_ASSERT_PTR_NON_NULL(object, false); + + psMetadata *md = warpMaskMetadataFromObject(object); + + if (!ippdbPrintMetadataRaw(stream, md, mdcf)) { + psError(PS_ERR_UNKNOWN, false, "failed to print metadata"); + psFree(md); + } + + psFree(md); + + return true; +} static void diffRunRowFree(diffRunRow *object); Index: trunk/ippdb/src/ippdb.h =================================================================== --- trunk/ippdb/src/ippdb.h (revision 17142) +++ trunk/ippdb/src/ippdb.h (revision 17144) @@ -4580,4 +4580,199 @@ bool mdcf ///< format as mdconfig or simple ); +/** warpMaskRow data structure + * + * Structure for representing a single row of warpMask table data. + */ + +typedef struct { + char *label; +} warpMaskRow; + +/** Creates a new warpMaskRow object + * + * @return A new warpMaskRow object or NULL on failure. + */ + +warpMaskRow *warpMaskRowAlloc( + const char *label +); + +/** Creates a new warpMask table + * + * @return true on success + */ + +bool warpMaskCreateTable( + psDB *dbh ///< Database handle +); + +/** Deletes a warpMask table + * + * @return true on success + */ + +bool warpMaskDropTable( + 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 warpMaskInsert( + psDB *dbh, ///< Database handle + const char *label +); + +/** 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 warpMaskDelete( + psDB *dbh, ///< Database handle + const psMetadata *where, ///< Row match criteria + unsigned long long limit ///< Maximum number of elements to delete +); + +/** Insert a single warpMaskRow object into a table + * + * This function constructs and inserts a single row based on it's parameters. + * + * @return true on success + */ + +bool warpMaskInsertObject( + psDB *dbh, ///< Database handle + warpMaskRow *object ///< warpMaskRow object +); + +/** Insert an array of warpMaskRow object into a table + * + * This function constructs and inserts multiple rows based on it's parameters. + * + * @return true on success + */ + +bool warpMaskInsertObjects( + psDB *dbh, ///< Database handle + psArray *objects ///< array of warpMaskRow objects +); + +/** Insert data from a binary FITS table warpMaskRow 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 warpMaskInsertFits( + 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 warpMaskSelectRowsFits( + 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 warpMaskRow into an equivalent psMetadata + * + * @return A psMetadata pointer or NULL on error + */ + +psMetadata *warpMaskMetadataFromObject( + const warpMaskRow *object ///< fooRow to convert into a psMetadata +); + +/** Convert a psMetadata into an equivalent fooRow + * + * @return A warpMaskRow pointer or NULL on error + */ + +warpMaskRow *warpMaskObjectFromMetadata( + psMetadata *md ///< psMetadata to convert into a fooRow +); +/** Selects up to limit rows from the database and returns as warpMaskRow objects in a psArray + * + * See psDBSelectRows() for documentation on the format of where. + * + * @return A psArray pointer or NULL on error + */ + +psArray *warpMaskSelectRowObjects( + 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 warpMask + * + * 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 warpMaskDeleteObject( + psDB *dbh, ///< Database handle + const warpMaskRow *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 warpMaskDeleteRowObjects( + 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 warpMaskRow 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 warpMaskPrintObjects( + FILE *stream, ///< a stream + psArray *objects, ///< An array of warpMaskRow objects + bool mdcf ///< format as mdconfig or simple +); +/** Formats and prints an warpMaskRow 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 warpMaskPrintObject( + FILE *stream, ///< a stream + warpMaskRow *object, ///< an warpMaskRow object + bool mdcf ///< format as mdconfig or simple +); /** diffRunRow data structure * Index: trunk/ippdb/tests/alloc.c =================================================================== --- trunk/ippdb/tests/alloc.c (revision 17142) +++ trunk/ippdb/tests/alloc.c (revision 17144) @@ -1328,4 +1328,21 @@ { + warpMaskRow *object; + + object = warpMaskRowAlloc("a string" ); + + if (!object) { + exit(EXIT_FAILURE); + } + + if (strncmp(object->label, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { diffRunRow *object; Index: trunk/ippdb/tests/createtable.c =================================================================== --- trunk/ippdb/tests/createtable.c (revision 17142) +++ trunk/ippdb/tests/createtable.c (revision 17144) @@ -298,4 +298,19 @@ } + if(!warpMaskCreateTable(dbh)) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + if(!diffRunCreateTable(dbh)) { exit(EXIT_FAILURE); Index: trunk/ippdb/tests/dbcleanup.c =================================================================== --- trunk/ippdb/tests/dbcleanup.c (revision 17142) +++ trunk/ippdb/tests/dbcleanup.c (revision 17144) @@ -30,4 +30,5 @@ p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS warpSkyCellMap"); p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS warpSkyfile"); + p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS warpMask"); p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS diffRun"); p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS diffInputSkyfile"); Index: trunk/ippdb/tests/dbsetup.c =================================================================== --- trunk/ippdb/tests/dbsetup.c (revision 17142) +++ trunk/ippdb/tests/dbsetup.c (revision 17144) @@ -69,4 +69,7 @@ p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS warpSkyfile"); warpSkyfileCreateTable(dbh); + + p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS warpMask"); + warpMaskCreateTable(dbh); p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS diffRun"); Index: trunk/ippdb/tests/droptable.c =================================================================== --- trunk/ippdb/tests/droptable.c (revision 17142) +++ trunk/ippdb/tests/droptable.c (revision 17144) @@ -298,4 +298,19 @@ } + if (!warpMaskDropTable(dbh)) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + if (!diffRunDropTable(dbh)) { exit(EXIT_FAILURE); Index: trunk/ippdb/tests/insert.c =================================================================== --- trunk/ippdb/tests/insert.c (revision 17142) +++ trunk/ippdb/tests/insert.c (revision 17144) @@ -298,4 +298,19 @@ } + if (!warpMaskInsert(dbh, "a string")) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + if (!diffRunInsert(dbh, -64, "a string", "a string", "a string", "0001-01-01T00:00:00Z", "a string", "a string")) { exit(EXIT_FAILURE); Index: trunk/ippdb/tests/insertfits.c =================================================================== --- trunk/ippdb/tests/insertfits.c (revision 17142) +++ trunk/ippdb/tests/insertfits.c (revision 17144) @@ -518,4 +518,30 @@ } + if (!warpMaskInsertFits(dbh, fits)) { + exit(EXIT_FAILURE); + } + + if (!psFitsClose(fits)) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + 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 (!diffRunInsertFits(dbh, fits)) { exit(EXIT_FAILURE); Index: trunk/ippdb/tests/insertobject.c =================================================================== --- trunk/ippdb/tests/insertobject.c (revision 17142) +++ trunk/ippdb/tests/insertobject.c (revision 17144) @@ -425,4 +425,26 @@ { psDB *dbh; + warpMaskRow *object; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + object = warpMaskRowAlloc("a string"); + if (!object) { + exit(EXIT_FAILURE); + } + + if (!warpMaskInsertObject(dbh, object)) { + exit(EXIT_FAILURE); + } + + psFree(object); + psDBCleanup(dbh); + } + + { + psDB *dbh; diffRunRow *object; Index: trunk/ippdb/tests/metadatafromobject.c =================================================================== --- trunk/ippdb/tests/metadatafromobject.c (revision 17142) +++ trunk/ippdb/tests/metadatafromobject.c (revision 17144) @@ -1455,4 +1455,29 @@ { psMetadata *md; + warpMaskRow *object; + bool status; + + object = warpMaskRowAlloc("a string"); + if (!object) { + exit(EXIT_FAILURE); + } + + md = warpMaskMetadataFromObject(object); + if (!md) { + exit(EXIT_FAILURE); + } + + psFree(object); + + if (strncmp(psMetadataLookupPtr(&status, md, "label"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + } + + { + psMetadata *md; diffRunRow *object; bool status; Index: trunk/ippdb/tests/objectfrommetadata.c =================================================================== --- trunk/ippdb/tests/objectfrommetadata.c (revision 17142) +++ trunk/ippdb/tests/objectfrommetadata.c (revision 17144) @@ -2444,4 +2444,30 @@ { psMetadata *md; + warpMaskRow *object; + + md = psMetadataAlloc(); + if (!psMetadataAddStr(md, PS_LIST_TAIL, "label", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + + object = warpMaskObjectFromMetadata(md); + if (!object) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + + if (strncmp(object->label, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + psMetadata *md; diffRunRow *object; Index: trunk/ippdb/tests/selectrowsfits.c =================================================================== --- trunk/ippdb/tests/selectrowsfits.c (revision 17142) +++ trunk/ippdb/tests/selectrowsfits.c (revision 17144) @@ -439,4 +439,26 @@ } + if (!warpMaskSelectRowsFits(dbh, fits, NULL, 1)) { + exit(EXIT_FAILURE); + } + + psFree(fits); + psDBCleanup(dbh); + } + + { + 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 (!diffRunSelectRowsFits(dbh, fits, NULL, 1)) { exit(EXIT_FAILURE);