Index: /trunk/ippdb/Makefile.am =================================================================== --- /trunk/ippdb/Makefile.am (revision 11987) +++ /trunk/ippdb/Makefile.am (revision 11988) @@ -44,14 +44,14 @@ $(top_builddir)/docs/man/man3/p4InputExpRow.3 \ $(top_builddir)/docs/man/man3/p4SkyCellMapRow.3 \ - $(top_builddir)/docs/man/man3/p4ScfileRow.3 \ + $(top_builddir)/docs/man/man3/p4SkyfileRow.3 \ $(top_builddir)/docs/man/man3/p5RunRow.3 \ - $(top_builddir)/docs/man/man3/p5InputScfileRow.3 \ - $(top_builddir)/docs/man/man3/p5DiffScfileRow.3 \ + $(top_builddir)/docs/man/man3/p5InputSkyfileRow.3 \ + $(top_builddir)/docs/man/man3/p5DiffSkyfileRow.3 \ $(top_builddir)/docs/man/man3/p6RunRow.3 \ - $(top_builddir)/docs/man/man3/p6InputScfileRow.3 \ - $(top_builddir)/docs/man/man3/p6SumScfileRow.3 + $(top_builddir)/docs/man/man3/p6InputSkyfileRow.3 \ + $(top_builddir)/docs/man/man3/p6SumSkyfileRow.3 -docs/man/man3/ippdb.3 docs/man/man3/expTagCounterRow.3 docs/man/man3/summitExpRow.3 docs/man/man3/summitImfileRow.3 docs/man/man3/pzPendingExpRow.3 docs/man/man3/pzPendingImfileRow.3 docs/man/man3/pzDoneExpRow.3 docs/man/man3/pzDoneImfileRow.3 docs/man/man3/newExpRow.3 docs/man/man3/newImfileRow.3 docs/man/man3/rawExpRow.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/detResidImfileRow.3 docs/man/man3/detResidExpRow.3 docs/man/man3/detRunSummaryRow.3 docs/man/man3/p4RunRow.3 docs/man/man3/p4InputExpRow.3 docs/man/man3/p4SkyCellMapRow.3 docs/man/man3/p4ScfileRow.3 docs/man/man3/p5RunRow.3 docs/man/man3/p5InputScfileRow.3 docs/man/man3/p5DiffScfileRow.3 docs/man/man3/p6RunRow.3 docs/man/man3/p6InputScfileRow.3 docs/man/man3/p6SumScfileRow.3: +docs/man/man3/ippdb.3 docs/man/man3/expTagCounterRow.3 docs/man/man3/summitExpRow.3 docs/man/man3/summitImfileRow.3 docs/man/man3/pzPendingExpRow.3 docs/man/man3/pzPendingImfileRow.3 docs/man/man3/pzDoneExpRow.3 docs/man/man3/pzDoneImfileRow.3 docs/man/man3/newExpRow.3 docs/man/man3/newImfileRow.3 docs/man/man3/rawExpRow.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/detResidImfileRow.3 docs/man/man3/detResidExpRow.3 docs/man/man3/detRunSummaryRow.3 docs/man/man3/p4RunRow.3 docs/man/man3/p4InputExpRow.3 docs/man/man3/p4SkyCellMapRow.3 docs/man/man3/p4SkyfileRow.3 docs/man/man3/p5RunRow.3 docs/man/man3/p5InputSkyfileRow.3 docs/man/man3/p5DiffSkyfileRow.3 docs/man/man3/p6RunRow.3 docs/man/man3/p6InputSkyfileRow.3 docs/man/man3/p6SumSkyfileRow.3: $(DOXYGEN) Index: /trunk/ippdb/configure.ac =================================================================== --- /trunk/ippdb/configure.ac (revision 11987) +++ /trunk/ippdb/configure.ac (revision 11988) @@ -7,5 +7,5 @@ AC_PREREQ(2.59) -AC_INIT([ippdb], [1.1.9], [pan-starrs.ifa.hawaii.edu]) +AC_INIT([ippdb], [1.1.10], [pan-starrs.ifa.hawaii.edu]) AC_CONFIG_SRCDIR([ippdb.pc.in]) Index: /trunk/ippdb/src/ippdb.c =================================================================== --- /trunk/ippdb/src/ippdb.c (revision 11987) +++ /trunk/ippdb/src/ippdb.c (revision 11988) @@ -65,11 +65,11 @@ #define P4INPUTEXP_TABLE_NAME "p4InputExp" #define P4SKYCELLMAP_TABLE_NAME "p4SkyCellMap" -#define P4SCFILE_TABLE_NAME "p4Scfile" +#define P4SKYFILE_TABLE_NAME "p4Skyfile" #define P5RUN_TABLE_NAME "p5Run" -#define P5INPUTSCFILE_TABLE_NAME "p5InputScfile" -#define P5DIFFSCFILE_TABLE_NAME "p5DiffScfile" +#define P5INPUTSKYFILE_TABLE_NAME "p5InputSkyfile" +#define P5DIFFSKYFILE_TABLE_NAME "p5DiffSkyfile" #define P6RUN_TABLE_NAME "p6Run" -#define P6INPUTSCFILE_TABLE_NAME "p6InputScfile" -#define P6SUMSCFILE_TABLE_NAME "p6SumScfile" +#define P6INPUTSKYFILE_TABLE_NAME "p6InputSkyfile" +#define P6SUMSKYFILE_TABLE_NAME "p6SumSkyfile" #define MAX_STRING_LENGTH 1024 @@ -14846,18 +14846,16 @@ return true; } -static void p4ScfileRowFree(p4ScfileRow *object); - -p4ScfileRow *p4ScfileRowAlloc(psS32 p4_id, const char *skycell_id, const char *tess_id, const char *exp_tag, psS32 p3_version, const char *uri, psF64 bg, psF64 bg_mean_stdev) -{ - p4ScfileRow *_object; - - _object = psAlloc(sizeof(p4ScfileRow)); - psMemSetDeallocator(_object, (psFreeFunc)p4ScfileRowFree); +static void p4SkyfileRowFree(p4SkyfileRow *object); + +p4SkyfileRow *p4SkyfileRowAlloc(psS32 p4_id, const char *skycell_id, const char *tess_id, const char *uri, psF64 bg, psF64 bg_mean_stdev) +{ + p4SkyfileRow *_object; + + _object = psAlloc(sizeof(p4SkyfileRow)); + psMemSetDeallocator(_object, (psFreeFunc)p4SkyfileRowFree); _object->p4_id = p4_id; _object->skycell_id = psStringCopy(skycell_id); _object->tess_id = psStringCopy(tess_id); - _object->exp_tag = psStringCopy(exp_tag); - _object->p3_version = p3_version; _object->uri = psStringCopy(uri); _object->bg = bg; @@ -14867,13 +14865,12 @@ } -static void p4ScfileRowFree(p4ScfileRow *object) +static void p4SkyfileRowFree(p4SkyfileRow *object) { psFree(object->skycell_id); psFree(object->tess_id); - psFree(object->exp_tag); psFree(object->uri); } -bool p4ScfileCreateTable(psDB *dbh) +bool p4SkyfileCreateTable(psDB *dbh) { psMetadata *md = psMetadataAlloc(); @@ -14893,14 +14890,4 @@ return false; } - if (!psMetadataAdd(md, PS_LIST_TAIL, "exp_tag", PS_DATA_STRING, "Key", "64")) { - psError(PS_ERR_UNKNOWN, false, "failed to add item exp_tag"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "p3_version", PS_DATA_S32, "Key", 0)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item p3_version"); - psFree(md); - return false; - } if (!psMetadataAdd(md, PS_LIST_TAIL, "uri", PS_DATA_STRING, NULL, "255")) { psError(PS_ERR_UNKNOWN, false, "failed to add item uri"); @@ -14919,5 +14906,5 @@ } - bool status = psDBCreateTable(dbh, P4SCFILE_TABLE_NAME, md); + bool status = psDBCreateTable(dbh, P4SKYFILE_TABLE_NAME, md); psFree(md); @@ -14926,10 +14913,10 @@ } -bool p4ScfileDropTable(psDB *dbh) -{ - return psDBDropTable(dbh, P4SCFILE_TABLE_NAME); -} - -bool p4ScfileInsert(psDB * dbh, psS32 p4_id, const char *skycell_id, const char *tess_id, const char *exp_tag, psS32 p3_version, const char *uri, psF64 bg, psF64 bg_mean_stdev) +bool p4SkyfileDropTable(psDB *dbh) +{ + return psDBDropTable(dbh, P4SKYFILE_TABLE_NAME); +} + +bool p4SkyfileInsert(psDB * dbh, psS32 p4_id, const char *skycell_id, const char *tess_id, const char *uri, psF64 bg, psF64 bg_mean_stdev) { psMetadata *md = psMetadataAlloc(); @@ -14949,14 +14936,4 @@ return false; } - if (!psMetadataAdd(md, PS_LIST_TAIL, "exp_tag", PS_DATA_STRING, NULL, exp_tag)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item exp_tag"); - psFree(md); - return false; - } - 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, "uri", PS_DATA_STRING, NULL, uri)) { psError(PS_ERR_UNKNOWN, false, "failed to add item uri"); @@ -14975,5 +14952,5 @@ } - bool status = psDBInsertOneRow(dbh, P4SCFILE_TABLE_NAME, md); + bool status = psDBInsertOneRow(dbh, P4SKYFILE_TABLE_NAME, md); psFree(md); @@ -14981,11 +14958,11 @@ } -long long p4ScfileDelete(psDB *dbh, const psMetadata *where, unsigned long long limit) +long long p4SkyfileDelete(psDB *dbh, const psMetadata *where, unsigned long long limit) { long long deleted = 0; - long long count = psDBDeleteRows(dbh, P4SCFILE_TABLE_NAME, where, limit); + long long count = psDBDeleteRows(dbh, P4SKYFILE_TABLE_NAME, where, limit); if (count < 0) { - psError(PS_ERR_UNKNOWN, true, "failed to delete row from p4Scfile"); + psError(PS_ERR_UNKNOWN, true, "failed to delete row from p4Skyfile"); return count; @@ -14995,13 +14972,13 @@ return deleted; } -bool p4ScfileInsertObject(psDB *dbh, p4ScfileRow *object) -{ - return p4ScfileInsert(dbh, object->p4_id, object->skycell_id, object->tess_id, object->exp_tag, object->p3_version, object->uri, object->bg, object->bg_mean_stdev); -} - -bool p4ScfileInsertObjects(psDB *dbh, psArray *objects) +bool p4SkyfileInsertObject(psDB *dbh, p4SkyfileRow *object) +{ + return p4SkyfileInsert(dbh, object->p4_id, object->skycell_id, object->tess_id, object->uri, object->bg, object->bg_mean_stdev); +} + +bool p4SkyfileInsertObjects(psDB *dbh, psArray *objects) { for (long i = 0; i < psArrayLength(objects); i++) { - if (!p4ScfileInsertObject(dbh, objects->data[i])) { + if (!p4SkyfileInsertObject(dbh, objects->data[i])) { return false; } @@ -15011,11 +14988,11 @@ } -bool p4ScfileInsertFits(psDB *dbh, const psFits *fits) +bool p4SkyfileInsertFits(psDB *dbh, const psFits *fits) { psArray *rowSet; - // move to (the first?) extension named P4SCFILE_TABLE_NAME - if (!psFitsMoveExtName(fits, P4SCFILE_TABLE_NAME)) { - psError(PS_ERR_UNKNOWN, true, "failed to find FITS extension %s", P4SCFILE_TABLE_NAME); + // move to (the first?) extension named P4SKYFILE_TABLE_NAME + if (!psFitsMoveExtName(fits, P4SKYFILE_TABLE_NAME)) { + psError(PS_ERR_UNKNOWN, true, "failed to find FITS extension %s", P4SKYFILE_TABLE_NAME); return false; } @@ -15035,5 +15012,5 @@ } - if (!psDBInsertRows(dbh, P4SCFILE_TABLE_NAME, rowSet)) { + if (!psDBInsertRows(dbh, P4SKYFILE_TABLE_NAME, rowSet)) { psError(PS_ERR_UNKNOWN, false, "databse insert failed"); psFree(rowSet); @@ -15046,9 +15023,9 @@ } -bool p4ScfileSelectRowsFits(psDB *dbh, psFits *fits, const psMetadata *where, unsigned long long limit) +bool p4SkyfileSelectRowsFits(psDB *dbh, psFits *fits, const psMetadata *where, unsigned long long limit) { psArray *rowSet; - rowSet = psDBSelectRows(dbh, P4SCFILE_TABLE_NAME, where, limit); + rowSet = psDBSelectRows(dbh, P4SKYFILE_TABLE_NAME, where, limit); if (!rowSet) { return false; @@ -15056,5 +15033,5 @@ // output to fits - if (!psFitsWriteTable(fits, NULL, rowSet, P4SCFILE_TABLE_NAME)) { + if (!psFitsWriteTable(fits, NULL, rowSet, P4SKYFILE_TABLE_NAME)) { psError(PS_ERR_UNKNOWN, false, "FITS table write failed"); psFree(rowSet); @@ -15067,5 +15044,5 @@ } -psMetadata *p4ScfileMetadataFromObject(const p4ScfileRow *object) +psMetadata *p4SkyfileMetadataFromObject(const p4SkyfileRow *object) { psMetadata *md = psMetadataAlloc(); @@ -15085,14 +15062,4 @@ return false; } - if (!psMetadataAdd(md, PS_LIST_TAIL, "exp_tag", PS_DATA_STRING, NULL, object->exp_tag)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item exp_tag"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "p3_version", PS_DATA_S32, NULL, object->p3_version)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item p3_version"); - psFree(md); - return false; - } if (!psMetadataAdd(md, PS_LIST_TAIL, "uri", PS_DATA_STRING, NULL, object->uri)) { psError(PS_ERR_UNKNOWN, false, "failed to add item uri"); @@ -15115,5 +15082,5 @@ } -p4ScfileRow *p4ScfileObjectFromMetadata(psMetadata *md) +p4SkyfileRow *p4SkyfileObjectFromMetadata(psMetadata *md) { @@ -15134,14 +15101,4 @@ return false; } - char* exp_tag = psMetadataLookupPtr(&status, md, "exp_tag"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item exp_tag"); - return false; - } - psS32 p3_version = psMetadataLookupS32(&status, md, "p3_version"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item p3_version"); - return false; - } char* uri = psMetadataLookupPtr(&status, md, "uri"); if (!status) { @@ -15160,7 +15117,7 @@ } - return p4ScfileRowAlloc(p4_id, skycell_id, tess_id, exp_tag, p3_version, uri, bg, bg_mean_stdev); -} -psArray *p4ScfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) + return p4SkyfileRowAlloc(p4_id, skycell_id, tess_id, uri, bg, bg_mean_stdev); +} +psArray *p4SkyfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) { psArray *rowSet; @@ -15168,5 +15125,5 @@ psU64 i; - rowSet = psDBSelectRows(dbh, P4SCFILE_TABLE_NAME, where, limit); + rowSet = psDBSelectRows(dbh, P4SKYFILE_TABLE_NAME, where, limit); if (!rowSet) { return NULL; @@ -15178,5 +15135,5 @@ for (i = 0; i < rowSet->n; i++) { - p4ScfileRow *object = p4ScfileObjectFromMetadata(rowSet->data[i]); + p4SkyfileRow *object = p4SkyfileObjectFromMetadata(rowSet->data[i]); psArrayAdd(returnSet, 0, object); psFree(object); @@ -15187,11 +15144,11 @@ return returnSet; } -bool p4ScfileDeleteObject(psDB *dbh, const p4ScfileRow *object) -{ - psMetadata *where = p4ScfileMetadataFromObject(object); - long long count = psDBDeleteRows(dbh, P4SCFILE_TABLE_NAME, where, 0); +bool p4SkyfileDeleteObject(psDB *dbh, const p4SkyfileRow *object) +{ + psMetadata *where = p4SkyfileMetadataFromObject(object); + long long count = psDBDeleteRows(dbh, P4SKYFILE_TABLE_NAME, where, 0); psFree(where); if (count < 0) { - psError(PS_ERR_UNKNOWN, true, "failed to delete row from p4Scfile"); + psError(PS_ERR_UNKNOWN, true, "failed to delete row from p4Skyfile"); return false; } @@ -15199,21 +15156,21 @@ // 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, "p4ScfileRow object matched more then one row. Check your database schema"); - return false; - } - - return true; -} -long long p4ScfileDeleteRowObjects(psDB *dbh, const psArray *objects, unsigned long long limit) + psError(PS_ERR_UNKNOWN, true, "p4SkyfileRow object matched more then one row. Check your database schema"); + return false; + } + + return true; +} +long long p4SkyfileDeleteRowObjects(psDB *dbh, const psArray *objects, unsigned long long limit) { long long deleted = 0; for (long long i = 0; i < objects->n; i++) { - p4ScfileRow *object = objects->data[i]; - psMetadata *where = p4ScfileMetadataFromObject(object); - long long count = psDBDeleteRows(dbh, P4SCFILE_TABLE_NAME, where, limit); + p4SkyfileRow *object = objects->data[i]; + psMetadata *where = p4SkyfileMetadataFromObject(object); + long long count = psDBDeleteRows(dbh, P4SKYFILE_TABLE_NAME, where, limit); psFree(where); if (count < 0) { - psError(PS_ERR_UNKNOWN, true, "failed to delete row from p4Scfile"); + psError(PS_ERR_UNKNOWN, true, "failed to delete row from p4Skyfile"); return count; } @@ -15224,5 +15181,5 @@ return deleted; } -bool p4ScfilePrintObjects(FILE *stream, psArray *objects, bool mdcf) +bool p4SkyfilePrintObjects(FILE *stream, psArray *objects, bool mdcf) { PS_ASSERT_PTR_NON_NULL(objects, false); @@ -15230,9 +15187,9 @@ psMetadata *output = psMetadataAlloc(); for (long i = 0; i < psArrayLength(objects); i++) { - psMetadata *md = p4ScfileMetadataFromObject(objects->data[i]); + psMetadata *md = p4SkyfileMetadataFromObject(objects->data[i]); if (!psMetadataAddMetadata( output, PS_LIST_TAIL, - P4SCFILE_TABLE_NAME, + P4SKYFILE_TABLE_NAME, PS_META_DUPLICATE_OK, NULL, @@ -15255,9 +15212,9 @@ return true; } -bool p4ScfilePrintObject(FILE *stream, p4ScfileRow *object, bool mdcf) +bool p4SkyfilePrintObject(FILE *stream, p4SkyfileRow *object, bool mdcf) { PS_ASSERT_PTR_NON_NULL(object, false); - psMetadata *md = p4ScfileMetadataFromObject(object); + psMetadata *md = p4SkyfileMetadataFromObject(object); if (!ippdbPrintMetadataRaw(stream, md, mdcf)) { @@ -15272,5 +15229,5 @@ static void p5RunRowFree(p5RunRow *object); -p5RunRow *p5RunRowAlloc(psS32 p5_id, const char *state, const char *workdir, const char *dvodb, psTime* registered) +p5RunRow *p5RunRowAlloc(psS32 p5_id, const char *state, const char *workdir, const char *dvodb, psTime* registered, const char *skycell_id, const char *tess_id) { p5RunRow *_object; @@ -15284,4 +15241,6 @@ _object->dvodb = psStringCopy(dvodb); _object->registered = psTimeCopy(registered); + _object->skycell_id = psStringCopy(skycell_id); + _object->tess_id = psStringCopy(tess_id); return _object; @@ -15294,4 +15253,6 @@ psFree(object->dvodb); psFree(object->registered); + psFree(object->skycell_id); + psFree(object->tess_id); } @@ -15324,4 +15285,14 @@ return false; } + if (!psMetadataAdd(md, PS_LIST_TAIL, "skycell_id", PS_DATA_STRING, "Key", "64")) { + psError(PS_ERR_UNKNOWN, false, "failed to add item skycell_id"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "tess_id", PS_DATA_STRING, "Key", "64")) { + psError(PS_ERR_UNKNOWN, false, "failed to add item tess_id"); + psFree(md); + return false; + } bool status = psDBCreateTable(dbh, P5RUN_TABLE_NAME, md); @@ -15337,5 +15308,5 @@ } -bool p5RunInsert(psDB * dbh, psS32 p5_id, const char *state, const char *workdir, const char *dvodb, psTime* registered) +bool p5RunInsert(psDB * dbh, psS32 p5_id, const char *state, const char *workdir, const char *dvodb, psTime* registered, const char *skycell_id, const char *tess_id) { psMetadata *md = psMetadataAlloc(); @@ -15362,4 +15333,14 @@ 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, "skycell_id", PS_DATA_STRING, NULL, skycell_id)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item skycell_id"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "tess_id", PS_DATA_STRING, NULL, tess_id)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item tess_id"); psFree(md); return false; @@ -15388,5 +15369,5 @@ bool p5RunInsertObject(psDB *dbh, p5RunRow *object) { - return p5RunInsert(dbh, object->p5_id, object->state, object->workdir, object->dvodb, object->registered); + return p5RunInsert(dbh, object->p5_id, object->state, object->workdir, object->dvodb, object->registered, object->skycell_id, object->tess_id); } @@ -15486,4 +15467,14 @@ return false; } + if (!psMetadataAdd(md, PS_LIST_TAIL, "skycell_id", PS_DATA_STRING, NULL, object->skycell_id)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item skycell_id"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "tess_id", PS_DATA_STRING, NULL, object->tess_id)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item tess_id"); + psFree(md); + return false; + } @@ -15520,6 +15511,16 @@ return false; } - - return p5RunRowAlloc(p5_id, state, workdir, dvodb, registered); + char* skycell_id = psMetadataLookupPtr(&status, md, "skycell_id"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item skycell_id"); + return false; + } + char* tess_id = psMetadataLookupPtr(&status, md, "tess_id"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item tess_id"); + return false; + } + + return p5RunRowAlloc(p5_id, state, workdir, dvodb, registered, skycell_id, tess_id); } psArray *p5RunSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) @@ -15631,12 +15632,12 @@ return true; } -static void p5InputScfileRowFree(p5InputScfileRow *object); - -p5InputScfileRow *p5InputScfileRowAlloc(psS32 p5_id, psS32 p4_id, const char *skycell_id, const char *tess_id, const char *kind, bool template) -{ - p5InputScfileRow *_object; - - _object = psAlloc(sizeof(p5InputScfileRow)); - psMemSetDeallocator(_object, (psFreeFunc)p5InputScfileRowFree); +static void p5InputSkyfileRowFree(p5InputSkyfileRow *object); + +p5InputSkyfileRow *p5InputSkyfileRowAlloc(psS32 p5_id, psS32 p4_id, const char *skycell_id, const char *tess_id, const char *kind, bool template) +{ + p5InputSkyfileRow *_object; + + _object = psAlloc(sizeof(p5InputSkyfileRow)); + psMemSetDeallocator(_object, (psFreeFunc)p5InputSkyfileRowFree); _object->p5_id = p5_id; @@ -15650,5 +15651,5 @@ } -static void p5InputScfileRowFree(p5InputScfileRow *object) +static void p5InputSkyfileRowFree(p5InputSkyfileRow *object) { psFree(object->skycell_id); @@ -15657,5 +15658,5 @@ } -bool p5InputScfileCreateTable(psDB *dbh) +bool p5InputSkyfileCreateTable(psDB *dbh) { psMetadata *md = psMetadataAlloc(); @@ -15691,5 +15692,5 @@ } - bool status = psDBCreateTable(dbh, P5INPUTSCFILE_TABLE_NAME, md); + bool status = psDBCreateTable(dbh, P5INPUTSKYFILE_TABLE_NAME, md); psFree(md); @@ -15698,10 +15699,10 @@ } -bool p5InputScfileDropTable(psDB *dbh) -{ - return psDBDropTable(dbh, P5INPUTSCFILE_TABLE_NAME); -} - -bool p5InputScfileInsert(psDB * dbh, psS32 p5_id, psS32 p4_id, const char *skycell_id, const char *tess_id, const char *kind, bool template) +bool p5InputSkyfileDropTable(psDB *dbh) +{ + return psDBDropTable(dbh, P5INPUTSKYFILE_TABLE_NAME); +} + +bool p5InputSkyfileInsert(psDB * dbh, psS32 p5_id, psS32 p4_id, const char *skycell_id, const char *tess_id, const char *kind, bool template) { psMetadata *md = psMetadataAlloc(); @@ -15737,5 +15738,5 @@ } - bool status = psDBInsertOneRow(dbh, P5INPUTSCFILE_TABLE_NAME, md); + bool status = psDBInsertOneRow(dbh, P5INPUTSKYFILE_TABLE_NAME, md); psFree(md); @@ -15743,11 +15744,11 @@ } -long long p5InputScfileDelete(psDB *dbh, const psMetadata *where, unsigned long long limit) +long long p5InputSkyfileDelete(psDB *dbh, const psMetadata *where, unsigned long long limit) { long long deleted = 0; - long long count = psDBDeleteRows(dbh, P5INPUTSCFILE_TABLE_NAME, where, limit); + long long count = psDBDeleteRows(dbh, P5INPUTSKYFILE_TABLE_NAME, where, limit); if (count < 0) { - psError(PS_ERR_UNKNOWN, true, "failed to delete row from p5InputScfile"); + psError(PS_ERR_UNKNOWN, true, "failed to delete row from p5InputSkyfile"); return count; @@ -15757,13 +15758,13 @@ return deleted; } -bool p5InputScfileInsertObject(psDB *dbh, p5InputScfileRow *object) -{ - return p5InputScfileInsert(dbh, object->p5_id, object->p4_id, object->skycell_id, object->tess_id, object->kind, object->template); -} - -bool p5InputScfileInsertObjects(psDB *dbh, psArray *objects) +bool p5InputSkyfileInsertObject(psDB *dbh, p5InputSkyfileRow *object) +{ + return p5InputSkyfileInsert(dbh, object->p5_id, object->p4_id, object->skycell_id, object->tess_id, object->kind, object->template); +} + +bool p5InputSkyfileInsertObjects(psDB *dbh, psArray *objects) { for (long i = 0; i < psArrayLength(objects); i++) { - if (!p5InputScfileInsertObject(dbh, objects->data[i])) { + if (!p5InputSkyfileInsertObject(dbh, objects->data[i])) { return false; } @@ -15773,11 +15774,11 @@ } -bool p5InputScfileInsertFits(psDB *dbh, const psFits *fits) +bool p5InputSkyfileInsertFits(psDB *dbh, const psFits *fits) { psArray *rowSet; - // move to (the first?) extension named P5INPUTSCFILE_TABLE_NAME - if (!psFitsMoveExtName(fits, P5INPUTSCFILE_TABLE_NAME)) { - psError(PS_ERR_UNKNOWN, true, "failed to find FITS extension %s", P5INPUTSCFILE_TABLE_NAME); + // move to (the first?) extension named P5INPUTSKYFILE_TABLE_NAME + if (!psFitsMoveExtName(fits, P5INPUTSKYFILE_TABLE_NAME)) { + psError(PS_ERR_UNKNOWN, true, "failed to find FITS extension %s", P5INPUTSKYFILE_TABLE_NAME); return false; } @@ -15797,5 +15798,5 @@ } - if (!psDBInsertRows(dbh, P5INPUTSCFILE_TABLE_NAME, rowSet)) { + if (!psDBInsertRows(dbh, P5INPUTSKYFILE_TABLE_NAME, rowSet)) { psError(PS_ERR_UNKNOWN, false, "databse insert failed"); psFree(rowSet); @@ -15808,9 +15809,9 @@ } -bool p5InputScfileSelectRowsFits(psDB *dbh, psFits *fits, const psMetadata *where, unsigned long long limit) +bool p5InputSkyfileSelectRowsFits(psDB *dbh, psFits *fits, const psMetadata *where, unsigned long long limit) { psArray *rowSet; - rowSet = psDBSelectRows(dbh, P5INPUTSCFILE_TABLE_NAME, where, limit); + rowSet = psDBSelectRows(dbh, P5INPUTSKYFILE_TABLE_NAME, where, limit); if (!rowSet) { return false; @@ -15818,5 +15819,5 @@ // output to fits - if (!psFitsWriteTable(fits, NULL, rowSet, P5INPUTSCFILE_TABLE_NAME)) { + if (!psFitsWriteTable(fits, NULL, rowSet, P5INPUTSKYFILE_TABLE_NAME)) { psError(PS_ERR_UNKNOWN, false, "FITS table write failed"); psFree(rowSet); @@ -15829,5 +15830,5 @@ } -psMetadata *p5InputScfileMetadataFromObject(const p5InputScfileRow *object) +psMetadata *p5InputSkyfileMetadataFromObject(const p5InputSkyfileRow *object) { psMetadata *md = psMetadataAlloc(); @@ -15867,5 +15868,5 @@ } -p5InputScfileRow *p5InputScfileObjectFromMetadata(psMetadata *md) +p5InputSkyfileRow *p5InputSkyfileObjectFromMetadata(psMetadata *md) { @@ -15902,7 +15903,7 @@ } - return p5InputScfileRowAlloc(p5_id, p4_id, skycell_id, tess_id, kind, template); -} -psArray *p5InputScfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) + return p5InputSkyfileRowAlloc(p5_id, p4_id, skycell_id, tess_id, kind, template); +} +psArray *p5InputSkyfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) { psArray *rowSet; @@ -15910,5 +15911,5 @@ psU64 i; - rowSet = psDBSelectRows(dbh, P5INPUTSCFILE_TABLE_NAME, where, limit); + rowSet = psDBSelectRows(dbh, P5INPUTSKYFILE_TABLE_NAME, where, limit); if (!rowSet) { return NULL; @@ -15920,5 +15921,5 @@ for (i = 0; i < rowSet->n; i++) { - p5InputScfileRow *object = p5InputScfileObjectFromMetadata(rowSet->data[i]); + p5InputSkyfileRow *object = p5InputSkyfileObjectFromMetadata(rowSet->data[i]); psArrayAdd(returnSet, 0, object); psFree(object); @@ -15929,11 +15930,11 @@ return returnSet; } -bool p5InputScfileDeleteObject(psDB *dbh, const p5InputScfileRow *object) -{ - psMetadata *where = p5InputScfileMetadataFromObject(object); - long long count = psDBDeleteRows(dbh, P5INPUTSCFILE_TABLE_NAME, where, 0); +bool p5InputSkyfileDeleteObject(psDB *dbh, const p5InputSkyfileRow *object) +{ + psMetadata *where = p5InputSkyfileMetadataFromObject(object); + long long count = psDBDeleteRows(dbh, P5INPUTSKYFILE_TABLE_NAME, where, 0); psFree(where); if (count < 0) { - psError(PS_ERR_UNKNOWN, true, "failed to delete row from p5InputScfile"); + psError(PS_ERR_UNKNOWN, true, "failed to delete row from p5InputSkyfile"); return false; } @@ -15941,21 +15942,21 @@ // 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, "p5InputScfileRow object matched more then one row. Check your database schema"); - return false; - } - - return true; -} -long long p5InputScfileDeleteRowObjects(psDB *dbh, const psArray *objects, unsigned long long limit) + psError(PS_ERR_UNKNOWN, true, "p5InputSkyfileRow object matched more then one row. Check your database schema"); + return false; + } + + return true; +} +long long p5InputSkyfileDeleteRowObjects(psDB *dbh, const psArray *objects, unsigned long long limit) { long long deleted = 0; for (long long i = 0; i < objects->n; i++) { - p5InputScfileRow *object = objects->data[i]; - psMetadata *where = p5InputScfileMetadataFromObject(object); - long long count = psDBDeleteRows(dbh, P5INPUTSCFILE_TABLE_NAME, where, limit); + p5InputSkyfileRow *object = objects->data[i]; + psMetadata *where = p5InputSkyfileMetadataFromObject(object); + long long count = psDBDeleteRows(dbh, P5INPUTSKYFILE_TABLE_NAME, where, limit); psFree(where); if (count < 0) { - psError(PS_ERR_UNKNOWN, true, "failed to delete row from p5InputScfile"); + psError(PS_ERR_UNKNOWN, true, "failed to delete row from p5InputSkyfile"); return count; } @@ -15966,5 +15967,5 @@ return deleted; } -bool p5InputScfilePrintObjects(FILE *stream, psArray *objects, bool mdcf) +bool p5InputSkyfilePrintObjects(FILE *stream, psArray *objects, bool mdcf) { PS_ASSERT_PTR_NON_NULL(objects, false); @@ -15972,9 +15973,9 @@ psMetadata *output = psMetadataAlloc(); for (long i = 0; i < psArrayLength(objects); i++) { - psMetadata *md = p5InputScfileMetadataFromObject(objects->data[i]); + psMetadata *md = p5InputSkyfileMetadataFromObject(objects->data[i]); if (!psMetadataAddMetadata( output, PS_LIST_TAIL, - P5INPUTSCFILE_TABLE_NAME, + P5INPUTSKYFILE_TABLE_NAME, PS_META_DUPLICATE_OK, NULL, @@ -15997,9 +15998,9 @@ return true; } -bool p5InputScfilePrintObject(FILE *stream, p5InputScfileRow *object, bool mdcf) +bool p5InputSkyfilePrintObject(FILE *stream, p5InputSkyfileRow *object, bool mdcf) { PS_ASSERT_PTR_NON_NULL(object, false); - psMetadata *md = p5InputScfileMetadataFromObject(object); + psMetadata *md = p5InputSkyfileMetadataFromObject(object); if (!ippdbPrintMetadataRaw(stream, md, mdcf)) { @@ -16012,16 +16013,14 @@ return true; } -static void p5DiffScfileRowFree(p5DiffScfileRow *object); - -p5DiffScfileRow *p5DiffScfileRowAlloc(psS32 p5_id, const char *skycell_id, const char *tess_id, const char *uri, psF64 bg, psF64 bg_mean_stdev) -{ - p5DiffScfileRow *_object; - - _object = psAlloc(sizeof(p5DiffScfileRow)); - psMemSetDeallocator(_object, (psFreeFunc)p5DiffScfileRowFree); +static void p5DiffSkyfileRowFree(p5DiffSkyfileRow *object); + +p5DiffSkyfileRow *p5DiffSkyfileRowAlloc(psS32 p5_id, const char *uri, psF64 bg, psF64 bg_mean_stdev) +{ + p5DiffSkyfileRow *_object; + + _object = psAlloc(sizeof(p5DiffSkyfileRow)); + psMemSetDeallocator(_object, (psFreeFunc)p5DiffSkyfileRowFree); _object->p5_id = p5_id; - _object->skycell_id = psStringCopy(skycell_id); - _object->tess_id = psStringCopy(tess_id); _object->uri = psStringCopy(uri); _object->bg = bg; @@ -16031,12 +16030,10 @@ } -static void p5DiffScfileRowFree(p5DiffScfileRow *object) -{ - psFree(object->skycell_id); - psFree(object->tess_id); +static void p5DiffSkyfileRowFree(p5DiffSkyfileRow *object) +{ psFree(object->uri); } -bool p5DiffScfileCreateTable(psDB *dbh) +bool p5DiffSkyfileCreateTable(psDB *dbh) { psMetadata *md = psMetadataAlloc(); @@ -16046,14 +16043,4 @@ return false; } - if (!psMetadataAdd(md, PS_LIST_TAIL, "skycell_id", PS_DATA_STRING, "Primary Key", "64")) { - psError(PS_ERR_UNKNOWN, false, "failed to add item skycell_id"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "tess_id", PS_DATA_STRING, "Primary Key", "64")) { - psError(PS_ERR_UNKNOWN, false, "failed to add item tess_id"); - psFree(md); - return false; - } if (!psMetadataAdd(md, PS_LIST_TAIL, "uri", PS_DATA_STRING, NULL, "255")) { psError(PS_ERR_UNKNOWN, false, "failed to add item uri"); @@ -16072,5 +16059,5 @@ } - bool status = psDBCreateTable(dbh, P5DIFFSCFILE_TABLE_NAME, md); + bool status = psDBCreateTable(dbh, P5DIFFSKYFILE_TABLE_NAME, md); psFree(md); @@ -16079,10 +16066,10 @@ } -bool p5DiffScfileDropTable(psDB *dbh) -{ - return psDBDropTable(dbh, P5DIFFSCFILE_TABLE_NAME); -} - -bool p5DiffScfileInsert(psDB * dbh, psS32 p5_id, const char *skycell_id, const char *tess_id, const char *uri, psF64 bg, psF64 bg_mean_stdev) +bool p5DiffSkyfileDropTable(psDB *dbh) +{ + return psDBDropTable(dbh, P5DIFFSKYFILE_TABLE_NAME); +} + +bool p5DiffSkyfileInsert(psDB * dbh, psS32 p5_id, const char *uri, psF64 bg, psF64 bg_mean_stdev) { psMetadata *md = psMetadataAlloc(); @@ -16092,14 +16079,4 @@ return false; } - if (!psMetadataAdd(md, PS_LIST_TAIL, "skycell_id", PS_DATA_STRING, NULL, skycell_id)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item skycell_id"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "tess_id", PS_DATA_STRING, NULL, tess_id)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item tess_id"); - psFree(md); - return false; - } if (!psMetadataAdd(md, PS_LIST_TAIL, "uri", PS_DATA_STRING, NULL, uri)) { psError(PS_ERR_UNKNOWN, false, "failed to add item uri"); @@ -16118,5 +16095,5 @@ } - bool status = psDBInsertOneRow(dbh, P5DIFFSCFILE_TABLE_NAME, md); + bool status = psDBInsertOneRow(dbh, P5DIFFSKYFILE_TABLE_NAME, md); psFree(md); @@ -16124,11 +16101,11 @@ } -long long p5DiffScfileDelete(psDB *dbh, const psMetadata *where, unsigned long long limit) +long long p5DiffSkyfileDelete(psDB *dbh, const psMetadata *where, unsigned long long limit) { long long deleted = 0; - long long count = psDBDeleteRows(dbh, P5DIFFSCFILE_TABLE_NAME, where, limit); + long long count = psDBDeleteRows(dbh, P5DIFFSKYFILE_TABLE_NAME, where, limit); if (count < 0) { - psError(PS_ERR_UNKNOWN, true, "failed to delete row from p5DiffScfile"); + psError(PS_ERR_UNKNOWN, true, "failed to delete row from p5DiffSkyfile"); return count; @@ -16138,13 +16115,13 @@ return deleted; } -bool p5DiffScfileInsertObject(psDB *dbh, p5DiffScfileRow *object) -{ - return p5DiffScfileInsert(dbh, object->p5_id, object->skycell_id, object->tess_id, object->uri, object->bg, object->bg_mean_stdev); -} - -bool p5DiffScfileInsertObjects(psDB *dbh, psArray *objects) +bool p5DiffSkyfileInsertObject(psDB *dbh, p5DiffSkyfileRow *object) +{ + return p5DiffSkyfileInsert(dbh, object->p5_id, object->uri, object->bg, object->bg_mean_stdev); +} + +bool p5DiffSkyfileInsertObjects(psDB *dbh, psArray *objects) { for (long i = 0; i < psArrayLength(objects); i++) { - if (!p5DiffScfileInsertObject(dbh, objects->data[i])) { + if (!p5DiffSkyfileInsertObject(dbh, objects->data[i])) { return false; } @@ -16154,11 +16131,11 @@ } -bool p5DiffScfileInsertFits(psDB *dbh, const psFits *fits) +bool p5DiffSkyfileInsertFits(psDB *dbh, const psFits *fits) { psArray *rowSet; - // move to (the first?) extension named P5DIFFSCFILE_TABLE_NAME - if (!psFitsMoveExtName(fits, P5DIFFSCFILE_TABLE_NAME)) { - psError(PS_ERR_UNKNOWN, true, "failed to find FITS extension %s", P5DIFFSCFILE_TABLE_NAME); + // move to (the first?) extension named P5DIFFSKYFILE_TABLE_NAME + if (!psFitsMoveExtName(fits, P5DIFFSKYFILE_TABLE_NAME)) { + psError(PS_ERR_UNKNOWN, true, "failed to find FITS extension %s", P5DIFFSKYFILE_TABLE_NAME); return false; } @@ -16178,5 +16155,5 @@ } - if (!psDBInsertRows(dbh, P5DIFFSCFILE_TABLE_NAME, rowSet)) { + if (!psDBInsertRows(dbh, P5DIFFSKYFILE_TABLE_NAME, rowSet)) { psError(PS_ERR_UNKNOWN, false, "databse insert failed"); psFree(rowSet); @@ -16189,9 +16166,9 @@ } -bool p5DiffScfileSelectRowsFits(psDB *dbh, psFits *fits, const psMetadata *where, unsigned long long limit) +bool p5DiffSkyfileSelectRowsFits(psDB *dbh, psFits *fits, const psMetadata *where, unsigned long long limit) { psArray *rowSet; - rowSet = psDBSelectRows(dbh, P5DIFFSCFILE_TABLE_NAME, where, limit); + rowSet = psDBSelectRows(dbh, P5DIFFSKYFILE_TABLE_NAME, where, limit); if (!rowSet) { return false; @@ -16199,5 +16176,5 @@ // output to fits - if (!psFitsWriteTable(fits, NULL, rowSet, P5DIFFSCFILE_TABLE_NAME)) { + if (!psFitsWriteTable(fits, NULL, rowSet, P5DIFFSKYFILE_TABLE_NAME)) { psError(PS_ERR_UNKNOWN, false, "FITS table write failed"); psFree(rowSet); @@ -16210,5 +16187,5 @@ } -psMetadata *p5DiffScfileMetadataFromObject(const p5DiffScfileRow *object) +psMetadata *p5DiffSkyfileMetadataFromObject(const p5DiffSkyfileRow *object) { psMetadata *md = psMetadataAlloc(); @@ -16218,14 +16195,4 @@ return false; } - if (!psMetadataAdd(md, PS_LIST_TAIL, "skycell_id", PS_DATA_STRING, NULL, object->skycell_id)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item skycell_id"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "tess_id", PS_DATA_STRING, NULL, object->tess_id)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item tess_id"); - psFree(md); - return false; - } if (!psMetadataAdd(md, PS_LIST_TAIL, "uri", PS_DATA_STRING, NULL, object->uri)) { psError(PS_ERR_UNKNOWN, false, "failed to add item uri"); @@ -16248,5 +16215,5 @@ } -p5DiffScfileRow *p5DiffScfileObjectFromMetadata(psMetadata *md) +p5DiffSkyfileRow *p5DiffSkyfileObjectFromMetadata(psMetadata *md) { @@ -16257,14 +16224,4 @@ return false; } - char* skycell_id = psMetadataLookupPtr(&status, md, "skycell_id"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item skycell_id"); - return false; - } - char* tess_id = psMetadataLookupPtr(&status, md, "tess_id"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item tess_id"); - return false; - } char* uri = psMetadataLookupPtr(&status, md, "uri"); if (!status) { @@ -16283,7 +16240,7 @@ } - return p5DiffScfileRowAlloc(p5_id, skycell_id, tess_id, uri, bg, bg_mean_stdev); -} -psArray *p5DiffScfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) + return p5DiffSkyfileRowAlloc(p5_id, uri, bg, bg_mean_stdev); +} +psArray *p5DiffSkyfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) { psArray *rowSet; @@ -16291,5 +16248,5 @@ psU64 i; - rowSet = psDBSelectRows(dbh, P5DIFFSCFILE_TABLE_NAME, where, limit); + rowSet = psDBSelectRows(dbh, P5DIFFSKYFILE_TABLE_NAME, where, limit); if (!rowSet) { return NULL; @@ -16301,5 +16258,5 @@ for (i = 0; i < rowSet->n; i++) { - p5DiffScfileRow *object = p5DiffScfileObjectFromMetadata(rowSet->data[i]); + p5DiffSkyfileRow *object = p5DiffSkyfileObjectFromMetadata(rowSet->data[i]); psArrayAdd(returnSet, 0, object); psFree(object); @@ -16310,11 +16267,11 @@ return returnSet; } -bool p5DiffScfileDeleteObject(psDB *dbh, const p5DiffScfileRow *object) -{ - psMetadata *where = p5DiffScfileMetadataFromObject(object); - long long count = psDBDeleteRows(dbh, P5DIFFSCFILE_TABLE_NAME, where, 0); +bool p5DiffSkyfileDeleteObject(psDB *dbh, const p5DiffSkyfileRow *object) +{ + psMetadata *where = p5DiffSkyfileMetadataFromObject(object); + long long count = psDBDeleteRows(dbh, P5DIFFSKYFILE_TABLE_NAME, where, 0); psFree(where); if (count < 0) { - psError(PS_ERR_UNKNOWN, true, "failed to delete row from p5DiffScfile"); + psError(PS_ERR_UNKNOWN, true, "failed to delete row from p5DiffSkyfile"); return false; } @@ -16322,21 +16279,21 @@ // 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, "p5DiffScfileRow object matched more then one row. Check your database schema"); - return false; - } - - return true; -} -long long p5DiffScfileDeleteRowObjects(psDB *dbh, const psArray *objects, unsigned long long limit) + psError(PS_ERR_UNKNOWN, true, "p5DiffSkyfileRow object matched more then one row. Check your database schema"); + return false; + } + + return true; +} +long long p5DiffSkyfileDeleteRowObjects(psDB *dbh, const psArray *objects, unsigned long long limit) { long long deleted = 0; for (long long i = 0; i < objects->n; i++) { - p5DiffScfileRow *object = objects->data[i]; - psMetadata *where = p5DiffScfileMetadataFromObject(object); - long long count = psDBDeleteRows(dbh, P5DIFFSCFILE_TABLE_NAME, where, limit); + p5DiffSkyfileRow *object = objects->data[i]; + psMetadata *where = p5DiffSkyfileMetadataFromObject(object); + long long count = psDBDeleteRows(dbh, P5DIFFSKYFILE_TABLE_NAME, where, limit); psFree(where); if (count < 0) { - psError(PS_ERR_UNKNOWN, true, "failed to delete row from p5DiffScfile"); + psError(PS_ERR_UNKNOWN, true, "failed to delete row from p5DiffSkyfile"); return count; } @@ -16347,5 +16304,5 @@ return deleted; } -bool p5DiffScfilePrintObjects(FILE *stream, psArray *objects, bool mdcf) +bool p5DiffSkyfilePrintObjects(FILE *stream, psArray *objects, bool mdcf) { PS_ASSERT_PTR_NON_NULL(objects, false); @@ -16353,9 +16310,9 @@ psMetadata *output = psMetadataAlloc(); for (long i = 0; i < psArrayLength(objects); i++) { - psMetadata *md = p5DiffScfileMetadataFromObject(objects->data[i]); + psMetadata *md = p5DiffSkyfileMetadataFromObject(objects->data[i]); if (!psMetadataAddMetadata( output, PS_LIST_TAIL, - P5DIFFSCFILE_TABLE_NAME, + P5DIFFSKYFILE_TABLE_NAME, PS_META_DUPLICATE_OK, NULL, @@ -16378,9 +16335,9 @@ return true; } -bool p5DiffScfilePrintObject(FILE *stream, p5DiffScfileRow *object, bool mdcf) +bool p5DiffSkyfilePrintObject(FILE *stream, p5DiffSkyfileRow *object, bool mdcf) { PS_ASSERT_PTR_NON_NULL(object, false); - psMetadata *md = p5DiffScfileMetadataFromObject(object); + psMetadata *md = p5DiffSkyfileMetadataFromObject(object); if (!ippdbPrintMetadataRaw(stream, md, mdcf)) { @@ -16395,5 +16352,5 @@ static void p6RunRowFree(p6RunRow *object); -p6RunRow *p6RunRowAlloc(psS32 p6_id, const char *state, const char *workdir, const char *dvodb, psTime* registered) +p6RunRow *p6RunRowAlloc(psS32 p6_id, const char *state, const char *workdir, const char *dvodb, psTime* registered, const char *skycell_id, const char *tess_id) { p6RunRow *_object; @@ -16407,4 +16364,6 @@ _object->dvodb = psStringCopy(dvodb); _object->registered = psTimeCopy(registered); + _object->skycell_id = psStringCopy(skycell_id); + _object->tess_id = psStringCopy(tess_id); return _object; @@ -16417,4 +16376,6 @@ psFree(object->dvodb); psFree(object->registered); + psFree(object->skycell_id); + psFree(object->tess_id); } @@ -16447,4 +16408,14 @@ return false; } + if (!psMetadataAdd(md, PS_LIST_TAIL, "skycell_id", PS_DATA_STRING, "Key", "64")) { + psError(PS_ERR_UNKNOWN, false, "failed to add item skycell_id"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "tess_id", PS_DATA_STRING, "Key", "64")) { + psError(PS_ERR_UNKNOWN, false, "failed to add item tess_id"); + psFree(md); + return false; + } bool status = psDBCreateTable(dbh, P6RUN_TABLE_NAME, md); @@ -16460,5 +16431,5 @@ } -bool p6RunInsert(psDB * dbh, psS32 p6_id, const char *state, const char *workdir, const char *dvodb, psTime* registered) +bool p6RunInsert(psDB * dbh, psS32 p6_id, const char *state, const char *workdir, const char *dvodb, psTime* registered, const char *skycell_id, const char *tess_id) { psMetadata *md = psMetadataAlloc(); @@ -16485,4 +16456,14 @@ 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, "skycell_id", PS_DATA_STRING, NULL, skycell_id)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item skycell_id"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "tess_id", PS_DATA_STRING, NULL, tess_id)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item tess_id"); psFree(md); return false; @@ -16511,5 +16492,5 @@ bool p6RunInsertObject(psDB *dbh, p6RunRow *object) { - return p6RunInsert(dbh, object->p6_id, object->state, object->workdir, object->dvodb, object->registered); + return p6RunInsert(dbh, object->p6_id, object->state, object->workdir, object->dvodb, object->registered, object->skycell_id, object->tess_id); } @@ -16609,4 +16590,14 @@ return false; } + if (!psMetadataAdd(md, PS_LIST_TAIL, "skycell_id", PS_DATA_STRING, NULL, object->skycell_id)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item skycell_id"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "tess_id", PS_DATA_STRING, NULL, object->tess_id)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item tess_id"); + psFree(md); + return false; + } @@ -16643,6 +16634,16 @@ return false; } - - return p6RunRowAlloc(p6_id, state, workdir, dvodb, registered); + char* skycell_id = psMetadataLookupPtr(&status, md, "skycell_id"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item skycell_id"); + return false; + } + char* tess_id = psMetadataLookupPtr(&status, md, "tess_id"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item tess_id"); + return false; + } + + return p6RunRowAlloc(p6_id, state, workdir, dvodb, registered, skycell_id, tess_id); } psArray *p6RunSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) @@ -16754,28 +16755,24 @@ return true; } -static void p6InputScfileRowFree(p6InputScfileRow *object); - -p6InputScfileRow *p6InputScfileRowAlloc(psS32 p6_id, psS32 p4_id, const char *skycell_id, const char *tess_id) -{ - p6InputScfileRow *_object; - - _object = psAlloc(sizeof(p6InputScfileRow)); - psMemSetDeallocator(_object, (psFreeFunc)p6InputScfileRowFree); +static void p6InputSkyfileRowFree(p6InputSkyfileRow *object); + +p6InputSkyfileRow *p6InputSkyfileRowAlloc(psS32 p6_id, psS32 p4_id) +{ + p6InputSkyfileRow *_object; + + _object = psAlloc(sizeof(p6InputSkyfileRow)); + psMemSetDeallocator(_object, (psFreeFunc)p6InputSkyfileRowFree); _object->p6_id = p6_id; _object->p4_id = p4_id; - _object->skycell_id = psStringCopy(skycell_id); - _object->tess_id = psStringCopy(tess_id); return _object; } -static void p6InputScfileRowFree(p6InputScfileRow *object) -{ - psFree(object->skycell_id); - psFree(object->tess_id); -} - -bool p6InputScfileCreateTable(psDB *dbh) +static void p6InputSkyfileRowFree(p6InputSkyfileRow *object) +{ +} + +bool p6InputSkyfileCreateTable(psDB *dbh) { psMetadata *md = psMetadataAlloc(); @@ -16790,16 +16787,6 @@ return false; } - if (!psMetadataAdd(md, PS_LIST_TAIL, "skycell_id", PS_DATA_STRING, "Primary Key", "64")) { - psError(PS_ERR_UNKNOWN, false, "failed to add item skycell_id"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "tess_id", PS_DATA_STRING, "Primary Key", "64")) { - psError(PS_ERR_UNKNOWN, false, "failed to add item tess_id"); - psFree(md); - return false; - } - - bool status = psDBCreateTable(dbh, P6INPUTSCFILE_TABLE_NAME, md); + + bool status = psDBCreateTable(dbh, P6INPUTSKYFILE_TABLE_NAME, md); psFree(md); @@ -16808,10 +16795,10 @@ } -bool p6InputScfileDropTable(psDB *dbh) -{ - return psDBDropTable(dbh, P6INPUTSCFILE_TABLE_NAME); -} - -bool p6InputScfileInsert(psDB * dbh, psS32 p6_id, psS32 p4_id, const char *skycell_id, const char *tess_id) +bool p6InputSkyfileDropTable(psDB *dbh) +{ + return psDBDropTable(dbh, P6INPUTSKYFILE_TABLE_NAME); +} + +bool p6InputSkyfileInsert(psDB * dbh, psS32 p6_id, psS32 p4_id) { psMetadata *md = psMetadataAlloc(); @@ -16826,16 +16813,6 @@ return false; } - if (!psMetadataAdd(md, PS_LIST_TAIL, "skycell_id", PS_DATA_STRING, NULL, skycell_id)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item skycell_id"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "tess_id", PS_DATA_STRING, NULL, tess_id)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item tess_id"); - psFree(md); - return false; - } - - bool status = psDBInsertOneRow(dbh, P6INPUTSCFILE_TABLE_NAME, md); + + bool status = psDBInsertOneRow(dbh, P6INPUTSKYFILE_TABLE_NAME, md); psFree(md); @@ -16843,11 +16820,11 @@ } -long long p6InputScfileDelete(psDB *dbh, const psMetadata *where, unsigned long long limit) +long long p6InputSkyfileDelete(psDB *dbh, const psMetadata *where, unsigned long long limit) { long long deleted = 0; - long long count = psDBDeleteRows(dbh, P6INPUTSCFILE_TABLE_NAME, where, limit); + long long count = psDBDeleteRows(dbh, P6INPUTSKYFILE_TABLE_NAME, where, limit); if (count < 0) { - psError(PS_ERR_UNKNOWN, true, "failed to delete row from p6InputScfile"); + psError(PS_ERR_UNKNOWN, true, "failed to delete row from p6InputSkyfile"); return count; @@ -16857,13 +16834,13 @@ return deleted; } -bool p6InputScfileInsertObject(psDB *dbh, p6InputScfileRow *object) -{ - return p6InputScfileInsert(dbh, object->p6_id, object->p4_id, object->skycell_id, object->tess_id); -} - -bool p6InputScfileInsertObjects(psDB *dbh, psArray *objects) +bool p6InputSkyfileInsertObject(psDB *dbh, p6InputSkyfileRow *object) +{ + return p6InputSkyfileInsert(dbh, object->p6_id, object->p4_id); +} + +bool p6InputSkyfileInsertObjects(psDB *dbh, psArray *objects) { for (long i = 0; i < psArrayLength(objects); i++) { - if (!p6InputScfileInsertObject(dbh, objects->data[i])) { + if (!p6InputSkyfileInsertObject(dbh, objects->data[i])) { return false; } @@ -16873,11 +16850,11 @@ } -bool p6InputScfileInsertFits(psDB *dbh, const psFits *fits) +bool p6InputSkyfileInsertFits(psDB *dbh, const psFits *fits) { psArray *rowSet; - // move to (the first?) extension named P6INPUTSCFILE_TABLE_NAME - if (!psFitsMoveExtName(fits, P6INPUTSCFILE_TABLE_NAME)) { - psError(PS_ERR_UNKNOWN, true, "failed to find FITS extension %s", P6INPUTSCFILE_TABLE_NAME); + // move to (the first?) extension named P6INPUTSKYFILE_TABLE_NAME + if (!psFitsMoveExtName(fits, P6INPUTSKYFILE_TABLE_NAME)) { + psError(PS_ERR_UNKNOWN, true, "failed to find FITS extension %s", P6INPUTSKYFILE_TABLE_NAME); return false; } @@ -16897,5 +16874,5 @@ } - if (!psDBInsertRows(dbh, P6INPUTSCFILE_TABLE_NAME, rowSet)) { + if (!psDBInsertRows(dbh, P6INPUTSKYFILE_TABLE_NAME, rowSet)) { psError(PS_ERR_UNKNOWN, false, "databse insert failed"); psFree(rowSet); @@ -16908,9 +16885,9 @@ } -bool p6InputScfileSelectRowsFits(psDB *dbh, psFits *fits, const psMetadata *where, unsigned long long limit) +bool p6InputSkyfileSelectRowsFits(psDB *dbh, psFits *fits, const psMetadata *where, unsigned long long limit) { psArray *rowSet; - rowSet = psDBSelectRows(dbh, P6INPUTSCFILE_TABLE_NAME, where, limit); + rowSet = psDBSelectRows(dbh, P6INPUTSKYFILE_TABLE_NAME, where, limit); if (!rowSet) { return false; @@ -16918,5 +16895,5 @@ // output to fits - if (!psFitsWriteTable(fits, NULL, rowSet, P6INPUTSCFILE_TABLE_NAME)) { + if (!psFitsWriteTable(fits, NULL, rowSet, P6INPUTSKYFILE_TABLE_NAME)) { psError(PS_ERR_UNKNOWN, false, "FITS table write failed"); psFree(rowSet); @@ -16929,5 +16906,5 @@ } -psMetadata *p6InputScfileMetadataFromObject(const p6InputScfileRow *object) +psMetadata *p6InputSkyfileMetadataFromObject(const p6InputSkyfileRow *object) { psMetadata *md = psMetadataAlloc(); @@ -16942,14 +16919,4 @@ return false; } - if (!psMetadataAdd(md, PS_LIST_TAIL, "skycell_id", PS_DATA_STRING, NULL, object->skycell_id)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item skycell_id"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "tess_id", PS_DATA_STRING, NULL, object->tess_id)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item tess_id"); - psFree(md); - return false; - } @@ -16957,5 +16924,5 @@ } -p6InputScfileRow *p6InputScfileObjectFromMetadata(psMetadata *md) +p6InputSkyfileRow *p6InputSkyfileObjectFromMetadata(psMetadata *md) { @@ -16971,18 +16938,8 @@ return false; } - char* skycell_id = psMetadataLookupPtr(&status, md, "skycell_id"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item skycell_id"); - return false; - } - char* tess_id = psMetadataLookupPtr(&status, md, "tess_id"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item tess_id"); - return false; - } - - return p6InputScfileRowAlloc(p6_id, p4_id, skycell_id, tess_id); -} -psArray *p6InputScfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) + + return p6InputSkyfileRowAlloc(p6_id, p4_id); +} +psArray *p6InputSkyfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) { psArray *rowSet; @@ -16990,5 +16947,5 @@ psU64 i; - rowSet = psDBSelectRows(dbh, P6INPUTSCFILE_TABLE_NAME, where, limit); + rowSet = psDBSelectRows(dbh, P6INPUTSKYFILE_TABLE_NAME, where, limit); if (!rowSet) { return NULL; @@ -17000,5 +16957,5 @@ for (i = 0; i < rowSet->n; i++) { - p6InputScfileRow *object = p6InputScfileObjectFromMetadata(rowSet->data[i]); + p6InputSkyfileRow *object = p6InputSkyfileObjectFromMetadata(rowSet->data[i]); psArrayAdd(returnSet, 0, object); psFree(object); @@ -17009,11 +16966,11 @@ return returnSet; } -bool p6InputScfileDeleteObject(psDB *dbh, const p6InputScfileRow *object) -{ - psMetadata *where = p6InputScfileMetadataFromObject(object); - long long count = psDBDeleteRows(dbh, P6INPUTSCFILE_TABLE_NAME, where, 0); +bool p6InputSkyfileDeleteObject(psDB *dbh, const p6InputSkyfileRow *object) +{ + psMetadata *where = p6InputSkyfileMetadataFromObject(object); + long long count = psDBDeleteRows(dbh, P6INPUTSKYFILE_TABLE_NAME, where, 0); psFree(where); if (count < 0) { - psError(PS_ERR_UNKNOWN, true, "failed to delete row from p6InputScfile"); + psError(PS_ERR_UNKNOWN, true, "failed to delete row from p6InputSkyfile"); return false; } @@ -17021,21 +16978,21 @@ // 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, "p6InputScfileRow object matched more then one row. Check your database schema"); - return false; - } - - return true; -} -long long p6InputScfileDeleteRowObjects(psDB *dbh, const psArray *objects, unsigned long long limit) + psError(PS_ERR_UNKNOWN, true, "p6InputSkyfileRow object matched more then one row. Check your database schema"); + return false; + } + + return true; +} +long long p6InputSkyfileDeleteRowObjects(psDB *dbh, const psArray *objects, unsigned long long limit) { long long deleted = 0; for (long long i = 0; i < objects->n; i++) { - p6InputScfileRow *object = objects->data[i]; - psMetadata *where = p6InputScfileMetadataFromObject(object); - long long count = psDBDeleteRows(dbh, P6INPUTSCFILE_TABLE_NAME, where, limit); + p6InputSkyfileRow *object = objects->data[i]; + psMetadata *where = p6InputSkyfileMetadataFromObject(object); + long long count = psDBDeleteRows(dbh, P6INPUTSKYFILE_TABLE_NAME, where, limit); psFree(where); if (count < 0) { - psError(PS_ERR_UNKNOWN, true, "failed to delete row from p6InputScfile"); + psError(PS_ERR_UNKNOWN, true, "failed to delete row from p6InputSkyfile"); return count; } @@ -17046,5 +17003,5 @@ return deleted; } -bool p6InputScfilePrintObjects(FILE *stream, psArray *objects, bool mdcf) +bool p6InputSkyfilePrintObjects(FILE *stream, psArray *objects, bool mdcf) { PS_ASSERT_PTR_NON_NULL(objects, false); @@ -17052,9 +17009,9 @@ psMetadata *output = psMetadataAlloc(); for (long i = 0; i < psArrayLength(objects); i++) { - psMetadata *md = p6InputScfileMetadataFromObject(objects->data[i]); + psMetadata *md = p6InputSkyfileMetadataFromObject(objects->data[i]); if (!psMetadataAddMetadata( output, PS_LIST_TAIL, - P6INPUTSCFILE_TABLE_NAME, + P6INPUTSKYFILE_TABLE_NAME, PS_META_DUPLICATE_OK, NULL, @@ -17077,9 +17034,9 @@ return true; } -bool p6InputScfilePrintObject(FILE *stream, p6InputScfileRow *object, bool mdcf) +bool p6InputSkyfilePrintObject(FILE *stream, p6InputSkyfileRow *object, bool mdcf) { PS_ASSERT_PTR_NON_NULL(object, false); - psMetadata *md = p6InputScfileMetadataFromObject(object); + psMetadata *md = p6InputSkyfileMetadataFromObject(object); if (!ippdbPrintMetadataRaw(stream, md, mdcf)) { @@ -17092,16 +17049,14 @@ return true; } -static void p6SumScfileRowFree(p6SumScfileRow *object); - -p6SumScfileRow *p6SumScfileRowAlloc(psS32 p6_id, const char *skycell_id, const char *tess_id, const char *uri, psF64 bg, psF64 bg_mean_stdev) -{ - p6SumScfileRow *_object; - - _object = psAlloc(sizeof(p6SumScfileRow)); - psMemSetDeallocator(_object, (psFreeFunc)p6SumScfileRowFree); +static void p6SumSkyfileRowFree(p6SumSkyfileRow *object); + +p6SumSkyfileRow *p6SumSkyfileRowAlloc(psS32 p6_id, const char *uri, psF64 bg, psF64 bg_mean_stdev) +{ + p6SumSkyfileRow *_object; + + _object = psAlloc(sizeof(p6SumSkyfileRow)); + psMemSetDeallocator(_object, (psFreeFunc)p6SumSkyfileRowFree); _object->p6_id = p6_id; - _object->skycell_id = psStringCopy(skycell_id); - _object->tess_id = psStringCopy(tess_id); _object->uri = psStringCopy(uri); _object->bg = bg; @@ -17111,12 +17066,10 @@ } -static void p6SumScfileRowFree(p6SumScfileRow *object) -{ - psFree(object->skycell_id); - psFree(object->tess_id); +static void p6SumSkyfileRowFree(p6SumSkyfileRow *object) +{ psFree(object->uri); } -bool p6SumScfileCreateTable(psDB *dbh) +bool p6SumSkyfileCreateTable(psDB *dbh) { psMetadata *md = psMetadataAlloc(); @@ -17126,14 +17079,4 @@ return false; } - if (!psMetadataAdd(md, PS_LIST_TAIL, "skycell_id", PS_DATA_STRING, "Primary Key", "64")) { - psError(PS_ERR_UNKNOWN, false, "failed to add item skycell_id"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "tess_id", PS_DATA_STRING, "Primary Key", "64")) { - psError(PS_ERR_UNKNOWN, false, "failed to add item tess_id"); - psFree(md); - return false; - } if (!psMetadataAdd(md, PS_LIST_TAIL, "uri", PS_DATA_STRING, NULL, "255")) { psError(PS_ERR_UNKNOWN, false, "failed to add item uri"); @@ -17152,5 +17095,5 @@ } - bool status = psDBCreateTable(dbh, P6SUMSCFILE_TABLE_NAME, md); + bool status = psDBCreateTable(dbh, P6SUMSKYFILE_TABLE_NAME, md); psFree(md); @@ -17159,10 +17102,10 @@ } -bool p6SumScfileDropTable(psDB *dbh) -{ - return psDBDropTable(dbh, P6SUMSCFILE_TABLE_NAME); -} - -bool p6SumScfileInsert(psDB * dbh, psS32 p6_id, const char *skycell_id, const char *tess_id, const char *uri, psF64 bg, psF64 bg_mean_stdev) +bool p6SumSkyfileDropTable(psDB *dbh) +{ + return psDBDropTable(dbh, P6SUMSKYFILE_TABLE_NAME); +} + +bool p6SumSkyfileInsert(psDB * dbh, psS32 p6_id, const char *uri, psF64 bg, psF64 bg_mean_stdev) { psMetadata *md = psMetadataAlloc(); @@ -17172,14 +17115,4 @@ return false; } - if (!psMetadataAdd(md, PS_LIST_TAIL, "skycell_id", PS_DATA_STRING, NULL, skycell_id)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item skycell_id"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "tess_id", PS_DATA_STRING, NULL, tess_id)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item tess_id"); - psFree(md); - return false; - } if (!psMetadataAdd(md, PS_LIST_TAIL, "uri", PS_DATA_STRING, NULL, uri)) { psError(PS_ERR_UNKNOWN, false, "failed to add item uri"); @@ -17198,5 +17131,5 @@ } - bool status = psDBInsertOneRow(dbh, P6SUMSCFILE_TABLE_NAME, md); + bool status = psDBInsertOneRow(dbh, P6SUMSKYFILE_TABLE_NAME, md); psFree(md); @@ -17204,11 +17137,11 @@ } -long long p6SumScfileDelete(psDB *dbh, const psMetadata *where, unsigned long long limit) +long long p6SumSkyfileDelete(psDB *dbh, const psMetadata *where, unsigned long long limit) { long long deleted = 0; - long long count = psDBDeleteRows(dbh, P6SUMSCFILE_TABLE_NAME, where, limit); + long long count = psDBDeleteRows(dbh, P6SUMSKYFILE_TABLE_NAME, where, limit); if (count < 0) { - psError(PS_ERR_UNKNOWN, true, "failed to delete row from p6SumScfile"); + psError(PS_ERR_UNKNOWN, true, "failed to delete row from p6SumSkyfile"); return count; @@ -17218,13 +17151,13 @@ return deleted; } -bool p6SumScfileInsertObject(psDB *dbh, p6SumScfileRow *object) -{ - return p6SumScfileInsert(dbh, object->p6_id, object->skycell_id, object->tess_id, object->uri, object->bg, object->bg_mean_stdev); -} - -bool p6SumScfileInsertObjects(psDB *dbh, psArray *objects) +bool p6SumSkyfileInsertObject(psDB *dbh, p6SumSkyfileRow *object) +{ + return p6SumSkyfileInsert(dbh, object->p6_id, object->uri, object->bg, object->bg_mean_stdev); +} + +bool p6SumSkyfileInsertObjects(psDB *dbh, psArray *objects) { for (long i = 0; i < psArrayLength(objects); i++) { - if (!p6SumScfileInsertObject(dbh, objects->data[i])) { + if (!p6SumSkyfileInsertObject(dbh, objects->data[i])) { return false; } @@ -17234,11 +17167,11 @@ } -bool p6SumScfileInsertFits(psDB *dbh, const psFits *fits) +bool p6SumSkyfileInsertFits(psDB *dbh, const psFits *fits) { psArray *rowSet; - // move to (the first?) extension named P6SUMSCFILE_TABLE_NAME - if (!psFitsMoveExtName(fits, P6SUMSCFILE_TABLE_NAME)) { - psError(PS_ERR_UNKNOWN, true, "failed to find FITS extension %s", P6SUMSCFILE_TABLE_NAME); + // move to (the first?) extension named P6SUMSKYFILE_TABLE_NAME + if (!psFitsMoveExtName(fits, P6SUMSKYFILE_TABLE_NAME)) { + psError(PS_ERR_UNKNOWN, true, "failed to find FITS extension %s", P6SUMSKYFILE_TABLE_NAME); return false; } @@ -17258,5 +17191,5 @@ } - if (!psDBInsertRows(dbh, P6SUMSCFILE_TABLE_NAME, rowSet)) { + if (!psDBInsertRows(dbh, P6SUMSKYFILE_TABLE_NAME, rowSet)) { psError(PS_ERR_UNKNOWN, false, "databse insert failed"); psFree(rowSet); @@ -17269,9 +17202,9 @@ } -bool p6SumScfileSelectRowsFits(psDB *dbh, psFits *fits, const psMetadata *where, unsigned long long limit) +bool p6SumSkyfileSelectRowsFits(psDB *dbh, psFits *fits, const psMetadata *where, unsigned long long limit) { psArray *rowSet; - rowSet = psDBSelectRows(dbh, P6SUMSCFILE_TABLE_NAME, where, limit); + rowSet = psDBSelectRows(dbh, P6SUMSKYFILE_TABLE_NAME, where, limit); if (!rowSet) { return false; @@ -17279,5 +17212,5 @@ // output to fits - if (!psFitsWriteTable(fits, NULL, rowSet, P6SUMSCFILE_TABLE_NAME)) { + if (!psFitsWriteTable(fits, NULL, rowSet, P6SUMSKYFILE_TABLE_NAME)) { psError(PS_ERR_UNKNOWN, false, "FITS table write failed"); psFree(rowSet); @@ -17290,5 +17223,5 @@ } -psMetadata *p6SumScfileMetadataFromObject(const p6SumScfileRow *object) +psMetadata *p6SumSkyfileMetadataFromObject(const p6SumSkyfileRow *object) { psMetadata *md = psMetadataAlloc(); @@ -17298,14 +17231,4 @@ return false; } - if (!psMetadataAdd(md, PS_LIST_TAIL, "skycell_id", PS_DATA_STRING, NULL, object->skycell_id)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item skycell_id"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "tess_id", PS_DATA_STRING, NULL, object->tess_id)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item tess_id"); - psFree(md); - return false; - } if (!psMetadataAdd(md, PS_LIST_TAIL, "uri", PS_DATA_STRING, NULL, object->uri)) { psError(PS_ERR_UNKNOWN, false, "failed to add item uri"); @@ -17328,5 +17251,5 @@ } -p6SumScfileRow *p6SumScfileObjectFromMetadata(psMetadata *md) +p6SumSkyfileRow *p6SumSkyfileObjectFromMetadata(psMetadata *md) { @@ -17337,14 +17260,4 @@ return false; } - char* skycell_id = psMetadataLookupPtr(&status, md, "skycell_id"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item skycell_id"); - return false; - } - char* tess_id = psMetadataLookupPtr(&status, md, "tess_id"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item tess_id"); - return false; - } char* uri = psMetadataLookupPtr(&status, md, "uri"); if (!status) { @@ -17363,7 +17276,7 @@ } - return p6SumScfileRowAlloc(p6_id, skycell_id, tess_id, uri, bg, bg_mean_stdev); -} -psArray *p6SumScfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) + return p6SumSkyfileRowAlloc(p6_id, uri, bg, bg_mean_stdev); +} +psArray *p6SumSkyfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) { psArray *rowSet; @@ -17371,5 +17284,5 @@ psU64 i; - rowSet = psDBSelectRows(dbh, P6SUMSCFILE_TABLE_NAME, where, limit); + rowSet = psDBSelectRows(dbh, P6SUMSKYFILE_TABLE_NAME, where, limit); if (!rowSet) { return NULL; @@ -17381,5 +17294,5 @@ for (i = 0; i < rowSet->n; i++) { - p6SumScfileRow *object = p6SumScfileObjectFromMetadata(rowSet->data[i]); + p6SumSkyfileRow *object = p6SumSkyfileObjectFromMetadata(rowSet->data[i]); psArrayAdd(returnSet, 0, object); psFree(object); @@ -17390,11 +17303,11 @@ return returnSet; } -bool p6SumScfileDeleteObject(psDB *dbh, const p6SumScfileRow *object) -{ - psMetadata *where = p6SumScfileMetadataFromObject(object); - long long count = psDBDeleteRows(dbh, P6SUMSCFILE_TABLE_NAME, where, 0); +bool p6SumSkyfileDeleteObject(psDB *dbh, const p6SumSkyfileRow *object) +{ + psMetadata *where = p6SumSkyfileMetadataFromObject(object); + long long count = psDBDeleteRows(dbh, P6SUMSKYFILE_TABLE_NAME, where, 0); psFree(where); if (count < 0) { - psError(PS_ERR_UNKNOWN, true, "failed to delete row from p6SumScfile"); + psError(PS_ERR_UNKNOWN, true, "failed to delete row from p6SumSkyfile"); return false; } @@ -17402,21 +17315,21 @@ // 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, "p6SumScfileRow object matched more then one row. Check your database schema"); - return false; - } - - return true; -} -long long p6SumScfileDeleteRowObjects(psDB *dbh, const psArray *objects, unsigned long long limit) + psError(PS_ERR_UNKNOWN, true, "p6SumSkyfileRow object matched more then one row. Check your database schema"); + return false; + } + + return true; +} +long long p6SumSkyfileDeleteRowObjects(psDB *dbh, const psArray *objects, unsigned long long limit) { long long deleted = 0; for (long long i = 0; i < objects->n; i++) { - p6SumScfileRow *object = objects->data[i]; - psMetadata *where = p6SumScfileMetadataFromObject(object); - long long count = psDBDeleteRows(dbh, P6SUMSCFILE_TABLE_NAME, where, limit); + p6SumSkyfileRow *object = objects->data[i]; + psMetadata *where = p6SumSkyfileMetadataFromObject(object); + long long count = psDBDeleteRows(dbh, P6SUMSKYFILE_TABLE_NAME, where, limit); psFree(where); if (count < 0) { - psError(PS_ERR_UNKNOWN, true, "failed to delete row from p6SumScfile"); + psError(PS_ERR_UNKNOWN, true, "failed to delete row from p6SumSkyfile"); return count; } @@ -17427,5 +17340,5 @@ return deleted; } -bool p6SumScfilePrintObjects(FILE *stream, psArray *objects, bool mdcf) +bool p6SumSkyfilePrintObjects(FILE *stream, psArray *objects, bool mdcf) { PS_ASSERT_PTR_NON_NULL(objects, false); @@ -17433,9 +17346,9 @@ psMetadata *output = psMetadataAlloc(); for (long i = 0; i < psArrayLength(objects); i++) { - psMetadata *md = p6SumScfileMetadataFromObject(objects->data[i]); + psMetadata *md = p6SumSkyfileMetadataFromObject(objects->data[i]); if (!psMetadataAddMetadata( output, PS_LIST_TAIL, - P6SUMSCFILE_TABLE_NAME, + P6SUMSKYFILE_TABLE_NAME, PS_META_DUPLICATE_OK, NULL, @@ -17458,9 +17371,9 @@ return true; } -bool p6SumScfilePrintObject(FILE *stream, p6SumScfileRow *object, bool mdcf) +bool p6SumSkyfilePrintObject(FILE *stream, p6SumSkyfileRow *object, bool mdcf) { PS_ASSERT_PTR_NON_NULL(object, false); - psMetadata *md = p6SumScfileMetadataFromObject(object); + psMetadata *md = p6SumSkyfileMetadataFromObject(object); if (!ippdbPrintMetadataRaw(stream, md, mdcf)) { Index: /trunk/ippdb/src/ippdb.h =================================================================== --- /trunk/ippdb/src/ippdb.h (revision 11987) +++ /trunk/ippdb/src/ippdb.h (revision 11988) @@ -7493,7 +7493,7 @@ bool mdcf ///< format as mdconfig or simple ); -/** p4ScfileRow data structure - * - * Structure for representing a single row of p4Scfile table data. +/** p4SkyfileRow data structure + * + * Structure for representing a single row of p4Skyfile table data. */ @@ -7502,22 +7502,18 @@ char *skycell_id; char *tess_id; - char *exp_tag; - psS32 p3_version; char *uri; psF64 bg; psF64 bg_mean_stdev; -} p4ScfileRow; - -/** Creates a new p4ScfileRow object - * - * @return A new p4ScfileRow object or NULL on failure. - */ - -p4ScfileRow *p4ScfileRowAlloc( +} p4SkyfileRow; + +/** Creates a new p4SkyfileRow object + * + * @return A new p4SkyfileRow object or NULL on failure. + */ + +p4SkyfileRow *p4SkyfileRowAlloc( psS32 p4_id, const char *skycell_id, const char *tess_id, - const char *exp_tag, - psS32 p3_version, const char *uri, psF64 bg, @@ -7525,19 +7521,19 @@ ); -/** Creates a new p4Scfile table - * - * @return true on success - */ - -bool p4ScfileCreateTable( +/** Creates a new p4Skyfile table + * + * @return true on success + */ + +bool p4SkyfileCreateTable( psDB *dbh ///< Database handle ); -/** Deletes a p4Scfile table - * - * @return true on success - */ - -bool p4ScfileDropTable( +/** Deletes a p4Skyfile table + * + * @return true on success + */ + +bool p4SkyfileDropTable( psDB *dbh ///< Database handle ); @@ -7550,11 +7546,9 @@ */ -bool p4ScfileInsert( +bool p4SkyfileInsert( psDB *dbh, ///< Database handle psS32 p4_id, const char *skycell_id, const char *tess_id, - const char *exp_tag, - psS32 p3_version, const char *uri, psF64 bg, @@ -7567,5 +7561,5 @@ */ -long long p4ScfileDelete( +long long p4SkyfileDelete( psDB *dbh, ///< Database handle const psMetadata *where, ///< Row match criteria @@ -7573,5 +7567,5 @@ ); -/** Insert a single p4ScfileRow object into a table +/** Insert a single p4SkyfileRow object into a table * * This function constructs and inserts a single row based on it's parameters. @@ -7580,10 +7574,10 @@ */ -bool p4ScfileInsertObject( - psDB *dbh, ///< Database handle - p4ScfileRow *object ///< p4ScfileRow object -); - -/** Insert an array of p4ScfileRow object into a table +bool p4SkyfileInsertObject( + psDB *dbh, ///< Database handle + p4SkyfileRow *object ///< p4SkyfileRow object +); + +/** Insert an array of p4SkyfileRow object into a table * * This function constructs and inserts multiple rows based on it's parameters. @@ -7592,10 +7586,10 @@ */ -bool p4ScfileInsertObjects( - psDB *dbh, ///< Database handle - psArray *objects ///< array of p4ScfileRow objects -); - -/** Insert data from a binary FITS table p4ScfileRow into the database +bool p4SkyfileInsertObjects( + psDB *dbh, ///< Database handle + psArray *objects ///< array of p4SkyfileRow objects +); + +/** Insert data from a binary FITS table p4SkyfileRow into the database * * This function expects a psFits object with a FITS table as the first @@ -7607,5 +7601,5 @@ */ -bool p4ScfileInsertFits( +bool p4SkyfileInsertFits( psDB *dbh, ///< Database handle const psFits *fits ///< psFits object @@ -7622,5 +7616,5 @@ */ -bool p4ScfileSelectRowsFits( +bool p4SkyfileSelectRowsFits( psDB *dbh, ///< Database handle psFits *fits, ///< psFits object @@ -7629,22 +7623,22 @@ ); -/** Convert a p4ScfileRow into an equivalent psMetadata +/** Convert a p4SkyfileRow into an equivalent psMetadata * * @return A psMetadata pointer or NULL on error */ -psMetadata *p4ScfileMetadataFromObject( - const p4ScfileRow *object ///< fooRow to convert into a psMetadata +psMetadata *p4SkyfileMetadataFromObject( + const p4SkyfileRow *object ///< fooRow to convert into a psMetadata ); /** Convert a psMetadata into an equivalent fooRow * - * @return A p4ScfileRow pointer or NULL on error - */ - -p4ScfileRow *p4ScfileObjectFromMetadata( + * @return A p4SkyfileRow pointer or NULL on error + */ + +p4SkyfileRow *p4SkyfileObjectFromMetadata( psMetadata *md ///< psMetadata to convert into a fooRow ); -/** Selects up to limit rows from the database and returns as p4ScfileRow objects in a psArray +/** Selects up to limit rows from the database and returns as p4SkyfileRow objects in a psArray * * See psDBSelectRows() for documentation on the format of where. @@ -7653,10 +7647,10 @@ */ -psArray *p4ScfileSelectRowObjects( +psArray *p4SkyfileSelectRowObjects( 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 p4Scfile +/** Deletes a row from the database coresponding to an p4Skyfile * * Note that a 'where' search psMetadata is constructed from each object and @@ -7666,7 +7660,7 @@ */ -bool p4ScfileDeleteObject( - psDB *dbh, ///< Database handle - const p4ScfileRow *object ///< Object to delete +bool p4SkyfileDeleteObject( + psDB *dbh, ///< Database handle + const p4SkyfileRow *object ///< Object to delete ); /** Deletes up to limit rows from the database and returns the number of rows actually deleted. @@ -7678,10 +7672,10 @@ */ -long long p4ScfileDeleteRowObjects( +long long p4SkyfileDeleteRowObjects( 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 p4ScfileRow objects +/** Formats and prints an array of p4SkyfileRow objects * * When mdcf is set the formated output is in psMetadataConfig @@ -7691,10 +7685,10 @@ */ -bool p4ScfilePrintObjects( +bool p4SkyfilePrintObjects( FILE *stream, ///< a stream - psArray *objects, ///< An array of p4ScfileRow objects + psArray *objects, ///< An array of p4SkyfileRow objects bool mdcf ///< format as mdconfig or simple ); -/** Formats and prints an p4ScfileRow object +/** Formats and prints an p4SkyfileRow object * * When mdcf is set the formated output is in psMetadataConfig @@ -7704,7 +7698,7 @@ */ -bool p4ScfilePrintObject( +bool p4SkyfilePrintObject( FILE *stream, ///< a stream - p4ScfileRow *object, ///< an p4ScfileRow object + p4SkyfileRow *object, ///< an p4SkyfileRow object bool mdcf ///< format as mdconfig or simple ); @@ -7720,4 +7714,6 @@ char *dvodb; psTime* registered; + char *skycell_id; + char *tess_id; } p5RunRow; @@ -7732,5 +7728,7 @@ const char *workdir, const char *dvodb, - psTime* registered + psTime* registered, + const char *skycell_id, + const char *tess_id ); @@ -7766,5 +7764,7 @@ const char *workdir, const char *dvodb, - psTime* registered + psTime* registered, + const char *skycell_id, + const char *tess_id ); @@ -7916,7 +7916,7 @@ bool mdcf ///< format as mdconfig or simple ); -/** p5InputScfileRow data structure - * - * Structure for representing a single row of p5InputScfile table data. +/** p5InputSkyfileRow data structure + * + * Structure for representing a single row of p5InputSkyfile table data. */ @@ -7928,12 +7928,12 @@ char *kind; bool template; -} p5InputScfileRow; - -/** Creates a new p5InputScfileRow object - * - * @return A new p5InputScfileRow object or NULL on failure. - */ - -p5InputScfileRow *p5InputScfileRowAlloc( +} p5InputSkyfileRow; + +/** Creates a new p5InputSkyfileRow object + * + * @return A new p5InputSkyfileRow object or NULL on failure. + */ + +p5InputSkyfileRow *p5InputSkyfileRowAlloc( psS32 p5_id, psS32 p4_id, @@ -7944,19 +7944,19 @@ ); -/** Creates a new p5InputScfile table - * - * @return true on success - */ - -bool p5InputScfileCreateTable( +/** Creates a new p5InputSkyfile table + * + * @return true on success + */ + +bool p5InputSkyfileCreateTable( psDB *dbh ///< Database handle ); -/** Deletes a p5InputScfile table - * - * @return true on success - */ - -bool p5InputScfileDropTable( +/** Deletes a p5InputSkyfile table + * + * @return true on success + */ + +bool p5InputSkyfileDropTable( psDB *dbh ///< Database handle ); @@ -7969,5 +7969,5 @@ */ -bool p5InputScfileInsert( +bool p5InputSkyfileInsert( psDB *dbh, ///< Database handle psS32 p5_id, @@ -7984,5 +7984,5 @@ */ -long long p5InputScfileDelete( +long long p5InputSkyfileDelete( psDB *dbh, ///< Database handle const psMetadata *where, ///< Row match criteria @@ -7990,5 +7990,5 @@ ); -/** Insert a single p5InputScfileRow object into a table +/** Insert a single p5InputSkyfileRow object into a table * * This function constructs and inserts a single row based on it's parameters. @@ -7997,10 +7997,10 @@ */ -bool p5InputScfileInsertObject( - psDB *dbh, ///< Database handle - p5InputScfileRow *object ///< p5InputScfileRow object -); - -/** Insert an array of p5InputScfileRow object into a table +bool p5InputSkyfileInsertObject( + psDB *dbh, ///< Database handle + p5InputSkyfileRow *object ///< p5InputSkyfileRow object +); + +/** Insert an array of p5InputSkyfileRow object into a table * * This function constructs and inserts multiple rows based on it's parameters. @@ -8009,10 +8009,10 @@ */ -bool p5InputScfileInsertObjects( - psDB *dbh, ///< Database handle - psArray *objects ///< array of p5InputScfileRow objects -); - -/** Insert data from a binary FITS table p5InputScfileRow into the database +bool p5InputSkyfileInsertObjects( + psDB *dbh, ///< Database handle + psArray *objects ///< array of p5InputSkyfileRow objects +); + +/** Insert data from a binary FITS table p5InputSkyfileRow into the database * * This function expects a psFits object with a FITS table as the first @@ -8024,5 +8024,5 @@ */ -bool p5InputScfileInsertFits( +bool p5InputSkyfileInsertFits( psDB *dbh, ///< Database handle const psFits *fits ///< psFits object @@ -8039,5 +8039,5 @@ */ -bool p5InputScfileSelectRowsFits( +bool p5InputSkyfileSelectRowsFits( psDB *dbh, ///< Database handle psFits *fits, ///< psFits object @@ -8046,22 +8046,22 @@ ); -/** Convert a p5InputScfileRow into an equivalent psMetadata +/** Convert a p5InputSkyfileRow into an equivalent psMetadata * * @return A psMetadata pointer or NULL on error */ -psMetadata *p5InputScfileMetadataFromObject( - const p5InputScfileRow *object ///< fooRow to convert into a psMetadata +psMetadata *p5InputSkyfileMetadataFromObject( + const p5InputSkyfileRow *object ///< fooRow to convert into a psMetadata ); /** Convert a psMetadata into an equivalent fooRow * - * @return A p5InputScfileRow pointer or NULL on error - */ - -p5InputScfileRow *p5InputScfileObjectFromMetadata( + * @return A p5InputSkyfileRow pointer or NULL on error + */ + +p5InputSkyfileRow *p5InputSkyfileObjectFromMetadata( psMetadata *md ///< psMetadata to convert into a fooRow ); -/** Selects up to limit rows from the database and returns as p5InputScfileRow objects in a psArray +/** Selects up to limit rows from the database and returns as p5InputSkyfileRow objects in a psArray * * See psDBSelectRows() for documentation on the format of where. @@ -8070,10 +8070,10 @@ */ -psArray *p5InputScfileSelectRowObjects( +psArray *p5InputSkyfileSelectRowObjects( 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 p5InputScfile +/** Deletes a row from the database coresponding to an p5InputSkyfile * * Note that a 'where' search psMetadata is constructed from each object and @@ -8083,7 +8083,7 @@ */ -bool p5InputScfileDeleteObject( - psDB *dbh, ///< Database handle - const p5InputScfileRow *object ///< Object to delete +bool p5InputSkyfileDeleteObject( + psDB *dbh, ///< Database handle + const p5InputSkyfileRow *object ///< Object to delete ); /** Deletes up to limit rows from the database and returns the number of rows actually deleted. @@ -8095,10 +8095,10 @@ */ -long long p5InputScfileDeleteRowObjects( +long long p5InputSkyfileDeleteRowObjects( 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 p5InputScfileRow objects +/** Formats and prints an array of p5InputSkyfileRow objects * * When mdcf is set the formated output is in psMetadataConfig @@ -8108,10 +8108,10 @@ */ -bool p5InputScfilePrintObjects( +bool p5InputSkyfilePrintObjects( FILE *stream, ///< a stream - psArray *objects, ///< An array of p5InputScfileRow objects + psArray *objects, ///< An array of p5InputSkyfileRow objects bool mdcf ///< format as mdconfig or simple ); -/** Formats and prints an p5InputScfileRow object +/** Formats and prints an p5InputSkyfileRow object * * When mdcf is set the formated output is in psMetadataConfig @@ -8121,32 +8121,28 @@ */ -bool p5InputScfilePrintObject( +bool p5InputSkyfilePrintObject( FILE *stream, ///< a stream - p5InputScfileRow *object, ///< an p5InputScfileRow object + p5InputSkyfileRow *object, ///< an p5InputSkyfileRow object bool mdcf ///< format as mdconfig or simple ); -/** p5DiffScfileRow data structure - * - * Structure for representing a single row of p5DiffScfile table data. +/** p5DiffSkyfileRow data structure + * + * Structure for representing a single row of p5DiffSkyfile table data. */ typedef struct { psS32 p5_id; - char *skycell_id; - char *tess_id; char *uri; psF64 bg; psF64 bg_mean_stdev; -} p5DiffScfileRow; - -/** Creates a new p5DiffScfileRow object - * - * @return A new p5DiffScfileRow object or NULL on failure. - */ - -p5DiffScfileRow *p5DiffScfileRowAlloc( +} p5DiffSkyfileRow; + +/** Creates a new p5DiffSkyfileRow object + * + * @return A new p5DiffSkyfileRow object or NULL on failure. + */ + +p5DiffSkyfileRow *p5DiffSkyfileRowAlloc( psS32 p5_id, - const char *skycell_id, - const char *tess_id, const char *uri, psF64 bg, @@ -8154,19 +8150,19 @@ ); -/** Creates a new p5DiffScfile table - * - * @return true on success - */ - -bool p5DiffScfileCreateTable( +/** Creates a new p5DiffSkyfile table + * + * @return true on success + */ + +bool p5DiffSkyfileCreateTable( psDB *dbh ///< Database handle ); -/** Deletes a p5DiffScfile table - * - * @return true on success - */ - -bool p5DiffScfileDropTable( +/** Deletes a p5DiffSkyfile table + * + * @return true on success + */ + +bool p5DiffSkyfileDropTable( psDB *dbh ///< Database handle ); @@ -8179,9 +8175,7 @@ */ -bool p5DiffScfileInsert( +bool p5DiffSkyfileInsert( psDB *dbh, ///< Database handle psS32 p5_id, - const char *skycell_id, - const char *tess_id, const char *uri, psF64 bg, @@ -8194,5 +8188,5 @@ */ -long long p5DiffScfileDelete( +long long p5DiffSkyfileDelete( psDB *dbh, ///< Database handle const psMetadata *where, ///< Row match criteria @@ -8200,5 +8194,5 @@ ); -/** Insert a single p5DiffScfileRow object into a table +/** Insert a single p5DiffSkyfileRow object into a table * * This function constructs and inserts a single row based on it's parameters. @@ -8207,10 +8201,10 @@ */ -bool p5DiffScfileInsertObject( - psDB *dbh, ///< Database handle - p5DiffScfileRow *object ///< p5DiffScfileRow object -); - -/** Insert an array of p5DiffScfileRow object into a table +bool p5DiffSkyfileInsertObject( + psDB *dbh, ///< Database handle + p5DiffSkyfileRow *object ///< p5DiffSkyfileRow object +); + +/** Insert an array of p5DiffSkyfileRow object into a table * * This function constructs and inserts multiple rows based on it's parameters. @@ -8219,10 +8213,10 @@ */ -bool p5DiffScfileInsertObjects( - psDB *dbh, ///< Database handle - psArray *objects ///< array of p5DiffScfileRow objects -); - -/** Insert data from a binary FITS table p5DiffScfileRow into the database +bool p5DiffSkyfileInsertObjects( + psDB *dbh, ///< Database handle + psArray *objects ///< array of p5DiffSkyfileRow objects +); + +/** Insert data from a binary FITS table p5DiffSkyfileRow into the database * * This function expects a psFits object with a FITS table as the first @@ -8234,5 +8228,5 @@ */ -bool p5DiffScfileInsertFits( +bool p5DiffSkyfileInsertFits( psDB *dbh, ///< Database handle const psFits *fits ///< psFits object @@ -8249,5 +8243,5 @@ */ -bool p5DiffScfileSelectRowsFits( +bool p5DiffSkyfileSelectRowsFits( psDB *dbh, ///< Database handle psFits *fits, ///< psFits object @@ -8256,22 +8250,22 @@ ); -/** Convert a p5DiffScfileRow into an equivalent psMetadata +/** Convert a p5DiffSkyfileRow into an equivalent psMetadata * * @return A psMetadata pointer or NULL on error */ -psMetadata *p5DiffScfileMetadataFromObject( - const p5DiffScfileRow *object ///< fooRow to convert into a psMetadata +psMetadata *p5DiffSkyfileMetadataFromObject( + const p5DiffSkyfileRow *object ///< fooRow to convert into a psMetadata ); /** Convert a psMetadata into an equivalent fooRow * - * @return A p5DiffScfileRow pointer or NULL on error - */ - -p5DiffScfileRow *p5DiffScfileObjectFromMetadata( + * @return A p5DiffSkyfileRow pointer or NULL on error + */ + +p5DiffSkyfileRow *p5DiffSkyfileObjectFromMetadata( psMetadata *md ///< psMetadata to convert into a fooRow ); -/** Selects up to limit rows from the database and returns as p5DiffScfileRow objects in a psArray +/** Selects up to limit rows from the database and returns as p5DiffSkyfileRow objects in a psArray * * See psDBSelectRows() for documentation on the format of where. @@ -8280,10 +8274,10 @@ */ -psArray *p5DiffScfileSelectRowObjects( +psArray *p5DiffSkyfileSelectRowObjects( 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 p5DiffScfile +/** Deletes a row from the database coresponding to an p5DiffSkyfile * * Note that a 'where' search psMetadata is constructed from each object and @@ -8293,7 +8287,7 @@ */ -bool p5DiffScfileDeleteObject( - psDB *dbh, ///< Database handle - const p5DiffScfileRow *object ///< Object to delete +bool p5DiffSkyfileDeleteObject( + psDB *dbh, ///< Database handle + const p5DiffSkyfileRow *object ///< Object to delete ); /** Deletes up to limit rows from the database and returns the number of rows actually deleted. @@ -8305,10 +8299,10 @@ */ -long long p5DiffScfileDeleteRowObjects( +long long p5DiffSkyfileDeleteRowObjects( 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 p5DiffScfileRow objects +/** Formats and prints an array of p5DiffSkyfileRow objects * * When mdcf is set the formated output is in psMetadataConfig @@ -8318,10 +8312,10 @@ */ -bool p5DiffScfilePrintObjects( +bool p5DiffSkyfilePrintObjects( FILE *stream, ///< a stream - psArray *objects, ///< An array of p5DiffScfileRow objects + psArray *objects, ///< An array of p5DiffSkyfileRow objects bool mdcf ///< format as mdconfig or simple ); -/** Formats and prints an p5DiffScfileRow object +/** Formats and prints an p5DiffSkyfileRow object * * When mdcf is set the formated output is in psMetadataConfig @@ -8331,7 +8325,7 @@ */ -bool p5DiffScfilePrintObject( +bool p5DiffSkyfilePrintObject( FILE *stream, ///< a stream - p5DiffScfileRow *object, ///< an p5DiffScfileRow object + p5DiffSkyfileRow *object, ///< an p5DiffSkyfileRow object bool mdcf ///< format as mdconfig or simple ); @@ -8347,4 +8341,6 @@ char *dvodb; psTime* registered; + char *skycell_id; + char *tess_id; } p6RunRow; @@ -8359,5 +8355,7 @@ const char *workdir, const char *dvodb, - psTime* registered + psTime* registered, + const char *skycell_id, + const char *tess_id ); @@ -8393,5 +8391,7 @@ const char *workdir, const char *dvodb, - psTime* registered + psTime* registered, + const char *skycell_id, + const char *tess_id ); @@ -8543,7 +8543,7 @@ bool mdcf ///< format as mdconfig or simple ); -/** p6InputScfileRow data structure - * - * Structure for representing a single row of p6InputScfile table data. +/** p6InputSkyfileRow data structure + * + * Structure for representing a single row of p6InputSkyfile table data. */ @@ -8551,35 +8551,31 @@ psS32 p6_id; psS32 p4_id; - char *skycell_id; - char *tess_id; -} p6InputScfileRow; - -/** Creates a new p6InputScfileRow object - * - * @return A new p6InputScfileRow object or NULL on failure. - */ - -p6InputScfileRow *p6InputScfileRowAlloc( +} p6InputSkyfileRow; + +/** Creates a new p6InputSkyfileRow object + * + * @return A new p6InputSkyfileRow object or NULL on failure. + */ + +p6InputSkyfileRow *p6InputSkyfileRowAlloc( psS32 p6_id, - psS32 p4_id, - const char *skycell_id, - const char *tess_id -); - -/** Creates a new p6InputScfile table - * - * @return true on success - */ - -bool p6InputScfileCreateTable( + psS32 p4_id +); + +/** Creates a new p6InputSkyfile table + * + * @return true on success + */ + +bool p6InputSkyfileCreateTable( psDB *dbh ///< Database handle ); -/** Deletes a p6InputScfile table - * - * @return true on success - */ - -bool p6InputScfileDropTable( +/** Deletes a p6InputSkyfile table + * + * @return true on success + */ + +bool p6InputSkyfileDropTable( psDB *dbh ///< Database handle ); @@ -8592,10 +8588,8 @@ */ -bool p6InputScfileInsert( +bool p6InputSkyfileInsert( psDB *dbh, ///< Database handle psS32 p6_id, - psS32 p4_id, - const char *skycell_id, - const char *tess_id + psS32 p4_id ); @@ -8605,5 +8599,5 @@ */ -long long p6InputScfileDelete( +long long p6InputSkyfileDelete( psDB *dbh, ///< Database handle const psMetadata *where, ///< Row match criteria @@ -8611,5 +8605,5 @@ ); -/** Insert a single p6InputScfileRow object into a table +/** Insert a single p6InputSkyfileRow object into a table * * This function constructs and inserts a single row based on it's parameters. @@ -8618,10 +8612,10 @@ */ -bool p6InputScfileInsertObject( - psDB *dbh, ///< Database handle - p6InputScfileRow *object ///< p6InputScfileRow object -); - -/** Insert an array of p6InputScfileRow object into a table +bool p6InputSkyfileInsertObject( + psDB *dbh, ///< Database handle + p6InputSkyfileRow *object ///< p6InputSkyfileRow object +); + +/** Insert an array of p6InputSkyfileRow object into a table * * This function constructs and inserts multiple rows based on it's parameters. @@ -8630,10 +8624,10 @@ */ -bool p6InputScfileInsertObjects( - psDB *dbh, ///< Database handle - psArray *objects ///< array of p6InputScfileRow objects -); - -/** Insert data from a binary FITS table p6InputScfileRow into the database +bool p6InputSkyfileInsertObjects( + psDB *dbh, ///< Database handle + psArray *objects ///< array of p6InputSkyfileRow objects +); + +/** Insert data from a binary FITS table p6InputSkyfileRow into the database * * This function expects a psFits object with a FITS table as the first @@ -8645,5 +8639,5 @@ */ -bool p6InputScfileInsertFits( +bool p6InputSkyfileInsertFits( psDB *dbh, ///< Database handle const psFits *fits ///< psFits object @@ -8660,5 +8654,5 @@ */ -bool p6InputScfileSelectRowsFits( +bool p6InputSkyfileSelectRowsFits( psDB *dbh, ///< Database handle psFits *fits, ///< psFits object @@ -8667,22 +8661,22 @@ ); -/** Convert a p6InputScfileRow into an equivalent psMetadata +/** Convert a p6InputSkyfileRow into an equivalent psMetadata * * @return A psMetadata pointer or NULL on error */ -psMetadata *p6InputScfileMetadataFromObject( - const p6InputScfileRow *object ///< fooRow to convert into a psMetadata +psMetadata *p6InputSkyfileMetadataFromObject( + const p6InputSkyfileRow *object ///< fooRow to convert into a psMetadata ); /** Convert a psMetadata into an equivalent fooRow * - * @return A p6InputScfileRow pointer or NULL on error - */ - -p6InputScfileRow *p6InputScfileObjectFromMetadata( + * @return A p6InputSkyfileRow pointer or NULL on error + */ + +p6InputSkyfileRow *p6InputSkyfileObjectFromMetadata( psMetadata *md ///< psMetadata to convert into a fooRow ); -/** Selects up to limit rows from the database and returns as p6InputScfileRow objects in a psArray +/** Selects up to limit rows from the database and returns as p6InputSkyfileRow objects in a psArray * * See psDBSelectRows() for documentation on the format of where. @@ -8691,10 +8685,10 @@ */ -psArray *p6InputScfileSelectRowObjects( +psArray *p6InputSkyfileSelectRowObjects( 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 p6InputScfile +/** Deletes a row from the database coresponding to an p6InputSkyfile * * Note that a 'where' search psMetadata is constructed from each object and @@ -8704,7 +8698,7 @@ */ -bool p6InputScfileDeleteObject( - psDB *dbh, ///< Database handle - const p6InputScfileRow *object ///< Object to delete +bool p6InputSkyfileDeleteObject( + psDB *dbh, ///< Database handle + const p6InputSkyfileRow *object ///< Object to delete ); /** Deletes up to limit rows from the database and returns the number of rows actually deleted. @@ -8716,10 +8710,10 @@ */ -long long p6InputScfileDeleteRowObjects( +long long p6InputSkyfileDeleteRowObjects( 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 p6InputScfileRow objects +/** Formats and prints an array of p6InputSkyfileRow objects * * When mdcf is set the formated output is in psMetadataConfig @@ -8729,10 +8723,10 @@ */ -bool p6InputScfilePrintObjects( +bool p6InputSkyfilePrintObjects( FILE *stream, ///< a stream - psArray *objects, ///< An array of p6InputScfileRow objects + psArray *objects, ///< An array of p6InputSkyfileRow objects bool mdcf ///< format as mdconfig or simple ); -/** Formats and prints an p6InputScfileRow object +/** Formats and prints an p6InputSkyfileRow object * * When mdcf is set the formated output is in psMetadataConfig @@ -8742,32 +8736,28 @@ */ -bool p6InputScfilePrintObject( +bool p6InputSkyfilePrintObject( FILE *stream, ///< a stream - p6InputScfileRow *object, ///< an p6InputScfileRow object + p6InputSkyfileRow *object, ///< an p6InputSkyfileRow object bool mdcf ///< format as mdconfig or simple ); -/** p6SumScfileRow data structure - * - * Structure for representing a single row of p6SumScfile table data. +/** p6SumSkyfileRow data structure + * + * Structure for representing a single row of p6SumSkyfile table data. */ typedef struct { psS32 p6_id; - char *skycell_id; - char *tess_id; char *uri; psF64 bg; psF64 bg_mean_stdev; -} p6SumScfileRow; - -/** Creates a new p6SumScfileRow object - * - * @return A new p6SumScfileRow object or NULL on failure. - */ - -p6SumScfileRow *p6SumScfileRowAlloc( +} p6SumSkyfileRow; + +/** Creates a new p6SumSkyfileRow object + * + * @return A new p6SumSkyfileRow object or NULL on failure. + */ + +p6SumSkyfileRow *p6SumSkyfileRowAlloc( psS32 p6_id, - const char *skycell_id, - const char *tess_id, const char *uri, psF64 bg, @@ -8775,19 +8765,19 @@ ); -/** Creates a new p6SumScfile table - * - * @return true on success - */ - -bool p6SumScfileCreateTable( +/** Creates a new p6SumSkyfile table + * + * @return true on success + */ + +bool p6SumSkyfileCreateTable( psDB *dbh ///< Database handle ); -/** Deletes a p6SumScfile table - * - * @return true on success - */ - -bool p6SumScfileDropTable( +/** Deletes a p6SumSkyfile table + * + * @return true on success + */ + +bool p6SumSkyfileDropTable( psDB *dbh ///< Database handle ); @@ -8800,9 +8790,7 @@ */ -bool p6SumScfileInsert( +bool p6SumSkyfileInsert( psDB *dbh, ///< Database handle psS32 p6_id, - const char *skycell_id, - const char *tess_id, const char *uri, psF64 bg, @@ -8815,5 +8803,5 @@ */ -long long p6SumScfileDelete( +long long p6SumSkyfileDelete( psDB *dbh, ///< Database handle const psMetadata *where, ///< Row match criteria @@ -8821,5 +8809,5 @@ ); -/** Insert a single p6SumScfileRow object into a table +/** Insert a single p6SumSkyfileRow object into a table * * This function constructs and inserts a single row based on it's parameters. @@ -8828,10 +8816,10 @@ */ -bool p6SumScfileInsertObject( - psDB *dbh, ///< Database handle - p6SumScfileRow *object ///< p6SumScfileRow object -); - -/** Insert an array of p6SumScfileRow object into a table +bool p6SumSkyfileInsertObject( + psDB *dbh, ///< Database handle + p6SumSkyfileRow *object ///< p6SumSkyfileRow object +); + +/** Insert an array of p6SumSkyfileRow object into a table * * This function constructs and inserts multiple rows based on it's parameters. @@ -8840,10 +8828,10 @@ */ -bool p6SumScfileInsertObjects( - psDB *dbh, ///< Database handle - psArray *objects ///< array of p6SumScfileRow objects -); - -/** Insert data from a binary FITS table p6SumScfileRow into the database +bool p6SumSkyfileInsertObjects( + psDB *dbh, ///< Database handle + psArray *objects ///< array of p6SumSkyfileRow objects +); + +/** Insert data from a binary FITS table p6SumSkyfileRow into the database * * This function expects a psFits object with a FITS table as the first @@ -8855,5 +8843,5 @@ */ -bool p6SumScfileInsertFits( +bool p6SumSkyfileInsertFits( psDB *dbh, ///< Database handle const psFits *fits ///< psFits object @@ -8870,5 +8858,5 @@ */ -bool p6SumScfileSelectRowsFits( +bool p6SumSkyfileSelectRowsFits( psDB *dbh, ///< Database handle psFits *fits, ///< psFits object @@ -8877,22 +8865,22 @@ ); -/** Convert a p6SumScfileRow into an equivalent psMetadata +/** Convert a p6SumSkyfileRow into an equivalent psMetadata * * @return A psMetadata pointer or NULL on error */ -psMetadata *p6SumScfileMetadataFromObject( - const p6SumScfileRow *object ///< fooRow to convert into a psMetadata +psMetadata *p6SumSkyfileMetadataFromObject( + const p6SumSkyfileRow *object ///< fooRow to convert into a psMetadata ); /** Convert a psMetadata into an equivalent fooRow * - * @return A p6SumScfileRow pointer or NULL on error - */ - -p6SumScfileRow *p6SumScfileObjectFromMetadata( + * @return A p6SumSkyfileRow pointer or NULL on error + */ + +p6SumSkyfileRow *p6SumSkyfileObjectFromMetadata( psMetadata *md ///< psMetadata to convert into a fooRow ); -/** Selects up to limit rows from the database and returns as p6SumScfileRow objects in a psArray +/** Selects up to limit rows from the database and returns as p6SumSkyfileRow objects in a psArray * * See psDBSelectRows() for documentation on the format of where. @@ -8901,10 +8889,10 @@ */ -psArray *p6SumScfileSelectRowObjects( +psArray *p6SumSkyfileSelectRowObjects( 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 p6SumScfile +/** Deletes a row from the database coresponding to an p6SumSkyfile * * Note that a 'where' search psMetadata is constructed from each object and @@ -8914,7 +8902,7 @@ */ -bool p6SumScfileDeleteObject( - psDB *dbh, ///< Database handle - const p6SumScfileRow *object ///< Object to delete +bool p6SumSkyfileDeleteObject( + psDB *dbh, ///< Database handle + const p6SumSkyfileRow *object ///< Object to delete ); /** Deletes up to limit rows from the database and returns the number of rows actually deleted. @@ -8926,10 +8914,10 @@ */ -long long p6SumScfileDeleteRowObjects( +long long p6SumSkyfileDeleteRowObjects( 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 p6SumScfileRow objects +/** Formats and prints an array of p6SumSkyfileRow objects * * When mdcf is set the formated output is in psMetadataConfig @@ -8939,10 +8927,10 @@ */ -bool p6SumScfilePrintObjects( +bool p6SumSkyfilePrintObjects( FILE *stream, ///< a stream - psArray *objects, ///< An array of p6SumScfileRow objects + psArray *objects, ///< An array of p6SumSkyfileRow objects bool mdcf ///< format as mdconfig or simple ); -/** Formats and prints an p6SumScfileRow object +/** Formats and prints an p6SumSkyfileRow object * * When mdcf is set the formated output is in psMetadataConfig @@ -8952,7 +8940,7 @@ */ -bool p6SumScfilePrintObject( +bool p6SumSkyfilePrintObject( FILE *stream, ///< a stream - p6SumScfileRow *object, ///< an p6SumScfileRow object + p6SumSkyfileRow *object, ///< an p6SumSkyfileRow object bool mdcf ///< format as mdconfig or simple ); @@ -8964,3 +8952,3 @@ #endif -#endif // P6SUMSCFILE_DB_H +#endif // P6SUMSKYFILE_DB_H Index: /trunk/ippdb/tests/alloc.c =================================================================== --- /trunk/ippdb/tests/alloc.c (revision 11987) +++ /trunk/ippdb/tests/alloc.c (revision 11988) @@ -1562,7 +1562,7 @@ { - p4ScfileRow *object; - - object = p4ScfileRowAlloc(-32, "a string", "a string", "a string", -32, "a string", 64.64, 64.64 ); + p4SkyfileRow *object; + + object = p4SkyfileRowAlloc(-32, "a string", "a string", "a string", 64.64, 64.64 ); if (!object) { @@ -1582,12 +1582,4 @@ exit(EXIT_FAILURE); } - if (strncmp(object->exp_tag, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->p3_version == -32) { - psFree(object); - exit(EXIT_FAILURE); - } if (strncmp(object->uri, "a string", MAX_STRING_LENGTH)) { psFree(object); @@ -1609,5 +1601,5 @@ p5RunRow *object; - object = p5RunRowAlloc(-32, "a string", "a string", "a string", "0001-01-01T00:00:00Z" ); + object = p5RunRowAlloc(-32, "a string", "a string", "a string", "0001-01-01T00:00:00Z", "a string", "a string" ); if (!object) { @@ -1634,12 +1626,20 @@ exit(EXIT_FAILURE); } - - psFree(object); - } - - { - p5InputScfileRow *object; - - object = p5InputScfileRowAlloc(-32, -32, "a string", "a string", "a string", true ); + if (strncmp(object->skycell_id, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->tess_id, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + p5InputSkyfileRow *object; + + object = p5InputSkyfileRowAlloc(-32, -32, "a string", "a string", "a string", true ); if (!object) { @@ -1676,7 +1676,7 @@ { - p5DiffScfileRow *object; - - object = p5DiffScfileRowAlloc(-32, "a string", "a string", "a string", 64.64, 64.64 ); + p5DiffSkyfileRow *object; + + object = p5DiffSkyfileRowAlloc(-32, "a string", 64.64, 64.64 ); if (!object) { @@ -1688,4 +1688,48 @@ exit(EXIT_FAILURE); } + if (strncmp(object->uri, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->bg == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->bg_mean_stdev == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + p6RunRow *object; + + object = p6RunRowAlloc(-32, "a string", "a string", "a string", "0001-01-01T00:00:00Z", "a string", "a string" ); + + if (!object) { + exit(EXIT_FAILURE); + } + + if (!object->p6_id == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->state, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->workdir, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->dvodb, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + psFree(object); + exit(EXIT_FAILURE); + } if (strncmp(object->skycell_id, "a string", MAX_STRING_LENGTH)) { psFree(object); @@ -1696,24 +1740,12 @@ exit(EXIT_FAILURE); } - if (strncmp(object->uri, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->bg == 64.64) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->bg_mean_stdev == 64.64) { - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - p6RunRow *object; - - object = p6RunRowAlloc(-32, "a string", "a string", "a string", "0001-01-01T00:00:00Z" ); + + psFree(object); + } + + { + p6InputSkyfileRow *object; + + object = p6InputSkyfileRowAlloc(-32, -32 ); if (!object) { @@ -1725,27 +1757,16 @@ exit(EXIT_FAILURE); } - if (strncmp(object->state, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->workdir, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->dvodb, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - p6InputScfileRow *object; - - object = p6InputScfileRowAlloc(-32, -32, "a string", "a string" ); + if (!object->p4_id == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + p6SumSkyfileRow *object; + + object = p6SumSkyfileRowAlloc(-32, "a string", 64.64, 64.64 ); if (!object) { @@ -1754,41 +1775,4 @@ if (!object->p6_id == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->p4_id == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->skycell_id, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->tess_id, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - p6SumScfileRow *object; - - object = p6SumScfileRowAlloc(-32, "a string", "a string", "a string", 64.64, 64.64 ); - - if (!object) { - exit(EXIT_FAILURE); - } - - if (!object->p6_id == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->skycell_id, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->tess_id, "a string", MAX_STRING_LENGTH)) { psFree(object); exit(EXIT_FAILURE); Index: /trunk/ippdb/tests/createtable.c =================================================================== --- /trunk/ippdb/tests/createtable.c (revision 11987) +++ /trunk/ippdb/tests/createtable.c (revision 11988) @@ -523,5 +523,5 @@ } - if(!p4ScfileCreateTable(dbh)) { + if(!p4SkyfileCreateTable(dbh)) { exit(EXIT_FAILURE); } @@ -553,20 +553,20 @@ } - if(!p5InputScfileCreateTable(dbh)) { - exit(EXIT_FAILURE); - } - - psDBCleanup(dbh); - } - - { - psDB *dbh; - - dbh = psDBInit("localhost", "test", NULL, "test"); - if (!dbh) { - exit(EXIT_FAILURE); - } - - if(!p5DiffScfileCreateTable(dbh)) { + if(!p5InputSkyfileCreateTable(dbh)) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if(!p5DiffSkyfileCreateTable(dbh)) { exit(EXIT_FAILURE); } @@ -598,20 +598,20 @@ } - if(!p6InputScfileCreateTable(dbh)) { - exit(EXIT_FAILURE); - } - - psDBCleanup(dbh); - } - - { - psDB *dbh; - - dbh = psDBInit("localhost", "test", NULL, "test"); - if (!dbh) { - exit(EXIT_FAILURE); - } - - if(!p6SumScfileCreateTable(dbh)) { + if(!p6InputSkyfileCreateTable(dbh)) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if(!p6SumSkyfileCreateTable(dbh)) { exit(EXIT_FAILURE); } Index: /trunk/ippdb/tests/dbcleanup.c =================================================================== --- /trunk/ippdb/tests/dbcleanup.c (revision 11987) +++ /trunk/ippdb/tests/dbcleanup.c (revision 11988) @@ -45,11 +45,11 @@ p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4InputExp"); p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4SkyCellMap"); - p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4Scfile"); + p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4Skyfile"); p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p5Run"); - p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p5InputScfile"); - p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p5DiffScfile"); + p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p5InputSkyfile"); + p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p5DiffSkyfile"); p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p6Run"); - p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p6InputScfile"); - p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p6SumScfile"); + p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p6InputSkyfile"); + p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p6SumSkyfile"); psDBCleanup(dbh); Index: /trunk/ippdb/tests/dbsetup.c =================================================================== --- /trunk/ippdb/tests/dbsetup.c (revision 11987) +++ /trunk/ippdb/tests/dbsetup.c (revision 11988) @@ -115,24 +115,24 @@ p4SkyCellMapCreateTable(dbh); - p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4Scfile"); - p4ScfileCreateTable(dbh); + p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4Skyfile"); + p4SkyfileCreateTable(dbh); p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p5Run"); p5RunCreateTable(dbh); - p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p5InputScfile"); - p5InputScfileCreateTable(dbh); + p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p5InputSkyfile"); + p5InputSkyfileCreateTable(dbh); - p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p5DiffScfile"); - p5DiffScfileCreateTable(dbh); + p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p5DiffSkyfile"); + p5DiffSkyfileCreateTable(dbh); p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p6Run"); p6RunCreateTable(dbh); - p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p6InputScfile"); - p6InputScfileCreateTable(dbh); + p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p6InputSkyfile"); + p6InputSkyfileCreateTable(dbh); - p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p6SumScfile"); - p6SumScfileCreateTable(dbh); + p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p6SumSkyfile"); + p6SumSkyfileCreateTable(dbh); psDBCleanup(dbh); Index: /trunk/ippdb/tests/droptable.c =================================================================== --- /trunk/ippdb/tests/droptable.c (revision 11987) +++ /trunk/ippdb/tests/droptable.c (revision 11988) @@ -523,5 +523,5 @@ } - if (!p4ScfileDropTable(dbh)) { + if (!p4SkyfileDropTable(dbh)) { exit(EXIT_FAILURE); } @@ -553,20 +553,20 @@ } - if (!p5InputScfileDropTable(dbh)) { - exit(EXIT_FAILURE); - } - - psDBCleanup(dbh); - } - - { - psDB *dbh; - - dbh = psDBInit("localhost", "test", NULL, "test"); - if (!dbh) { - exit(EXIT_FAILURE); - } - - if (!p5DiffScfileDropTable(dbh)) { + if (!p5InputSkyfileDropTable(dbh)) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if (!p5DiffSkyfileDropTable(dbh)) { exit(EXIT_FAILURE); } @@ -598,20 +598,20 @@ } - if (!p6InputScfileDropTable(dbh)) { - exit(EXIT_FAILURE); - } - - psDBCleanup(dbh); - } - - { - psDB *dbh; - - dbh = psDBInit("localhost", "test", NULL, "test"); - if (!dbh) { - exit(EXIT_FAILURE); - } - - if (!p6SumScfileDropTable(dbh)) { + if (!p6InputSkyfileDropTable(dbh)) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if (!p6SumSkyfileDropTable(dbh)) { exit(EXIT_FAILURE); } Index: /trunk/ippdb/tests/insert.c =================================================================== --- /trunk/ippdb/tests/insert.c (revision 11987) +++ /trunk/ippdb/tests/insert.c (revision 11988) @@ -523,95 +523,95 @@ } - if (!p4ScfileInsert(dbh, -32, "a string", "a string", "a string", -32, "a string", 64.64, 64.64)) { - exit(EXIT_FAILURE); - } - - psDBCleanup(dbh); - } - - { - psDB *dbh; - - dbh = psDBInit("localhost", "test", NULL, "test"); - if (!dbh) { - exit(EXIT_FAILURE); - } - - if (!p5RunInsert(dbh, -32, "a string", "a string", "a string", "0001-01-01T00:00:00Z")) { - exit(EXIT_FAILURE); - } - - psDBCleanup(dbh); - } - - { - psDB *dbh; - - dbh = psDBInit("localhost", "test", NULL, "test"); - if (!dbh) { - exit(EXIT_FAILURE); - } - - if (!p5InputScfileInsert(dbh, -32, -32, "a string", "a string", "a string", true)) { - exit(EXIT_FAILURE); - } - - psDBCleanup(dbh); - } - - { - psDB *dbh; - - dbh = psDBInit("localhost", "test", NULL, "test"); - if (!dbh) { - exit(EXIT_FAILURE); - } - - if (!p5DiffScfileInsert(dbh, -32, "a string", "a string", "a string", 64.64, 64.64)) { - exit(EXIT_FAILURE); - } - - psDBCleanup(dbh); - } - - { - psDB *dbh; - - dbh = psDBInit("localhost", "test", NULL, "test"); - if (!dbh) { - exit(EXIT_FAILURE); - } - - if (!p6RunInsert(dbh, -32, "a string", "a string", "a string", "0001-01-01T00:00:00Z")) { - exit(EXIT_FAILURE); - } - - psDBCleanup(dbh); - } - - { - psDB *dbh; - - dbh = psDBInit("localhost", "test", NULL, "test"); - if (!dbh) { - exit(EXIT_FAILURE); - } - - if (!p6InputScfileInsert(dbh, -32, -32, "a string", "a string")) { - exit(EXIT_FAILURE); - } - - psDBCleanup(dbh); - } - - { - psDB *dbh; - - dbh = psDBInit("localhost", "test", NULL, "test"); - if (!dbh) { - exit(EXIT_FAILURE); - } - - if (!p6SumScfileInsert(dbh, -32, "a string", "a string", "a string", 64.64, 64.64)) { + if (!p4SkyfileInsert(dbh, -32, "a string", "a string", "a string", 64.64, 64.64)) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if (!p5RunInsert(dbh, -32, "a string", "a string", "a string", "0001-01-01T00:00:00Z", "a string", "a string")) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if (!p5InputSkyfileInsert(dbh, -32, -32, "a string", "a string", "a string", true)) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if (!p5DiffSkyfileInsert(dbh, -32, "a string", 64.64, 64.64)) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if (!p6RunInsert(dbh, -32, "a string", "a string", "a string", "0001-01-01T00:00:00Z", "a string", "a string")) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if (!p6InputSkyfileInsert(dbh, -32, -32)) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if (!p6SumSkyfileInsert(dbh, -32, "a string", 64.64, 64.64)) { exit(EXIT_FAILURE); } Index: /trunk/ippdb/tests/insertfits.c =================================================================== --- /trunk/ippdb/tests/insertfits.c (revision 11987) +++ /trunk/ippdb/tests/insertfits.c (revision 11988) @@ -908,5 +908,5 @@ } - if (!p4ScfileInsertFits(dbh, fits)) { + if (!p4SkyfileInsertFits(dbh, fits)) { exit(EXIT_FAILURE); } @@ -960,31 +960,31 @@ } - if (!p5InputScfileInsertFits(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 (!p5DiffScfileInsertFits(dbh, fits)) { + if (!p5InputSkyfileInsertFits(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 (!p5DiffSkyfileInsertFits(dbh, fits)) { exit(EXIT_FAILURE); } @@ -1038,31 +1038,31 @@ } - if (!p6InputScfileInsertFits(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 (!p6SumScfileInsertFits(dbh, fits)) { + if (!p6InputSkyfileInsertFits(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 (!p6SumSkyfileInsertFits(dbh, fits)) { exit(EXIT_FAILURE); } Index: /trunk/ippdb/tests/insertobject.c =================================================================== --- /trunk/ippdb/tests/insertobject.c (revision 11987) +++ /trunk/ippdb/tests/insertobject.c (revision 11988) @@ -755,17 +755,17 @@ { psDB *dbh; - p4ScfileRow *object; - - dbh = psDBInit("localhost", "test", NULL, "test"); - if (!dbh) { - exit(EXIT_FAILURE); - } - - object = p4ScfileRowAlloc(-32, "a string", "a string", "a string", -32, "a string", 64.64, 64.64); - if (!object) { - exit(EXIT_FAILURE); - } - - if (!p4ScfileInsertObject(dbh, object)) { + p4SkyfileRow *object; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + object = p4SkyfileRowAlloc(-32, "a string", "a string", "a string", 64.64, 64.64); + if (!object) { + exit(EXIT_FAILURE); + } + + if (!p4SkyfileInsertObject(dbh, object)) { exit(EXIT_FAILURE); } @@ -784,5 +784,5 @@ } - object = p5RunRowAlloc(-32, "a string", "a string", "a string", "0001-01-01T00:00:00Z"); + object = p5RunRowAlloc(-32, "a string", "a string", "a string", "0001-01-01T00:00:00Z", "a string", "a string"); if (!object) { exit(EXIT_FAILURE); @@ -799,39 +799,39 @@ { psDB *dbh; - p5InputScfileRow *object; - - dbh = psDBInit("localhost", "test", NULL, "test"); - if (!dbh) { - exit(EXIT_FAILURE); - } - - object = p5InputScfileRowAlloc(-32, -32, "a string", "a string", "a string", true); - if (!object) { - exit(EXIT_FAILURE); - } - - if (!p5InputScfileInsertObject(dbh, object)) { - exit(EXIT_FAILURE); - } - - psFree(object); - psDBCleanup(dbh); - } - - { - psDB *dbh; - p5DiffScfileRow *object; - - dbh = psDBInit("localhost", "test", NULL, "test"); - if (!dbh) { - exit(EXIT_FAILURE); - } - - object = p5DiffScfileRowAlloc(-32, "a string", "a string", "a string", 64.64, 64.64); - if (!object) { - exit(EXIT_FAILURE); - } - - if (!p5DiffScfileInsertObject(dbh, object)) { + p5InputSkyfileRow *object; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + object = p5InputSkyfileRowAlloc(-32, -32, "a string", "a string", "a string", true); + if (!object) { + exit(EXIT_FAILURE); + } + + if (!p5InputSkyfileInsertObject(dbh, object)) { + exit(EXIT_FAILURE); + } + + psFree(object); + psDBCleanup(dbh); + } + + { + psDB *dbh; + p5DiffSkyfileRow *object; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + object = p5DiffSkyfileRowAlloc(-32, "a string", 64.64, 64.64); + if (!object) { + exit(EXIT_FAILURE); + } + + if (!p5DiffSkyfileInsertObject(dbh, object)) { exit(EXIT_FAILURE); } @@ -850,5 +850,5 @@ } - object = p6RunRowAlloc(-32, "a string", "a string", "a string", "0001-01-01T00:00:00Z"); + object = p6RunRowAlloc(-32, "a string", "a string", "a string", "0001-01-01T00:00:00Z", "a string", "a string"); if (!object) { exit(EXIT_FAILURE); @@ -865,39 +865,39 @@ { psDB *dbh; - p6InputScfileRow *object; - - dbh = psDBInit("localhost", "test", NULL, "test"); - if (!dbh) { - exit(EXIT_FAILURE); - } - - object = p6InputScfileRowAlloc(-32, -32, "a string", "a string"); - if (!object) { - exit(EXIT_FAILURE); - } - - if (!p6InputScfileInsertObject(dbh, object)) { - exit(EXIT_FAILURE); - } - - psFree(object); - psDBCleanup(dbh); - } - - { - psDB *dbh; - p6SumScfileRow *object; - - dbh = psDBInit("localhost", "test", NULL, "test"); - if (!dbh) { - exit(EXIT_FAILURE); - } - - object = p6SumScfileRowAlloc(-32, "a string", "a string", "a string", 64.64, 64.64); - if (!object) { - exit(EXIT_FAILURE); - } - - if (!p6SumScfileInsertObject(dbh, object)) { + p6InputSkyfileRow *object; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + object = p6InputSkyfileRowAlloc(-32, -32); + if (!object) { + exit(EXIT_FAILURE); + } + + if (!p6InputSkyfileInsertObject(dbh, object)) { + exit(EXIT_FAILURE); + } + + psFree(object); + psDBCleanup(dbh); + } + + { + psDB *dbh; + p6SumSkyfileRow *object; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + object = p6SumSkyfileRowAlloc(-32, "a string", 64.64, 64.64); + if (!object) { + exit(EXIT_FAILURE); + } + + if (!p6SumSkyfileInsertObject(dbh, object)) { exit(EXIT_FAILURE); } Index: /trunk/ippdb/tests/metadatafromobject.c =================================================================== --- /trunk/ippdb/tests/metadatafromobject.c (revision 11987) +++ /trunk/ippdb/tests/metadatafromobject.c (revision 11988) @@ -1821,13 +1821,13 @@ { psMetadata *md; - p4ScfileRow *object; - bool status; - - object = p4ScfileRowAlloc(-32, "a string", "a string", "a string", -32, "a string", 64.64, 64.64); - if (!object) { - exit(EXIT_FAILURE); - } - - md = p4ScfileMetadataFromObject(object); + p4SkyfileRow *object; + bool status; + + object = p4SkyfileRowAlloc(-32, "a string", "a string", "a string", 64.64, 64.64); + if (!object) { + exit(EXIT_FAILURE); + } + + md = p4SkyfileMetadataFromObject(object); if (!md) { exit(EXIT_FAILURE); @@ -1848,12 +1848,4 @@ exit(EXIT_FAILURE); } - if (strncmp(psMetadataLookupPtr(&status, md, "exp_tag"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupS32(&status, md, "p3_version") == -32) { - psFree(md); - exit(EXIT_FAILURE); - } if (strncmp(psMetadataLookupPtr(&status, md, "uri"), "a string", MAX_STRING_LENGTH)) { psFree(md); @@ -1877,5 +1869,5 @@ bool status; - object = p5RunRowAlloc(-32, "a string", "a string", "a string", "0001-01-01T00:00:00Z"); + object = p5RunRowAlloc(-32, "a string", "a string", "a string", "0001-01-01T00:00:00Z", "a string", "a string"); if (!object) { exit(EXIT_FAILURE); @@ -1908,19 +1900,27 @@ exit(EXIT_FAILURE); } - - psFree(md); - } - - { - psMetadata *md; - p5InputScfileRow *object; - bool status; - - object = p5InputScfileRowAlloc(-32, -32, "a string", "a string", "a string", true); - if (!object) { - exit(EXIT_FAILURE); - } - - md = p5InputScfileMetadataFromObject(object); + if (strncmp(psMetadataLookupPtr(&status, md, "skycell_id"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "tess_id"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + } + + { + psMetadata *md; + p5InputSkyfileRow *object; + bool status; + + object = p5InputSkyfileRowAlloc(-32, -32, "a string", "a string", "a string", true); + if (!object) { + exit(EXIT_FAILURE); + } + + md = p5InputSkyfileMetadataFromObject(object); if (!md) { exit(EXIT_FAILURE); @@ -1959,13 +1959,13 @@ { psMetadata *md; - p5DiffScfileRow *object; - bool status; - - object = p5DiffScfileRowAlloc(-32, "a string", "a string", "a string", 64.64, 64.64); - if (!object) { - exit(EXIT_FAILURE); - } - - md = p5DiffScfileMetadataFromObject(object); + p5DiffSkyfileRow *object; + bool status; + + object = p5DiffSkyfileRowAlloc(-32, "a string", 64.64, 64.64); + if (!object) { + exit(EXIT_FAILURE); + } + + md = p5DiffSkyfileMetadataFromObject(object); if (!md) { exit(EXIT_FAILURE); @@ -1978,4 +1978,56 @@ exit(EXIT_FAILURE); } + if (strncmp(psMetadataLookupPtr(&status, md, "uri"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF64(&status, md, "bg") == 64.64) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF64(&status, md, "bg_mean_stdev") == 64.64) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + } + + { + psMetadata *md; + p6RunRow *object; + bool status; + + object = p6RunRowAlloc(-32, "a string", "a string", "a string", "0001-01-01T00:00:00Z", "a string", "a string"); + if (!object) { + exit(EXIT_FAILURE); + } + + md = p6RunMetadataFromObject(object); + if (!md) { + exit(EXIT_FAILURE); + } + + psFree(object); + + if (!psMetadataLookupS32(&status, md, "p6_id") == -32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "state"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "workdir"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "dvodb"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + psFree(md); + exit(EXIT_FAILURE); + } if (strncmp(psMetadataLookupPtr(&status, md, "skycell_id"), "a string", MAX_STRING_LENGTH)) { psFree(md); @@ -1986,31 +2038,19 @@ exit(EXIT_FAILURE); } - if (strncmp(psMetadataLookupPtr(&status, md, "uri"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupF64(&status, md, "bg") == 64.64) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupF64(&status, md, "bg_mean_stdev") == 64.64) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - } - - { - psMetadata *md; - p6RunRow *object; - bool status; - - object = p6RunRowAlloc(-32, "a string", "a string", "a string", "0001-01-01T00:00:00Z"); - if (!object) { - exit(EXIT_FAILURE); - } - - md = p6RunMetadataFromObject(object); + + psFree(md); + } + + { + psMetadata *md; + p6InputSkyfileRow *object; + bool status; + + object = p6InputSkyfileRowAlloc(-32, -32); + if (!object) { + exit(EXIT_FAILURE); + } + + md = p6InputSkyfileMetadataFromObject(object); if (!md) { exit(EXIT_FAILURE); @@ -2023,34 +2063,23 @@ exit(EXIT_FAILURE); } - if (strncmp(psMetadataLookupPtr(&status, md, "state"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "workdir"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "dvodb"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - } - - { - psMetadata *md; - p6InputScfileRow *object; - bool status; - - object = p6InputScfileRowAlloc(-32, -32, "a string", "a string"); - if (!object) { - exit(EXIT_FAILURE); - } - - md = p6InputScfileMetadataFromObject(object); + if (!psMetadataLookupS32(&status, md, "p4_id") == -32) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + } + + { + psMetadata *md; + p6SumSkyfileRow *object; + bool status; + + object = p6SumSkyfileRowAlloc(-32, "a string", 64.64, 64.64); + if (!object) { + exit(EXIT_FAILURE); + } + + md = p6SumSkyfileMetadataFromObject(object); if (!md) { exit(EXIT_FAILURE); @@ -2060,49 +2089,4 @@ if (!psMetadataLookupS32(&status, md, "p6_id") == -32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupS32(&status, md, "p4_id") == -32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "skycell_id"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "tess_id"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - } - - { - psMetadata *md; - p6SumScfileRow *object; - bool status; - - object = p6SumScfileRowAlloc(-32, "a string", "a string", "a string", 64.64, 64.64); - if (!object) { - exit(EXIT_FAILURE); - } - - md = p6SumScfileMetadataFromObject(object); - if (!md) { - exit(EXIT_FAILURE); - } - - psFree(object); - - if (!psMetadataLookupS32(&status, md, "p6_id") == -32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "skycell_id"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "tess_id"), "a string", MAX_STRING_LENGTH)) { psFree(md); exit(EXIT_FAILURE); Index: /trunk/ippdb/tests/objectfrommetadata.c =================================================================== --- /trunk/ippdb/tests/objectfrommetadata.c (revision 11987) +++ /trunk/ippdb/tests/objectfrommetadata.c (revision 11988) @@ -2816,5 +2816,5 @@ { psMetadata *md; - p4ScfileRow *object; + p4SkyfileRow *object; md = psMetadataAlloc(); @@ -2831,12 +2831,4 @@ exit(EXIT_FAILURE); } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "exp_tag", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddS32(md, PS_LIST_TAIL, "p3_version", 0, NULL, -32)) { - psFree(md); - exit(EXIT_FAILURE); - } if (!psMetadataAddStr(md, PS_LIST_TAIL, "uri", 0, NULL, "a string")) { psFree(md); @@ -2852,5 +2844,5 @@ } - object = p4ScfileObjectFromMetadata(md); + object = p4SkyfileObjectFromMetadata(md); if (!object) { psFree(md); @@ -2872,12 +2864,4 @@ exit(EXIT_FAILURE); } - if (strncmp(object->exp_tag, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->p3_version == -32) { - psFree(object); - exit(EXIT_FAILURE); - } if (strncmp(object->uri, "a string", MAX_STRING_LENGTH)) { psFree(object); @@ -2920,4 +2904,12 @@ exit(EXIT_FAILURE); } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "skycell_id", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "tess_id", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } object = p5RunObjectFromMetadata(md); @@ -2948,11 +2940,19 @@ exit(EXIT_FAILURE); } - - psFree(object); - } - - { - psMetadata *md; - p5InputScfileRow *object; + if (strncmp(object->skycell_id, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->tess_id, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + psMetadata *md; + p5InputSkyfileRow *object; md = psMetadataAlloc(); @@ -2982,5 +2982,5 @@ } - object = p5InputScfileObjectFromMetadata(md); + object = p5InputSkyfileObjectFromMetadata(md); if (!object) { psFree(md); @@ -3020,5 +3020,5 @@ { psMetadata *md; - p5DiffScfileRow *object; + p5DiffSkyfileRow *object; md = psMetadataAlloc(); @@ -3027,4 +3027,69 @@ exit(EXIT_FAILURE); } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "uri", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "bg", 0, NULL, 64.64)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "bg_mean_stdev", 0, NULL, 64.64)) { + psFree(md); + exit(EXIT_FAILURE); + } + + object = p5DiffSkyfileObjectFromMetadata(md); + if (!object) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + + if (!object->p5_id == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->uri, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->bg == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->bg_mean_stdev == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + psMetadata *md; + p6RunRow *object; + + md = psMetadataAlloc(); + if (!psMetadataAddS32(md, PS_LIST_TAIL, "p6_id", 0, NULL, -32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "state", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "workdir", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "dvodb", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + psFree(md); + exit(EXIT_FAILURE); + } if (!psMetadataAddStr(md, PS_LIST_TAIL, "skycell_id", 0, NULL, "a string")) { psFree(md); @@ -3035,4 +3100,87 @@ exit(EXIT_FAILURE); } + + object = p6RunObjectFromMetadata(md); + if (!object) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + + if (!object->p6_id == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->state, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->workdir, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->dvodb, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->skycell_id, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->tess_id, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + psMetadata *md; + p6InputSkyfileRow *object; + + md = psMetadataAlloc(); + if (!psMetadataAddS32(md, PS_LIST_TAIL, "p6_id", 0, NULL, -32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddS32(md, PS_LIST_TAIL, "p4_id", 0, NULL, -32)) { + psFree(md); + exit(EXIT_FAILURE); + } + + object = p6InputSkyfileObjectFromMetadata(md); + if (!object) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + + if (!object->p6_id == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->p4_id == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + psMetadata *md; + p6SumSkyfileRow *object; + + md = psMetadataAlloc(); + if (!psMetadataAddS32(md, PS_LIST_TAIL, "p6_id", 0, NULL, -32)) { + psFree(md); + exit(EXIT_FAILURE); + } if (!psMetadataAddStr(md, PS_LIST_TAIL, "uri", 0, NULL, "a string")) { psFree(md); @@ -3048,66 +3196,5 @@ } - object = p5DiffScfileObjectFromMetadata(md); - if (!object) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - - if (!object->p5_id == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->skycell_id, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->tess_id, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->uri, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->bg == 64.64) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->bg_mean_stdev == 64.64) { - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - psMetadata *md; - p6RunRow *object; - - md = psMetadataAlloc(); - if (!psMetadataAddS32(md, PS_LIST_TAIL, "p6_id", 0, NULL, -32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "state", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "workdir", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "dvodb", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - psFree(md); - exit(EXIT_FAILURE); - } - - object = p6RunObjectFromMetadata(md); + object = p6SumSkyfileObjectFromMetadata(md); if (!object) { psFree(md); @@ -3118,123 +3205,4 @@ if (!object->p6_id == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->state, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->workdir, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->dvodb, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - psMetadata *md; - p6InputScfileRow *object; - - md = psMetadataAlloc(); - if (!psMetadataAddS32(md, PS_LIST_TAIL, "p6_id", 0, NULL, -32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddS32(md, PS_LIST_TAIL, "p4_id", 0, NULL, -32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "skycell_id", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "tess_id", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - - object = p6InputScfileObjectFromMetadata(md); - if (!object) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - - if (!object->p6_id == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->p4_id == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->skycell_id, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->tess_id, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - psMetadata *md; - p6SumScfileRow *object; - - md = psMetadataAlloc(); - if (!psMetadataAddS32(md, PS_LIST_TAIL, "p6_id", 0, NULL, -32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "skycell_id", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "tess_id", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "uri", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddF64(md, PS_LIST_TAIL, "bg", 0, NULL, 64.64)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddF64(md, PS_LIST_TAIL, "bg_mean_stdev", 0, NULL, 64.64)) { - psFree(md); - exit(EXIT_FAILURE); - } - - object = p6SumScfileObjectFromMetadata(md); - if (!object) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - - if (!object->p6_id == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->skycell_id, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->tess_id, "a string", MAX_STRING_LENGTH)) { psFree(object); exit(EXIT_FAILURE); Index: /trunk/ippdb/tests/selectrowsfits.c =================================================================== --- /trunk/ippdb/tests/selectrowsfits.c (revision 11987) +++ /trunk/ippdb/tests/selectrowsfits.c (revision 11988) @@ -769,5 +769,5 @@ } - if (!p4ScfileSelectRowsFits(dbh, fits, NULL, 1)) { + if (!p4SkyfileSelectRowsFits(dbh, fits, NULL, 1)) { exit(EXIT_FAILURE); } @@ -813,27 +813,27 @@ } - if (!p5InputScfileSelectRowsFits(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 (!p5DiffScfileSelectRowsFits(dbh, fits, NULL, 1)) { + if (!p5InputSkyfileSelectRowsFits(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 (!p5DiffSkyfileSelectRowsFits(dbh, fits, NULL, 1)) { exit(EXIT_FAILURE); } @@ -879,27 +879,27 @@ } - if (!p6InputScfileSelectRowsFits(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 (!p6SumScfileSelectRowsFits(dbh, fits, NULL, 1)) { + if (!p6InputSkyfileSelectRowsFits(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 (!p6SumSkyfileSelectRowsFits(dbh, fits, NULL, 1)) { exit(EXIT_FAILURE); }