Index: trunk/ippdb/src/ippdb.c =================================================================== --- trunk/ippdb/src/ippdb.c (revision 9783) +++ 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);