Index: /trunk/ippdb/Makefile.am =================================================================== --- /trunk/ippdb/Makefile.am (revision 9782) +++ /trunk/ippdb/Makefile.am (revision 9783) @@ -22,4 +22,5 @@ $(top_builddir)/docs/man/man3/p2PendingImfileRow.3 \ $(top_builddir)/docs/man/man3/p2ProcessedExpRow.3 \ + $(top_builddir)/docs/man/man3/p2MaskRow.3 \ $(top_builddir)/docs/man/man3/p2ProcessedImfileRow.3 \ $(top_builddir)/docs/man/man3/p3PendingExpRow.3 \ @@ -40,5 +41,5 @@ -docs/man/man3/ippdb.3 docs/man/man3/summitExpRow.3 docs/man/man3/pzPendingExpRow.3 docs/man/man3/pzPendingImfileRow.3 docs/man/man3/newExpRow.3 docs/man/man3/newImfileRow.3 docs/man/man3/rawDetrendExpRow.3 docs/man/man3/rawScienceExpRow.3 docs/man/man3/rawImfileRow.3 docs/man/man3/p1PendingExpRow.3 docs/man/man3/p2PendingExpRow.3 docs/man/man3/p2PendingImfileRow.3 docs/man/man3/p2ProcessedExpRow.3 docs/man/man3/p2ProcessedImfileRow.3 docs/man/man3/p3PendingExpRow.3 docs/man/man3/p3ProcessedExpRow.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/detMasterFrameRow.3 docs/man/man3/detMasterImfileRow.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/pzPendingExpRow.3 docs/man/man3/pzPendingImfileRow.3 docs/man/man3/newExpRow.3 docs/man/man3/newImfileRow.3 docs/man/man3/rawDetrendExpRow.3 docs/man/man3/rawScienceExpRow.3 docs/man/man3/rawImfileRow.3 docs/man/man3/p1PendingExpRow.3 docs/man/man3/p2PendingExpRow.3 docs/man/man3/p2PendingImfileRow.3 docs/man/man3/p2ProcessedExpRow.3 docs/man/man3/p2MaskRow.3 docs/man/man3/p2ProcessedImfileRow.3 docs/man/man3/p3PendingExpRow.3 docs/man/man3/p3ProcessedExpRow.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/detMasterFrameRow.3 docs/man/man3/detMasterImfileRow.3 docs/man/man3/detResidImfileRow.3 docs/man/man3/detResidExpRow.3 docs/man/man3/detRunSummaryRow.3: $(DOXYGEN) Index: /trunk/ippdb/configure.ac =================================================================== --- /trunk/ippdb/configure.ac (revision 9782) +++ /trunk/ippdb/configure.ac (revision 9783) @@ -1,4 +1,4 @@ dnl -dnl This file was generated by glueforge 0.29 +dnl This file was generated by glueforge 0.30 dnl dnl Do NOT directly edit this file. @@ -7,5 +7,5 @@ AC_PREREQ(2.59) -AC_INIT([ippdb], [0.0.51], [pan-starrs.ifa.hawaii.edu]) +AC_INIT([ippdb], [0.0.52], [pan-starrs.ifa.hawaii.edu]) AC_CONFIG_SRCDIR([ippdb.pc.in]) Index: /trunk/ippdb/src/ippdb.c =================================================================== --- /trunk/ippdb/src/ippdb.c (revision 9782) +++ /trunk/ippdb/src/ippdb.c (revision 9783) @@ -20,5 +20,5 @@ /* * - * This file was generated by glueforge 0.29 + * This file was generated by glueforge 0.30 * * Do NOT directly edit this file. @@ -43,4 +43,5 @@ #define P2PENDINGIMFILE_TABLE_NAME "p2PendingImfile" #define P2PROCESSEDEXP_TABLE_NAME "p2ProcessedExp" +#define P2MASK_TABLE_NAME "p2Mask" #define P2PROCESSEDIMFILE_TABLE_NAME "p2ProcessedImfile" #define P3PENDINGEXP_TABLE_NAME "p3PendingExp" @@ -4261,5 +4262,5 @@ static void p2PendingExpRowFree(p2PendingExpRow *object); -p2PendingExpRow *p2PendingExpRowAlloc(const char *exp_tag, const char *recipe, psS32 p1_version, psS32 p2_version) +p2PendingExpRow *p2PendingExpRowAlloc(const char *exp_tag, const char *recipe, psS32 p1_version, psS32 p2_version, const char *label) { p2PendingExpRow *_object; @@ -4272,4 +4273,5 @@ _object->p1_version = p1_version; _object->p2_version = p2_version; + _object->label = psStringCopy(label); return _object; @@ -4280,4 +4282,5 @@ psFree(object->exp_tag); psFree(object->recipe); + psFree(object->label); } @@ -4305,4 +4308,9 @@ return false; } + if (!psMetadataAdd(md, PS_LIST_TAIL, "label", PS_DATA_STRING, "key", "64")) { + psError(PS_ERR_UNKNOWN, false, "failed to add item label"); + psFree(md); + return false; + } bool status = psDBCreateTable(dbh, P2PENDINGEXP_TABLE_NAME, md); @@ -4318,5 +4326,5 @@ } -bool p2PendingExpInsert(psDB * dbh, const char *exp_tag, const char *recipe, psS32 p1_version, psS32 p2_version) +bool p2PendingExpInsert(psDB * dbh, const char *exp_tag, const char *recipe, psS32 p1_version, psS32 p2_version, const char *label) { psMetadata *md = psMetadataAlloc(); @@ -4338,4 +4346,9 @@ if (!psMetadataAdd(md, PS_LIST_TAIL, "p2_version", PS_DATA_S32, NULL, p2_version)) { psError(PS_ERR_UNKNOWN, false, "failed to add item p2_version"); + psFree(md); + return false; + } + 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; @@ -4364,5 +4377,5 @@ bool p2PendingExpInsertObject(psDB *dbh, p2PendingExpRow *object) { - return p2PendingExpInsert(dbh, object->exp_tag, object->recipe, object->p1_version, object->p2_version); + return p2PendingExpInsert(dbh, object->exp_tag, object->recipe, object->p1_version, object->p2_version, object->label); } @@ -4457,4 +4470,9 @@ return false; } + 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; + } @@ -4486,6 +4504,11 @@ return false; } - - return p2PendingExpRowAlloc(exp_tag, recipe, p1_version, p2_version); + char* label = psMetadataLookupPtr(&status, md, "label"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item label"); + return false; + } + + return p2PendingExpRowAlloc(exp_tag, recipe, p1_version, p2_version, label); } psArray *p2PendingExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) @@ -4951,5 +4974,5 @@ static void p2ProcessedExpRowFree(p2ProcessedExpRow *object); -p2ProcessedExpRow *p2ProcessedExpRowAlloc(const char *exp_tag, psS32 p1_version, psS32 p2_version) +p2ProcessedExpRow *p2ProcessedExpRowAlloc(const char *exp_tag, psS32 p1_version, psS32 p2_version, const char *label) { p2ProcessedExpRow *_object; @@ -4961,4 +4984,5 @@ _object->p1_version = p1_version; _object->p2_version = p2_version; + _object->label = psStringCopy(label); return _object; @@ -4968,4 +4992,5 @@ { psFree(object->exp_tag); + psFree(object->label); } @@ -4988,4 +5013,9 @@ return false; } + if (!psMetadataAdd(md, PS_LIST_TAIL, "label", PS_DATA_STRING, "key", "64")) { + psError(PS_ERR_UNKNOWN, false, "failed to add item label"); + psFree(md); + return false; + } bool status = psDBCreateTable(dbh, P2PROCESSEDEXP_TABLE_NAME, md); @@ -5001,5 +5031,5 @@ } -bool p2ProcessedExpInsert(psDB * dbh, const char *exp_tag, psS32 p1_version, psS32 p2_version) +bool p2ProcessedExpInsert(psDB * dbh, const char *exp_tag, psS32 p1_version, psS32 p2_version, const char *label) { psMetadata *md = psMetadataAlloc(); @@ -5016,4 +5046,9 @@ if (!psMetadataAdd(md, PS_LIST_TAIL, "p2_version", PS_DATA_S32, NULL, p2_version)) { psError(PS_ERR_UNKNOWN, false, "failed to add item p2_version"); + psFree(md); + return false; + } + 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; @@ -5042,5 +5077,5 @@ bool p2ProcessedExpInsertObject(psDB *dbh, p2ProcessedExpRow *object) { - return p2ProcessedExpInsert(dbh, object->exp_tag, object->p1_version, object->p2_version); + return p2ProcessedExpInsert(dbh, object->exp_tag, object->p1_version, object->p2_version, object->label); } @@ -5130,4 +5165,9 @@ return false; } + 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; + } @@ -5154,6 +5194,11 @@ return false; } - - return p2ProcessedExpRowAlloc(exp_tag, p1_version, p2_version); + char* label = psMetadataLookupPtr(&status, md, "label"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item label"); + return false; + } + + return p2ProcessedExpRowAlloc(exp_tag, p1_version, p2_version, label); } psArray *p2ProcessedExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) @@ -5250,4 +5295,263 @@ return true; } +static void p2MaskRowFree(p2MaskRow *object); + +p2MaskRow *p2MaskRowAlloc(const char *label) +{ + p2MaskRow *_object; + + _object = psAlloc(sizeof(p2MaskRow)); + psMemSetDeallocator(_object, (psFreeFunc)p2MaskRowFree); + + _object->label = psStringCopy(label); + + return _object; +} + +static void p2MaskRowFree(p2MaskRow *object) +{ + psFree(object->label); +} + +bool p2MaskCreateTable(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, P2MASK_TABLE_NAME, md); + + psFree(md); + + return status; +} + +bool p2MaskDropTable(psDB *dbh) +{ + return psDBDropTable(dbh, P2MASK_TABLE_NAME); +} + +bool p2MaskInsert(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, P2MASK_TABLE_NAME, md); + psFree(md); + + return status; +} + +long long p2MaskDelete(psDB *dbh, const psMetadata *where, unsigned long long limit) +{ + long long deleted = 0; + + long long count = psDBDeleteRows(dbh, P2MASK_TABLE_NAME, where, limit); + if (count < 0) { + psError(PS_ERR_UNKNOWN, true, "failed to delete row from p2Mask"); + return count; + + deleted += count; + } + + return deleted; +} +bool p2MaskInsertObject(psDB *dbh, p2MaskRow *object) +{ + return p2MaskInsert(dbh, object->label); +} + +bool p2MaskInsertObjects(psDB *dbh, psArray *objects) +{ + for (long i = 0; i < psArrayLength(objects); i++) { + if (!p2MaskInsertObject(dbh, objects->data[i])) { + return false; + } + } + + return true; +} + +bool p2MaskInsertFits(psDB *dbh, const psFits *fits) +{ + psArray *rowSet; + + // move to (the first?) extension named P2MASK_TABLE_NAME + if (!psFitsMoveExtName(fits, P2MASK_TABLE_NAME)) { + psError(PS_ERR_UNKNOWN, true, "failed to find FITS extension %s", P2MASK_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, P2MASK_TABLE_NAME, rowSet)) { + psError(PS_ERR_UNKNOWN, false, "databse insert failed"); + psFree(rowSet); + return false; + } + + psFree(rowSet); + + return true; +} + +bool p2MaskSelectRowsFits(psDB *dbh, psFits *fits, const psMetadata *where, unsigned long long limit) +{ + psArray *rowSet; + + rowSet = psDBSelectRows(dbh, P2MASK_TABLE_NAME, where, limit); + if (!rowSet) { + return false; + } + + // output to fits + if (!psFitsWriteTable(fits, NULL, rowSet, P2MASK_TABLE_NAME)) { + psError(PS_ERR_UNKNOWN, false, "FITS table write failed"); + psFree(rowSet); + return false; + } + + psFree(rowSet); + + return true; +} + +psMetadata *p2MaskMetadataFromObject(const p2MaskRow *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; +} + +p2MaskRow *p2MaskObjectFromMetadata(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 p2MaskRowAlloc(label); +} +psArray *p2MaskSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) +{ + psArray *rowSet; + psArray *returnSet; + psU64 i; + + rowSet = psDBSelectRows(dbh, P2MASK_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++) { + p2MaskRow *object = p2MaskObjectFromMetadata(rowSet->data[i]); + psArrayAdd(returnSet, 0, object); + psFree(object); + } + + psFree(rowSet); + + return returnSet; +} +bool p2MaskDeleteObject(psDB *dbh, const p2MaskRow *object) +{ + psMetadata *where = p2MaskMetadataFromObject(object); + long long count = psDBDeleteRows(dbh, P2MASK_TABLE_NAME, where, 0); + psFree(where) + if (count < 0) { + psError(PS_ERR_UNKNOWN, true, "failed to delete row from p2Mask"); + 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, "p2MaskRow object matched more then one row. Check your database schema"); + return false; + } + + return true; +} +long long p2MaskDeleteRowObjects(psDB *dbh, const psArray *objects, unsigned long long limit) +{ + long long deleted = 0; + + for (long long i = 0; i < objects->n; i++) { + p2MaskRow *object = objects->data[i]; + psMetadata *where = p2MaskMetadataFromObject(object); + long long count = psDBDeleteRows(dbh, P2MASK_TABLE_NAME, where, limit); + psFree(where) + if (count < 0) { + psError(PS_ERR_UNKNOWN, true, "failed to delete row from p2Mask"); + return count; + } + + deleted += count; + } + + return deleted; +} +bool p2MaskPrintObjects(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 = p2MaskMetadataFromObject(objects->data[i]); + if (!psMetadataAddMetadata( + output, + PS_LIST_TAIL, + P2MASK_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; +} static void p2ProcessedImfileRowFree(p2ProcessedImfileRow *object); Index: /trunk/ippdb/src/ippdb.h =================================================================== --- /trunk/ippdb/src/ippdb.h (revision 9782) +++ /trunk/ippdb/src/ippdb.h (revision 9783) @@ -20,5 +20,5 @@ /* * - * This file was generated by glueforge 0.29 + * This file was generated by glueforge 0.30 * * Do NOT directly edit this file. @@ -2010,4 +2010,5 @@ psS32 p1_version; psS32 p2_version; + char *label; } p2PendingExpRow; @@ -2021,5 +2022,6 @@ const char *recipe, psS32 p1_version, - psS32 p2_version + psS32 p2_version, + const char *label ); @@ -2054,5 +2056,6 @@ const char *recipe, psS32 p1_version, - psS32 p2_version + psS32 p2_version, + const char *label ); @@ -2397,4 +2400,5 @@ psS32 p1_version; psS32 p2_version; + char *label; } p2ProcessedExpRow; @@ -2407,5 +2411,6 @@ const char *exp_tag, psS32 p1_version, - psS32 p2_version + psS32 p2_version, + const char *label ); @@ -2439,5 +2444,6 @@ const char *exp_tag, psS32 p1_version, - psS32 p2_version + psS32 p2_version, + const char *label ); @@ -2574,4 +2580,186 @@ FILE *stream, ///< a stream psArray *objects, ///< An array of p2ProcessedExpRow objects + bool mdcf ///< format as mdconfig or simple +); +/** p2MaskRow data structure + * + * Structure for representing a single row of p2Mask table data. + */ + +typedef struct { + char *label; +} p2MaskRow; + +/** Creates a new p2MaskRow object + * + * @return A new p2MaskRow object or NULL on failure. + */ + +p2MaskRow *p2MaskRowAlloc( + const char *label +); + +/** Creates a new p2Mask table + * + * @return true on success + */ + +bool p2MaskCreateTable( + psDB *dbh ///< Database handle +); + +/** Deletes a p2Mask table + * + * @return true on success + */ + +bool p2MaskDropTable( + 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 p2MaskInsert( + 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 p2MaskDelete( + psDB *dbh, ///< Database handle + const psMetadata *where, ///< Row match criteria + unsigned long long limit ///< Maximum number of elements to delete +); + +/** Insert a single p2MaskRow object into a table + * + * This function constructs and inserts a single row based on it's parameters. + * + * @return true on success + */ + +bool p2MaskInsertObject( + psDB *dbh, ///< Database handle + p2MaskRow *object ///< p2MaskRow object +); + +/** Insert an array of p2MaskRow object into a table + * + * This function constructs and inserts multiple rows based on it's parameters. + * + * @return true on success + */ + +bool p2MaskInsertObjects( + psDB *dbh, ///< Database handle + psArray *objects ///< array of p2MaskRow objects +); + +/** Insert data from a binary FITS table p2MaskRow 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 p2MaskInsertFits( + 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 p2MaskSelectRowsFits( + 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 p2MaskRow into an equivalent psMetadata + * + * @return A psMetadata pointer or NULL on error + */ + +psMetadata *p2MaskMetadataFromObject( + const p2MaskRow *object ///< fooRow to convert into a psMetadata +); + +/** Convert a psMetadata into an equivalent fooRow + * + * @return A p2MaskRow pointer or NULL on error + */ + +p2MaskRow *p2MaskObjectFromMetadata( + psMetadata *md ///< psMetadata to convert into a fooRow +); +/** Selects up to limit rows from the database and returns as p2MaskRow objects in a psArray + * + * See psDBSelectRows() for documentation on the format of where. + * + * @return A psArray pointer or NULL on error + */ + +psArray *p2MaskSelectRowObjects( + 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 p2Mask + * + * 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 p2MaskDeleteObject( + psDB *dbh, ///< Database handle + const p2MaskRow *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 p2MaskDeleteRowObjects( + 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 p2MaskRow 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 p2MaskPrintObjects( + FILE *stream, ///< a stream + psArray *objects, ///< An array of p2MaskRow objects bool mdcf ///< format as mdconfig or simple ); Index: /trunk/ippdb/tests/alloc.c =================================================================== --- /trunk/ippdb/tests/alloc.c (revision 9782) +++ /trunk/ippdb/tests/alloc.c (revision 9783) @@ -477,5 +477,5 @@ p2PendingExpRow *object; - object = p2PendingExpRowAlloc("a string", "a string", -32, -32 ); + object = p2PendingExpRowAlloc("a string", "a string", -32, -32, "a string" ); if (!object) { @@ -499,4 +499,8 @@ exit(EXIT_FAILURE); } + if (strncmp(object->label, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } psFree(object); @@ -543,5 +547,5 @@ p2ProcessedExpRow *object; - object = p2ProcessedExpRowAlloc("a string", -32, -32 ); + object = p2ProcessedExpRowAlloc("a string", -32, -32, "a string" ); if (!object) { @@ -558,4 +562,25 @@ } if (!object->p2_version == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->label, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + p2MaskRow *object; + + object = p2MaskRowAlloc("a string" ); + + if (!object) { + exit(EXIT_FAILURE); + } + + if (strncmp(object->label, "a string", MAX_STRING_LENGTH)) { psFree(object); exit(EXIT_FAILURE); Index: /trunk/ippdb/tests/createtable.c =================================================================== --- /trunk/ippdb/tests/createtable.c (revision 9782) +++ /trunk/ippdb/tests/createtable.c (revision 9783) @@ -193,4 +193,19 @@ } + if(!p2MaskCreateTable(dbh)) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + if(!p2ProcessedImfileCreateTable(dbh)) { exit(EXIT_FAILURE); Index: /trunk/ippdb/tests/dbcleanup.c =================================================================== --- /trunk/ippdb/tests/dbcleanup.c (revision 9782) +++ /trunk/ippdb/tests/dbcleanup.c (revision 9783) @@ -23,4 +23,5 @@ p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p2PendingImfile"); p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p2ProcessedExp"); + p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p2Mask"); p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p2ProcessedImfile"); p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p3PendingExp"); Index: /trunk/ippdb/tests/dbsetup.c =================================================================== --- /trunk/ippdb/tests/dbsetup.c (revision 9782) +++ /trunk/ippdb/tests/dbsetup.c (revision 9783) @@ -48,4 +48,7 @@ p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p2ProcessedExp"); p2ProcessedExpCreateTable(dbh); + + p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p2Mask"); + p2MaskCreateTable(dbh); p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p2ProcessedImfile"); Index: /trunk/ippdb/tests/droptable.c =================================================================== --- /trunk/ippdb/tests/droptable.c (revision 9782) +++ /trunk/ippdb/tests/droptable.c (revision 9783) @@ -193,4 +193,19 @@ } + if (!p2MaskDropTable(dbh)) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + if (!p2ProcessedImfileDropTable(dbh)) { exit(EXIT_FAILURE); Index: /trunk/ippdb/tests/insert.c =================================================================== --- /trunk/ippdb/tests/insert.c (revision 9782) +++ /trunk/ippdb/tests/insert.c (revision 9783) @@ -148,5 +148,5 @@ } - if (!p2PendingExpInsert(dbh, "a string", "a string", -32, -32)) { + if (!p2PendingExpInsert(dbh, "a string", "a string", -32, -32, "a string")) { exit(EXIT_FAILURE); } @@ -178,5 +178,20 @@ } - if (!p2ProcessedExpInsert(dbh, "a string", -32, -32)) { + if (!p2ProcessedExpInsert(dbh, "a string", -32, -32, "a string")) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if (!p2MaskInsert(dbh, "a string")) { exit(EXIT_FAILURE); } Index: /trunk/ippdb/tests/insertfits.c =================================================================== --- /trunk/ippdb/tests/insertfits.c (revision 9782) +++ /trunk/ippdb/tests/insertfits.c (revision 9783) @@ -336,4 +336,30 @@ } + if (!p2MaskInsertFits(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 (!p2ProcessedImfileInsertFits(dbh, fits)) { exit(EXIT_FAILURE); Index: /trunk/ippdb/tests/insertobject.c =================================================================== --- /trunk/ippdb/tests/insertobject.c (revision 9782) +++ /trunk/ippdb/tests/insertobject.c (revision 9783) @@ -212,5 +212,5 @@ } - object = p2PendingExpRowAlloc("a string", "a string", -32, -32); + object = p2PendingExpRowAlloc("a string", "a string", -32, -32, "a string"); if (!object) { exit(EXIT_FAILURE); @@ -256,5 +256,5 @@ } - object = p2ProcessedExpRowAlloc("a string", -32, -32); + object = p2ProcessedExpRowAlloc("a string", -32, -32, "a string"); if (!object) { exit(EXIT_FAILURE); @@ -262,4 +262,26 @@ if (!p2ProcessedExpInsertObject(dbh, object)) { + exit(EXIT_FAILURE); + } + + psFree(object); + psDBCleanup(dbh); + } + + { + psDB *dbh; + p2MaskRow *object; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + object = p2MaskRowAlloc("a string"); + if (!object) { + exit(EXIT_FAILURE); + } + + if (!p2MaskInsertObject(dbh, object)) { exit(EXIT_FAILURE); } Index: /trunk/ippdb/tests/metadatafromobject.c =================================================================== --- /trunk/ippdb/tests/metadatafromobject.c (revision 9782) +++ /trunk/ippdb/tests/metadatafromobject.c (revision 9783) @@ -551,5 +551,5 @@ bool status; - object = p2PendingExpRowAlloc("a string", "a string", -32, -32); + object = p2PendingExpRowAlloc("a string", "a string", -32, -32, "a string"); if (!object) { exit(EXIT_FAILURE); @@ -579,4 +579,8 @@ exit(EXIT_FAILURE); } + if (strncmp(psMetadataLookupPtr(&status, md, "label"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } psFree(md); @@ -633,5 +637,5 @@ bool status; - object = p2ProcessedExpRowAlloc("a string", -32, -32); + object = p2ProcessedExpRowAlloc("a string", -32, -32, "a string"); if (!object) { exit(EXIT_FAILURE); @@ -654,4 +658,33 @@ } if (!psMetadataLookupS32(&status, md, "p2_version") == -32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "label"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + } + + { + psMetadata *md; + p2MaskRow *object; + bool status; + + object = p2MaskRowAlloc("a string"); + if (!object) { + exit(EXIT_FAILURE); + } + + md = p2MaskMetadataFromObject(object); + if (!md) { + exit(EXIT_FAILURE); + } + + psFree(object); + + if (strncmp(psMetadataLookupPtr(&status, md, "label"), "a string", MAX_STRING_LENGTH)) { psFree(md); exit(EXIT_FAILURE); Index: /trunk/ippdb/tests/objectfrommetadata.c =================================================================== --- /trunk/ippdb/tests/objectfrommetadata.c (revision 9782) +++ /trunk/ippdb/tests/objectfrommetadata.c (revision 9783) @@ -889,4 +889,8 @@ exit(EXIT_FAILURE); } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "label", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } object = p2PendingExpObjectFromMetadata(md); @@ -914,4 +918,8 @@ exit(EXIT_FAILURE); } + if (strncmp(object->label, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } psFree(object); @@ -1001,4 +1009,8 @@ exit(EXIT_FAILURE); } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "label", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } object = p2ProcessedExpObjectFromMetadata(md); @@ -1019,4 +1031,34 @@ } if (!object->p2_version == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->label, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + psMetadata *md; + p2MaskRow *object; + + md = psMetadataAlloc(); + if (!psMetadataAddStr(md, PS_LIST_TAIL, "label", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + + object = p2MaskObjectFromMetadata(md); + if (!object) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + + if (strncmp(object->label, "a string", MAX_STRING_LENGTH)) { psFree(object); exit(EXIT_FAILURE); Index: /trunk/ippdb/tests/selectrowsfits.c =================================================================== --- /trunk/ippdb/tests/selectrowsfits.c (revision 9782) +++ /trunk/ippdb/tests/selectrowsfits.c (revision 9783) @@ -285,4 +285,26 @@ } + if (!p2MaskSelectRowsFits(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 (!p2ProcessedImfileSelectRowsFits(dbh, fits, NULL, 1)) { exit(EXIT_FAILURE);