Index: /trunk/ippdb/Makefile.am =================================================================== --- /trunk/ippdb/Makefile.am (revision 9787) +++ /trunk/ippdb/Makefile.am (revision 9788) @@ -26,4 +26,5 @@ $(top_builddir)/docs/man/man3/p3PendingExpRow.3 \ $(top_builddir)/docs/man/man3/p3ProcessedExpRow.3 \ + $(top_builddir)/docs/man/man3/p3MaskRow.3 \ $(top_builddir)/docs/man/man3/detRunRow.3 \ $(top_builddir)/docs/man/man3/detInputExpRow.3 \ @@ -41,5 +42,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/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: +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/p3MaskRow.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 9787) +++ /trunk/ippdb/configure.ac (revision 9788) @@ -7,5 +7,5 @@ AC_PREREQ(2.59) -AC_INIT([ippdb], [0.0.52], [pan-starrs.ifa.hawaii.edu]) +AC_INIT([ippdb], [0.0.53], [pan-starrs.ifa.hawaii.edu]) AC_CONFIG_SRCDIR([ippdb.pc.in]) Index: /trunk/ippdb/src/ippdb.c =================================================================== --- /trunk/ippdb/src/ippdb.c (revision 9787) +++ /trunk/ippdb/src/ippdb.c (revision 9788) @@ -47,4 +47,5 @@ #define P3PENDINGEXP_TABLE_NAME "p3PendingExp" #define P3PROCESSEDEXP_TABLE_NAME "p3ProcessedExp" +#define P3MASK_TABLE_NAME "p3Mask" #define DETRUN_TABLE_NAME "detRun" #define DETINPUTEXP_TABLE_NAME "detInputExp" @@ -6030,5 +6031,5 @@ static void p3PendingExpRowFree(p3PendingExpRow *object); -p3PendingExpRow *p3PendingExpRowAlloc(const char *exp_tag, psS32 p2_version, psS32 p3_version) +p3PendingExpRow *p3PendingExpRowAlloc(const char *exp_tag, psS32 p2_version, psS32 p3_version, const char *label) { p3PendingExpRow *_object; @@ -6040,4 +6041,5 @@ _object->p2_version = p2_version; _object->p3_version = p3_version; + _object->label = psStringCopy(label); return _object; @@ -6047,4 +6049,5 @@ { psFree(object->exp_tag); + psFree(object->label); } @@ -6067,4 +6070,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, P3PENDINGEXP_TABLE_NAME, md); @@ -6080,5 +6088,5 @@ } -bool p3PendingExpInsert(psDB * dbh, const char *exp_tag, psS32 p2_version, psS32 p3_version) +bool p3PendingExpInsert(psDB * dbh, const char *exp_tag, psS32 p2_version, psS32 p3_version, const char *label) { psMetadata *md = psMetadataAlloc(); @@ -6095,4 +6103,9 @@ if (!psMetadataAdd(md, PS_LIST_TAIL, "p3_version", PS_DATA_S32, NULL, p3_version)) { psError(PS_ERR_UNKNOWN, false, "failed to add item p3_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; @@ -6121,5 +6134,5 @@ bool p3PendingExpInsertObject(psDB *dbh, p3PendingExpRow *object) { - return p3PendingExpInsert(dbh, object->exp_tag, object->p2_version, object->p3_version); + return p3PendingExpInsert(dbh, object->exp_tag, object->p2_version, object->p3_version, object->label); } @@ -6209,4 +6222,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; + } @@ -6233,6 +6251,11 @@ return false; } - - return p3PendingExpRowAlloc(exp_tag, p2_version, p3_version); + char* label = psMetadataLookupPtr(&status, md, "label"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item label"); + return false; + } + + return p3PendingExpRowAlloc(exp_tag, p2_version, p3_version, label); } psArray *p3PendingExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) @@ -6331,5 +6354,5 @@ static void p3ProcessedExpRowFree(p3ProcessedExpRow *object); -p3ProcessedExpRow *p3ProcessedExpRowAlloc(const char *exp_tag, const char *uri, const char *recipe, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF32 sigma_ra, psF32 sigma_dec, psS32 nastro, const char *b1_uri, const char *b2_uri, psF32 zp_mean, psF32 zp_stdev, psS32 p2_version, psS32 p3_version) +p3ProcessedExpRow *p3ProcessedExpRowAlloc(const char *exp_tag, const char *uri, const char *recipe, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF32 sigma_ra, psF32 sigma_dec, psS32 nastro, const char *b1_uri, const char *b2_uri, psF32 zp_mean, psF32 zp_stdev, psS32 p2_version, psS32 p3_version, const char *label) { p3ProcessedExpRow *_object; @@ -6353,4 +6376,5 @@ _object->p2_version = p2_version; _object->p3_version = p3_version; + _object->label = psStringCopy(label); return _object; @@ -6364,4 +6388,5 @@ psFree(object->b1_uri); psFree(object->b2_uri); + psFree(object->label); } @@ -6444,4 +6469,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, P3PROCESSEDEXP_TABLE_NAME, md); @@ -6457,5 +6487,5 @@ } -bool p3ProcessedExpInsert(psDB * dbh, const char *exp_tag, const char *uri, const char *recipe, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF32 sigma_ra, psF32 sigma_dec, psS32 nastro, const char *b1_uri, const char *b2_uri, psF32 zp_mean, psF32 zp_stdev, psS32 p2_version, psS32 p3_version) +bool p3ProcessedExpInsert(psDB * dbh, const char *exp_tag, const char *uri, const char *recipe, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF32 sigma_ra, psF32 sigma_dec, psS32 nastro, const char *b1_uri, const char *b2_uri, psF32 zp_mean, psF32 zp_stdev, psS32 p2_version, psS32 p3_version, const char *label) { psMetadata *md = psMetadataAlloc(); @@ -6532,4 +6562,9 @@ if (!psMetadataAdd(md, PS_LIST_TAIL, "p3_version", PS_DATA_S32, NULL, p3_version)) { psError(PS_ERR_UNKNOWN, false, "failed to add item p3_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; @@ -6558,5 +6593,5 @@ bool p3ProcessedExpInsertObject(psDB *dbh, p3ProcessedExpRow *object) { - return p3ProcessedExpInsert(dbh, object->exp_tag, object->uri, object->recipe, object->bg, object->bg_stdev, object->bg_mean_stdev, object->sigma_ra, object->sigma_dec, object->nastro, object->b1_uri, object->b2_uri, object->zp_mean, object->zp_stdev, object->p2_version, object->p3_version); + return p3ProcessedExpInsert(dbh, object->exp_tag, object->uri, object->recipe, object->bg, object->bg_stdev, object->bg_mean_stdev, object->sigma_ra, object->sigma_dec, object->nastro, object->b1_uri, object->b2_uri, object->zp_mean, object->zp_stdev, object->p2_version, object->p3_version, object->label); } @@ -6706,4 +6741,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; + } @@ -6790,6 +6830,11 @@ return false; } - - return p3ProcessedExpRowAlloc(exp_tag, uri, recipe, bg, bg_stdev, bg_mean_stdev, sigma_ra, sigma_dec, nastro, b1_uri, b2_uri, zp_mean, zp_stdev, p2_version, p3_version); + char* label = psMetadataLookupPtr(&status, md, "label"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item label"); + return false; + } + + return p3ProcessedExpRowAlloc(exp_tag, uri, recipe, bg, bg_stdev, bg_mean_stdev, sigma_ra, sigma_dec, nastro, b1_uri, b2_uri, zp_mean, zp_stdev, p2_version, p3_version, label); } psArray *p3ProcessedExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) @@ -6886,4 +6931,263 @@ return true; } +static void p3MaskRowFree(p3MaskRow *object); + +p3MaskRow *p3MaskRowAlloc(const char *label) +{ + p3MaskRow *_object; + + _object = psAlloc(sizeof(p3MaskRow)); + psMemSetDeallocator(_object, (psFreeFunc)p3MaskRowFree); + + _object->label = psStringCopy(label); + + return _object; +} + +static void p3MaskRowFree(p3MaskRow *object) +{ + psFree(object->label); +} + +bool p3MaskCreateTable(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, P3MASK_TABLE_NAME, md); + + psFree(md); + + return status; +} + +bool p3MaskDropTable(psDB *dbh) +{ + return psDBDropTable(dbh, P3MASK_TABLE_NAME); +} + +bool p3MaskInsert(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, P3MASK_TABLE_NAME, md); + psFree(md); + + return status; +} + +long long p3MaskDelete(psDB *dbh, const psMetadata *where, unsigned long long limit) +{ + long long deleted = 0; + + long long count = psDBDeleteRows(dbh, P3MASK_TABLE_NAME, where, limit); + if (count < 0) { + psError(PS_ERR_UNKNOWN, true, "failed to delete row from p3Mask"); + return count; + + deleted += count; + } + + return deleted; +} +bool p3MaskInsertObject(psDB *dbh, p3MaskRow *object) +{ + return p3MaskInsert(dbh, object->label); +} + +bool p3MaskInsertObjects(psDB *dbh, psArray *objects) +{ + for (long i = 0; i < psArrayLength(objects); i++) { + if (!p3MaskInsertObject(dbh, objects->data[i])) { + return false; + } + } + + return true; +} + +bool p3MaskInsertFits(psDB *dbh, const psFits *fits) +{ + psArray *rowSet; + + // move to (the first?) extension named P3MASK_TABLE_NAME + if (!psFitsMoveExtName(fits, P3MASK_TABLE_NAME)) { + psError(PS_ERR_UNKNOWN, true, "failed to find FITS extension %s", P3MASK_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, P3MASK_TABLE_NAME, rowSet)) { + psError(PS_ERR_UNKNOWN, false, "databse insert failed"); + psFree(rowSet); + return false; + } + + psFree(rowSet); + + return true; +} + +bool p3MaskSelectRowsFits(psDB *dbh, psFits *fits, const psMetadata *where, unsigned long long limit) +{ + psArray *rowSet; + + rowSet = psDBSelectRows(dbh, P3MASK_TABLE_NAME, where, limit); + if (!rowSet) { + return false; + } + + // output to fits + if (!psFitsWriteTable(fits, NULL, rowSet, P3MASK_TABLE_NAME)) { + psError(PS_ERR_UNKNOWN, false, "FITS table write failed"); + psFree(rowSet); + return false; + } + + psFree(rowSet); + + return true; +} + +psMetadata *p3MaskMetadataFromObject(const p3MaskRow *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; +} + +p3MaskRow *p3MaskObjectFromMetadata(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 p3MaskRowAlloc(label); +} +psArray *p3MaskSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) +{ + psArray *rowSet; + psArray *returnSet; + psU64 i; + + rowSet = psDBSelectRows(dbh, P3MASK_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++) { + p3MaskRow *object = p3MaskObjectFromMetadata(rowSet->data[i]); + psArrayAdd(returnSet, 0, object); + psFree(object); + } + + psFree(rowSet); + + return returnSet; +} +bool p3MaskDeleteObject(psDB *dbh, const p3MaskRow *object) +{ + psMetadata *where = p3MaskMetadataFromObject(object); + long long count = psDBDeleteRows(dbh, P3MASK_TABLE_NAME, where, 0); + psFree(where) + if (count < 0) { + psError(PS_ERR_UNKNOWN, true, "failed to delete row from p3Mask"); + 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, "p3MaskRow object matched more then one row. Check your database schema"); + return false; + } + + return true; +} +long long p3MaskDeleteRowObjects(psDB *dbh, const psArray *objects, unsigned long long limit) +{ + long long deleted = 0; + + for (long long i = 0; i < objects->n; i++) { + p3MaskRow *object = objects->data[i]; + psMetadata *where = p3MaskMetadataFromObject(object); + long long count = psDBDeleteRows(dbh, P3MASK_TABLE_NAME, where, limit); + psFree(where) + if (count < 0) { + psError(PS_ERR_UNKNOWN, true, "failed to delete row from p3Mask"); + return count; + } + + deleted += count; + } + + return deleted; +} +bool p3MaskPrintObjects(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 = p3MaskMetadataFromObject(objects->data[i]); + if (!psMetadataAddMetadata( + output, + PS_LIST_TAIL, + P3MASK_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 detRunRowFree(detRunRow *object); Index: /trunk/ippdb/src/ippdb.h =================================================================== --- /trunk/ippdb/src/ippdb.h (revision 9787) +++ /trunk/ippdb/src/ippdb.h (revision 9788) @@ -2985,4 +2985,5 @@ psS32 p2_version; psS32 p3_version; + char *label; } p3PendingExpRow; @@ -2995,5 +2996,6 @@ const char *exp_tag, psS32 p2_version, - psS32 p3_version + psS32 p3_version, + const char *label ); @@ -3027,5 +3029,6 @@ const char *exp_tag, psS32 p2_version, - psS32 p3_version + psS32 p3_version, + const char *label ); @@ -3185,4 +3188,5 @@ psS32 p2_version; psS32 p3_version; + char *label; } p3ProcessedExpRow; @@ -3207,5 +3211,6 @@ psF32 zp_stdev, psS32 p2_version, - psS32 p3_version + psS32 p3_version, + const char *label ); @@ -3251,5 +3256,6 @@ psF32 zp_stdev, psS32 p2_version, - psS32 p3_version + psS32 p3_version, + const char *label ); @@ -3386,4 +3392,186 @@ FILE *stream, ///< a stream psArray *objects, ///< An array of p3ProcessedExpRow objects + bool mdcf ///< format as mdconfig or simple +); +/** p3MaskRow data structure + * + * Structure for representing a single row of p3Mask table data. + */ + +typedef struct { + char *label; +} p3MaskRow; + +/** Creates a new p3MaskRow object + * + * @return A new p3MaskRow object or NULL on failure. + */ + +p3MaskRow *p3MaskRowAlloc( + const char *label +); + +/** Creates a new p3Mask table + * + * @return true on success + */ + +bool p3MaskCreateTable( + psDB *dbh ///< Database handle +); + +/** Deletes a p3Mask table + * + * @return true on success + */ + +bool p3MaskDropTable( + 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 p3MaskInsert( + 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 p3MaskDelete( + psDB *dbh, ///< Database handle + const psMetadata *where, ///< Row match criteria + unsigned long long limit ///< Maximum number of elements to delete +); + +/** Insert a single p3MaskRow object into a table + * + * This function constructs and inserts a single row based on it's parameters. + * + * @return true on success + */ + +bool p3MaskInsertObject( + psDB *dbh, ///< Database handle + p3MaskRow *object ///< p3MaskRow object +); + +/** Insert an array of p3MaskRow object into a table + * + * This function constructs and inserts multiple rows based on it's parameters. + * + * @return true on success + */ + +bool p3MaskInsertObjects( + psDB *dbh, ///< Database handle + psArray *objects ///< array of p3MaskRow objects +); + +/** Insert data from a binary FITS table p3MaskRow 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 p3MaskInsertFits( + 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 p3MaskSelectRowsFits( + 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 p3MaskRow into an equivalent psMetadata + * + * @return A psMetadata pointer or NULL on error + */ + +psMetadata *p3MaskMetadataFromObject( + const p3MaskRow *object ///< fooRow to convert into a psMetadata +); + +/** Convert a psMetadata into an equivalent fooRow + * + * @return A p3MaskRow pointer or NULL on error + */ + +p3MaskRow *p3MaskObjectFromMetadata( + psMetadata *md ///< psMetadata to convert into a fooRow +); +/** Selects up to limit rows from the database and returns as p3MaskRow objects in a psArray + * + * See psDBSelectRows() for documentation on the format of where. + * + * @return A psArray pointer or NULL on error + */ + +psArray *p3MaskSelectRowObjects( + 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 p3Mask + * + * 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 p3MaskDeleteObject( + psDB *dbh, ///< Database handle + const p3MaskRow *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 p3MaskDeleteRowObjects( + 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 p3MaskRow 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 p3MaskPrintObjects( + FILE *stream, ///< a stream + psArray *objects, ///< An array of p3MaskRow objects bool mdcf ///< format as mdconfig or simple ); Index: /trunk/ippdb/tests/alloc.c =================================================================== --- /trunk/ippdb/tests/alloc.c (revision 9787) +++ /trunk/ippdb/tests/alloc.c (revision 9788) @@ -650,5 +650,5 @@ p3PendingExpRow *object; - object = p3PendingExpRowAlloc("a string", -32, -32 ); + object = p3PendingExpRowAlloc("a string", -32, -32, "a string" ); if (!object) { @@ -668,4 +668,8 @@ exit(EXIT_FAILURE); } + if (strncmp(object->label, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } psFree(object); @@ -675,5 +679,5 @@ p3ProcessedExpRow *object; - object = p3ProcessedExpRowAlloc("a string", "a string", "a string", 64.64, 64.64, 64.64, 32.32, 32.32, -32, "a string", "a string", 32.32, 32.32, -32, -32 ); + object = p3ProcessedExpRowAlloc("a string", "a string", "a string", 64.64, 64.64, 64.64, 32.32, 32.32, -32, "a string", "a string", 32.32, 32.32, -32, -32, "a string" ); if (!object) { @@ -738,4 +742,25 @@ } if (!object->p3_version == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->label, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + p3MaskRow *object; + + object = p3MaskRowAlloc("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 9787) +++ /trunk/ippdb/tests/createtable.c (revision 9788) @@ -253,4 +253,19 @@ } + if(!p3MaskCreateTable(dbh)) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + if(!detRunCreateTable(dbh)) { exit(EXIT_FAILURE); Index: /trunk/ippdb/tests/dbcleanup.c =================================================================== --- /trunk/ippdb/tests/dbcleanup.c (revision 9787) +++ /trunk/ippdb/tests/dbcleanup.c (revision 9788) @@ -27,4 +27,5 @@ p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p3PendingExp"); p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p3ProcessedExp"); + p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p3Mask"); p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS detRun"); p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS detInputExp"); Index: /trunk/ippdb/tests/dbsetup.c =================================================================== --- /trunk/ippdb/tests/dbsetup.c (revision 9787) +++ /trunk/ippdb/tests/dbsetup.c (revision 9788) @@ -61,4 +61,7 @@ p3ProcessedExpCreateTable(dbh); + p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p3Mask"); + p3MaskCreateTable(dbh); + p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS detRun"); detRunCreateTable(dbh); Index: /trunk/ippdb/tests/droptable.c =================================================================== --- /trunk/ippdb/tests/droptable.c (revision 9787) +++ /trunk/ippdb/tests/droptable.c (revision 9788) @@ -253,4 +253,19 @@ } + if (!p3MaskDropTable(dbh)) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + if (!detRunDropTable(dbh)) { exit(EXIT_FAILURE); Index: /trunk/ippdb/tests/insert.c =================================================================== --- /trunk/ippdb/tests/insert.c (revision 9787) +++ /trunk/ippdb/tests/insert.c (revision 9788) @@ -223,20 +223,35 @@ } - if (!p3PendingExpInsert(dbh, "a string", -32, -32)) { - exit(EXIT_FAILURE); - } - - psDBCleanup(dbh); - } - - { - psDB *dbh; - - dbh = psDBInit("localhost", "test", NULL, "test"); - if (!dbh) { - exit(EXIT_FAILURE); - } - - if (!p3ProcessedExpInsert(dbh, "a string", "a string", "a string", 64.64, 64.64, 64.64, 32.32, 32.32, -32, "a string", "a string", 32.32, 32.32, -32, -32)) { + if (!p3PendingExpInsert(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 (!p3ProcessedExpInsert(dbh, "a string", "a string", "a string", 64.64, 64.64, 64.64, 32.32, 32.32, -32, "a string", "a string", 32.32, 32.32, -32, -32, "a string")) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if (!p3MaskInsert(dbh, "a string")) { exit(EXIT_FAILURE); } Index: /trunk/ippdb/tests/insertfits.c =================================================================== --- /trunk/ippdb/tests/insertfits.c (revision 9787) +++ /trunk/ippdb/tests/insertfits.c (revision 9788) @@ -440,4 +440,30 @@ } + if (!p3MaskInsertFits(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 (!detRunInsertFits(dbh, fits)) { exit(EXIT_FAILURE); Index: /trunk/ippdb/tests/insertobject.c =================================================================== --- /trunk/ippdb/tests/insertobject.c (revision 9787) +++ /trunk/ippdb/tests/insertobject.c (revision 9788) @@ -322,5 +322,5 @@ } - object = p3PendingExpRowAlloc("a string", -32, -32); + object = p3PendingExpRowAlloc("a string", -32, -32, "a string"); if (!object) { exit(EXIT_FAILURE); @@ -344,5 +344,5 @@ } - object = p3ProcessedExpRowAlloc("a string", "a string", "a string", 64.64, 64.64, 64.64, 32.32, 32.32, -32, "a string", "a string", 32.32, 32.32, -32, -32); + object = p3ProcessedExpRowAlloc("a string", "a string", "a string", 64.64, 64.64, 64.64, 32.32, 32.32, -32, "a string", "a string", 32.32, 32.32, -32, -32, "a string"); if (!object) { exit(EXIT_FAILURE); @@ -350,4 +350,26 @@ if (!p3ProcessedExpInsertObject(dbh, object)) { + exit(EXIT_FAILURE); + } + + psFree(object); + psDBCleanup(dbh); + } + + { + psDB *dbh; + p3MaskRow *object; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + object = p3MaskRowAlloc("a string"); + if (!object) { + exit(EXIT_FAILURE); + } + + if (!p3MaskInsertObject(dbh, object)) { exit(EXIT_FAILURE); } Index: /trunk/ippdb/tests/metadatafromobject.c =================================================================== --- /trunk/ippdb/tests/metadatafromobject.c (revision 9787) +++ /trunk/ippdb/tests/metadatafromobject.c (revision 9788) @@ -764,5 +764,5 @@ bool status; - object = p3PendingExpRowAlloc("a string", -32, -32); + object = p3PendingExpRowAlloc("a string", -32, -32, "a string"); if (!object) { exit(EXIT_FAILURE); @@ -788,4 +788,8 @@ exit(EXIT_FAILURE); } + if (strncmp(psMetadataLookupPtr(&status, md, "label"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } psFree(md); @@ -797,5 +801,5 @@ bool status; - object = p3ProcessedExpRowAlloc("a string", "a string", "a string", 64.64, 64.64, 64.64, 32.32, 32.32, -32, "a string", "a string", 32.32, 32.32, -32, -32); + object = p3ProcessedExpRowAlloc("a string", "a string", "a string", 64.64, 64.64, 64.64, 32.32, 32.32, -32, "a string", "a string", 32.32, 32.32, -32, -32, "a string"); if (!object) { exit(EXIT_FAILURE); @@ -866,4 +870,33 @@ } if (!psMetadataLookupS32(&status, md, "p3_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; + p3MaskRow *object; + bool status; + + object = p3MaskRowAlloc("a string"); + if (!object) { + exit(EXIT_FAILURE); + } + + md = p3MaskMetadataFromObject(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 9787) +++ /trunk/ippdb/tests/objectfrommetadata.c (revision 9788) @@ -1191,4 +1191,8 @@ exit(EXIT_FAILURE); } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "label", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } object = p3PendingExpObjectFromMetadata(md); @@ -1212,4 +1216,8 @@ exit(EXIT_FAILURE); } + if (strncmp(object->label, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } psFree(object); @@ -1281,4 +1289,8 @@ exit(EXIT_FAILURE); } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "label", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } object = p3ProcessedExpObjectFromMetadata(md); @@ -1347,4 +1359,34 @@ } if (!object->p3_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; + p3MaskRow *object; + + md = psMetadataAlloc(); + if (!psMetadataAddStr(md, PS_LIST_TAIL, "label", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + + object = p3MaskObjectFromMetadata(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 9787) +++ /trunk/ippdb/tests/selectrowsfits.c (revision 9788) @@ -373,4 +373,26 @@ } + if (!p3MaskSelectRowsFits(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 (!detRunSelectRowsFits(dbh, fits, NULL, 1)) { exit(EXIT_FAILURE);