Index: trunk/ippdb/src/ippdb.c =================================================================== --- trunk/ippdb/src/ippdb.c (revision 16616) +++ trunk/ippdb/src/ippdb.c (revision 16731) @@ -48,5 +48,4 @@ #define CAMMASK_TABLE_NAME "camMask" #define WARPRUN_TABLE_NAME "warpRun" -#define WARPINPUTEXP_TABLE_NAME "warpInputExp" #define WARPSKYCELLMAP_TABLE_NAME "warpSkyCellMap" #define WARPSKYFILE_TABLE_NAME "warpSkyfile" @@ -9504,5 +9503,5 @@ static void warpRunRowFree(warpRunRow *object); -warpRunRow *warpRunRowAlloc(psS64 warp_id, const char *mode, const char *state, const char *workdir, const char *workdir_state, const char *dvodb, const char *tess_id, const char *end_stage, psTime* registered) +warpRunRow *warpRunRowAlloc(psS64 warp_id, psS64 cam_id, const char *mode, const char *state, const char *workdir, const char *workdir_state, const char *dvodb, const char *tess_id, const char *end_stage, psTime* registered, bool magiced) { warpRunRow *_object; @@ -9512,4 +9511,5 @@ _object->warp_id = warp_id; + _object->cam_id = cam_id; _object->mode = psStringCopy(mode); _object->state = psStringCopy(state); @@ -9520,4 +9520,5 @@ _object->end_stage = psStringCopy(end_stage); _object->registered = psTimeCopy(registered); + _object->magiced = magiced; return _object; @@ -9544,4 +9545,9 @@ return false; } + if (!psMetadataAdd(md, PS_LIST_TAIL, "cam_id", PS_DATA_S64, "Key INDEX(warp_id, cam_id) fkey(cam_id) ref camProcessedExp(cam_id)", 0)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item cam_id"); + psFree(md); + return false; + } if (!psMetadataAdd(md, PS_LIST_TAIL, "mode", PS_DATA_STRING, "Key", "64")) { psError(PS_ERR_UNKNOWN, false, "failed to add item mode"); @@ -9584,4 +9590,9 @@ return false; } + if (!psMetadataAdd(md, PS_LIST_TAIL, "magiced", PS_DATA_BOOL, "Key", 0)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item magiced"); + psFree(md); + return false; + } bool status = psDBCreateTable(dbh, WARPRUN_TABLE_NAME, md); @@ -9597,5 +9608,5 @@ } -bool warpRunInsert(psDB * dbh, psS64 warp_id, const char *mode, const char *state, const char *workdir, const char *workdir_state, const char *dvodb, const char *tess_id, const char *end_stage, psTime* registered) +bool warpRunInsert(psDB * dbh, psS64 warp_id, psS64 cam_id, const char *mode, const char *state, const char *workdir, const char *workdir_state, const char *dvodb, const char *tess_id, const char *end_stage, psTime* registered, bool magiced) { psMetadata *md = psMetadataAlloc(); @@ -9605,4 +9616,9 @@ return false; } + if (!psMetadataAdd(md, PS_LIST_TAIL, "cam_id", PS_DATA_S64, NULL, cam_id)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item cam_id"); + psFree(md); + return false; + } if (!psMetadataAdd(md, PS_LIST_TAIL, "mode", PS_DATA_STRING, NULL, mode)) { psError(PS_ERR_UNKNOWN, false, "failed to add item mode"); @@ -9642,4 +9658,9 @@ if (!psMetadataAdd(md, PS_LIST_TAIL, "registered", PS_DATA_TIME, NULL, registered)) { psError(PS_ERR_UNKNOWN, false, "failed to add item registered"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "magiced", PS_DATA_BOOL, NULL, magiced)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item magiced"); psFree(md); return false; @@ -9668,5 +9689,5 @@ bool warpRunInsertObject(psDB *dbh, warpRunRow *object) { - return warpRunInsert(dbh, object->warp_id, object->mode, object->state, object->workdir, object->workdir_state, object->dvodb, object->tess_id, object->end_stage, object->registered); + return warpRunInsert(dbh, object->warp_id, object->cam_id, object->mode, object->state, object->workdir, object->workdir_state, object->dvodb, object->tess_id, object->end_stage, object->registered, object->magiced); } @@ -9746,4 +9767,9 @@ return false; } + if (!psMetadataAdd(md, PS_LIST_TAIL, "cam_id", PS_DATA_S64, NULL, object->cam_id)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item cam_id"); + psFree(md); + return false; + } if (!psMetadataAdd(md, PS_LIST_TAIL, "mode", PS_DATA_STRING, NULL, object->mode)) { psError(PS_ERR_UNKNOWN, false, "failed to add item mode"); @@ -9786,4 +9812,9 @@ return false; } + if (!psMetadataAdd(md, PS_LIST_TAIL, "magiced", PS_DATA_BOOL, NULL, object->magiced)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item magiced"); + psFree(md); + return false; + } @@ -9800,4 +9831,9 @@ return false; } + psS64 cam_id = psMetadataLookupS64(&status, md, "cam_id"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item cam_id"); + return false; + } char* mode = psMetadataLookupPtr(&status, md, "mode"); if (!status) { @@ -9840,6 +9876,11 @@ return false; } - - return warpRunRowAlloc(warp_id, mode, state, workdir, workdir_state, dvodb, tess_id, end_stage, registered); + bool magiced = psMetadataLookupBool(&status, md, "magiced"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item magiced"); + return false; + } + + return warpRunRowAlloc(warp_id, cam_id, mode, state, workdir, workdir_state, dvodb, tess_id, end_stage, registered, magiced); } psArray *warpRunSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) @@ -9957,325 +9998,4 @@ return true; } -static void warpInputExpRowFree(warpInputExpRow *object); - -warpInputExpRow *warpInputExpRowAlloc(psS64 warp_id, psS64 cam_id, bool magiced) -{ - warpInputExpRow *_object; - - _object = psAlloc(sizeof(warpInputExpRow)); - psMemSetDeallocator(_object, (psFreeFunc)warpInputExpRowFree); - - _object->warp_id = warp_id; - _object->cam_id = cam_id; - _object->magiced = magiced; - - return _object; -} - -static void warpInputExpRowFree(warpInputExpRow *object) -{ -} - -bool warpInputExpCreateTable(psDB *dbh) -{ - psMetadata *md = psMetadataAlloc(); - if (!psMetadataAdd(md, PS_LIST_TAIL, "warp_id", PS_DATA_S64, "Primary Key fkey(warp_id) ref warpRun(warp_id)", 0)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item warp_id"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "cam_id", PS_DATA_S64, "Primary Key fkey(cam_id) ref camProcessedExp(cam_id)", 0)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item cam_id"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "magiced", PS_DATA_BOOL, "Key", 0)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item magiced"); - psFree(md); - return false; - } - - bool status = psDBCreateTable(dbh, WARPINPUTEXP_TABLE_NAME, md); - - psFree(md); - - return status; -} - -bool warpInputExpDropTable(psDB *dbh) -{ - return psDBDropTable(dbh, WARPINPUTEXP_TABLE_NAME); -} - -bool warpInputExpInsert(psDB * dbh, psS64 warp_id, psS64 cam_id, bool magiced) -{ - psMetadata *md = psMetadataAlloc(); - if (!psMetadataAdd(md, PS_LIST_TAIL, "warp_id", PS_DATA_S64, NULL, warp_id)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item warp_id"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "cam_id", PS_DATA_S64, NULL, cam_id)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item cam_id"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "magiced", PS_DATA_BOOL, NULL, magiced)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item magiced"); - psFree(md); - return false; - } - - bool status = psDBInsertOneRow(dbh, WARPINPUTEXP_TABLE_NAME, md); - psFree(md); - - return status; -} - -long long warpInputExpDelete(psDB *dbh, const psMetadata *where, unsigned long long limit) -{ - long long deleted = 0; - - long long count = psDBDeleteRows(dbh, WARPINPUTEXP_TABLE_NAME, where, limit); - if (count < 0) { - psError(PS_ERR_UNKNOWN, true, "failed to delete row from warpInputExp"); - return count; - - deleted += count; - } - - return deleted; -} -bool warpInputExpInsertObject(psDB *dbh, warpInputExpRow *object) -{ - return warpInputExpInsert(dbh, object->warp_id, object->cam_id, object->magiced); -} - -bool warpInputExpInsertObjects(psDB *dbh, psArray *objects) -{ - for (long i = 0; i < psArrayLength(objects); i++) { - if (!warpInputExpInsertObject(dbh, objects->data[i])) { - return false; - } - } - - return true; -} - -bool warpInputExpInsertFits(psDB *dbh, const psFits *fits) -{ - psArray *rowSet; - - // move to (the first?) extension named WARPINPUTEXP_TABLE_NAME - if (!psFitsMoveExtName(fits, WARPINPUTEXP_TABLE_NAME)) { - psError(PS_ERR_UNKNOWN, true, "failed to find FITS extension %s", WARPINPUTEXP_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, WARPINPUTEXP_TABLE_NAME, rowSet)) { - psError(PS_ERR_UNKNOWN, false, "databse insert failed"); - psFree(rowSet); - return false; - } - - psFree(rowSet); - - return true; -} - -bool warpInputExpSelectRowsFits(psDB *dbh, psFits *fits, const psMetadata *where, unsigned long long limit) -{ - psArray *rowSet; - - rowSet = psDBSelectRows(dbh, WARPINPUTEXP_TABLE_NAME, where, limit); - if (!rowSet) { - return false; - } - - // output to fits - if (!psFitsWriteTable(fits, NULL, rowSet, WARPINPUTEXP_TABLE_NAME)) { - psError(PS_ERR_UNKNOWN, false, "FITS table write failed"); - psFree(rowSet); - return false; - } - - psFree(rowSet); - - return true; -} - -psMetadata *warpInputExpMetadataFromObject(const warpInputExpRow *object) -{ - psMetadata *md = psMetadataAlloc(); - if (!psMetadataAdd(md, PS_LIST_TAIL, "warp_id", PS_DATA_S64, NULL, object->warp_id)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item warp_id"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "cam_id", PS_DATA_S64, NULL, object->cam_id)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item cam_id"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "magiced", PS_DATA_BOOL, NULL, object->magiced)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item magiced"); - psFree(md); - return false; - } - - - return md; -} - -warpInputExpRow *warpInputExpObjectFromMetadata(psMetadata *md) -{ - -bool status = false; - psS64 warp_id = psMetadataLookupS64(&status, md, "warp_id"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item warp_id"); - return false; - } - psS64 cam_id = psMetadataLookupS64(&status, md, "cam_id"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item cam_id"); - return false; - } - bool magiced = psMetadataLookupBool(&status, md, "magiced"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item magiced"); - return false; - } - - return warpInputExpRowAlloc(warp_id, cam_id, magiced); -} -psArray *warpInputExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) -{ - psArray *rowSet; - psArray *returnSet; - psU64 i; - - rowSet = psDBSelectRows(dbh, WARPINPUTEXP_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++) { - warpInputExpRow *object = warpInputExpObjectFromMetadata(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 warpInputExpDeleteObject(psDB *dbh, const warpInputExpRow *object) -{ - psMetadata *where = warpInputExpMetadataFromObject(object); - long long count = psDBDeleteRows(dbh, WARPINPUTEXP_TABLE_NAME, where, 0); - psFree(where); - if (count < 0) { - psError(PS_ERR_UNKNOWN, true, "failed to delete row from warpInputExp"); - 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, "warpInputExpRow object matched more then one row. Check your database schema"); - return false; - } - - return true; -} -long long warpInputExpDeleteRowObjects(psDB *dbh, const psArray *objects, unsigned long long limit) -{ - long long deleted = 0; - - for (long long i = 0; i < objects->n; i++) { - warpInputExpRow *object = objects->data[i]; - psMetadata *where = warpInputExpMetadataFromObject(object); - long long count = psDBDeleteRows(dbh, WARPINPUTEXP_TABLE_NAME, where, limit); - psFree(where); - if (count < 0) { - psError(PS_ERR_UNKNOWN, true, "failed to delete row from warpInputExp"); - return count; - } - - deleted += count; - } - - return deleted; -} -bool warpInputExpPrintObjects(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 = warpInputExpMetadataFromObject(objects->data[i]); - if (!psMetadataAddMetadata( - output, - PS_LIST_TAIL, - WARPINPUTEXP_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 warpInputExpPrintObject(FILE *stream, warpInputExpRow *object, bool mdcf) -{ - PS_ASSERT_PTR_NON_NULL(object, false); - - psMetadata *md = warpInputExpMetadataFromObject(object); - - if (!ippdbPrintMetadataRaw(stream, md, mdcf)) { - psError(PS_ERR_UNKNOWN, false, "failed to print metadata"); - psFree(md); - } - - psFree(md); - - return true; -} static void warpSkyCellMapRowFree(warpSkyCellMapRow *object); @@ -10307,5 +10027,5 @@ { psMetadata *md = psMetadataAlloc(); - if (!psMetadataAdd(md, PS_LIST_TAIL, "warp_id", PS_DATA_S64, "Primary Key fkey(warp_id, cam_id) ref warpInputExp(warp_id, cam_id)", 0)) { + if (!psMetadataAdd(md, PS_LIST_TAIL, "warp_id", PS_DATA_S64, "Primary Key fkey(warp_id, cam_id) ref warpRun(warp_id, cam_id)", 0)) { psError(PS_ERR_UNKNOWN, false, "failed to add item warp_id"); psFree(md); @@ -24078,5 +23798,5 @@ static void flatcorrRunRowFree(flatcorrRunRow *object); -flatcorrRunRow *flatcorrRunRowAlloc(psS64 corr_id, const char *dvodb, const char *filter, const char *state, const char *workdir, const char *label, const char *stats) +flatcorrRunRow *flatcorrRunRowAlloc(psS64 corr_id, const char *dvodb, const char *filter, const char *state, const char *workdir, const char *label, const char *stats, const char *region) { flatcorrRunRow *_object; @@ -24092,4 +23812,5 @@ _object->label = psStringCopy(label); _object->stats = psStringCopy(stats); + _object->region = psStringCopy(region); return _object; @@ -24104,4 +23825,5 @@ psFree(object->label); psFree(object->stats); + psFree(object->region); } @@ -24144,4 +23866,9 @@ return false; } + if (!psMetadataAdd(md, PS_LIST_TAIL, "region", PS_DATA_STRING, NULL, "255")) { + psError(PS_ERR_UNKNOWN, false, "failed to add item region"); + psFree(md); + return false; + } bool status = psDBCreateTable(dbh, FLATCORRRUN_TABLE_NAME, md); @@ -24157,5 +23884,5 @@ } -bool flatcorrRunInsert(psDB * dbh, psS64 corr_id, const char *dvodb, const char *filter, const char *state, const char *workdir, const char *label, const char *stats) +bool flatcorrRunInsert(psDB * dbh, psS64 corr_id, const char *dvodb, const char *filter, const char *state, const char *workdir, const char *label, const char *stats, const char *region) { psMetadata *md = psMetadataAlloc(); @@ -24192,4 +23919,9 @@ if (!psMetadataAdd(md, PS_LIST_TAIL, "stats", PS_DATA_STRING, NULL, stats)) { psError(PS_ERR_UNKNOWN, false, "failed to add item stats"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "region", PS_DATA_STRING, NULL, region)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item region"); psFree(md); return false; @@ -24218,5 +23950,5 @@ bool flatcorrRunInsertObject(psDB *dbh, flatcorrRunRow *object) { - return flatcorrRunInsert(dbh, object->corr_id, object->dvodb, object->filter, object->state, object->workdir, object->label, object->stats); + return flatcorrRunInsert(dbh, object->corr_id, object->dvodb, object->filter, object->state, object->workdir, object->label, object->stats, object->region); } @@ -24326,4 +24058,9 @@ return false; } + if (!psMetadataAdd(md, PS_LIST_TAIL, "region", PS_DATA_STRING, NULL, object->region)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item region"); + psFree(md); + return false; + } @@ -24370,6 +24107,11 @@ return false; } - - return flatcorrRunRowAlloc(corr_id, dvodb, filter, state, workdir, label, stats); + char* region = psMetadataLookupPtr(&status, md, "region"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item region"); + return false; + } + + return flatcorrRunRowAlloc(corr_id, dvodb, filter, state, workdir, label, stats, region); } psArray *flatcorrRunSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)