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