Index: trunk/ippdb/tests/alloc.c =================================================================== --- trunk/ippdb/tests/alloc.c (revision 9970) +++ trunk/ippdb/tests/alloc.c (revision 10060) @@ -11,5 +11,5 @@ summitExpRow *object; - object = summitExpRowAlloc("a string", "a string", "a string", "0001-01-01T00:00:00Z", "a string", "a string" ); + object = summitExpRowAlloc("a string", "a string", "a string", "0001-01-01T00:00:00Z", "a string", "a string", -32 ); if (!object) { @@ -40,4 +40,53 @@ exit(EXIT_FAILURE); } + if (!object->imfiles == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + summitImfileRow *object; + + object = summitImfileRowAlloc("a string", "a string", "a string", -32, "a string", "a string", "a string", "a string" ); + + if (!object) { + exit(EXIT_FAILURE); + } + + if (strncmp(object->exp_id, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->camera, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->telescope, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->bytes == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->md5sum, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->class, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->class_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); + } psFree(object); @@ -47,5 +96,5 @@ pzPendingExpRow *object; - object = pzPendingExpRowAlloc("a string", "a string", "a string", "a string", -32 ); + object = pzPendingExpRowAlloc("a string", "a string", "a string" ); if (!object) { @@ -65,12 +114,4 @@ exit(EXIT_FAILURE); } - if (strncmp(object->exp_type, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->imfiles == -32) { - psFree(object); - exit(EXIT_FAILURE); - } psFree(object); @@ -80,5 +121,5 @@ pzPendingImfileRow *object; - object = pzPendingImfileRowAlloc("a string", "a string", "a string", -32, "a string", "a string", "a string", "a string" ); + object = pzPendingImfileRowAlloc("a string", "a string", "a string", "a string", "a string", "a string" ); if (!object) { @@ -98,12 +139,4 @@ exit(EXIT_FAILURE); } - if (!object->bytes == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->md5sum, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } if (strncmp(object->class, "a string", MAX_STRING_LENGTH)) { psFree(object); @@ -114,4 +147,70 @@ exit(EXIT_FAILURE); } + if (strncmp(object->exp_tag, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + pzDoneExpRow *object; + + object = pzDoneExpRowAlloc("a string", "a string", "a string" ); + + if (!object) { + exit(EXIT_FAILURE); + } + + if (strncmp(object->exp_id, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->camera, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->telescope, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + pzDoneImfileRow *object; + + object = pzDoneImfileRowAlloc("a string", "a string", "a string", "a string", "a string", "a string", "a string" ); + + if (!object) { + exit(EXIT_FAILURE); + } + + if (strncmp(object->exp_id, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->camera, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->telescope, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->class, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->class_id, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->exp_tag, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } if (strncmp(object->uri, "a string", MAX_STRING_LENGTH)) { psFree(object); @@ -125,11 +224,10 @@ newExpRow *object; - object = newExpRowAlloc("a string", "a string", "a string", "a string", "a string", -32 ); - - if (!object) { - exit(EXIT_FAILURE); - } - - if (strncmp(object->exp_tag, "a string", MAX_STRING_LENGTH)) { + object = newExpRowAlloc(64, "a string", "a string", "a string", "0001-01-01T00:00:00Z", "a string", -32 ); + + if (!object) { + exit(EXIT_FAILURE); + } + psFree(object); exit(EXIT_FAILURE); @@ -144,4 +242,7 @@ } if (strncmp(object->telescope, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } psFree(object); exit(EXIT_FAILURE); Index: trunk/ippdb/tests/createtable.c =================================================================== --- trunk/ippdb/tests/createtable.c (revision 9970) +++ trunk/ippdb/tests/createtable.c (revision 10060) @@ -28,4 +28,19 @@ } + if(!summitImfileCreateTable(dbh)) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + if(!pzPendingExpCreateTable(dbh)) { exit(EXIT_FAILURE); @@ -44,4 +59,34 @@ if(!pzPendingImfileCreateTable(dbh)) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if(!pzDoneExpCreateTable(dbh)) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if(!pzDoneImfileCreateTable(dbh)) { exit(EXIT_FAILURE); } Index: trunk/ippdb/tests/dbcleanup.c =================================================================== --- trunk/ippdb/tests/dbcleanup.c (revision 9970) +++ trunk/ippdb/tests/dbcleanup.c (revision 10060) @@ -12,6 +12,9 @@ p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS summitExp"); + p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS summitImfile"); p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS pzPendingExp"); p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS pzPendingImfile"); + p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS pzDoneExp"); + p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS pzDoneImfile"); p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS newExp"); p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS newImfile"); Index: trunk/ippdb/tests/dbsetup.c =================================================================== --- trunk/ippdb/tests/dbsetup.c (revision 9970) +++ trunk/ippdb/tests/dbsetup.c (revision 10060) @@ -16,4 +16,7 @@ summitExpCreateTable(dbh); + p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS summitImfile"); + summitImfileCreateTable(dbh); + p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS pzPendingExp"); pzPendingExpCreateTable(dbh); @@ -21,4 +24,10 @@ p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS pzPendingImfile"); pzPendingImfileCreateTable(dbh); + + p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS pzDoneExp"); + pzDoneExpCreateTable(dbh); + + p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS pzDoneImfile"); + pzDoneImfileCreateTable(dbh); p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS newExp"); Index: trunk/ippdb/tests/droptable.c =================================================================== --- trunk/ippdb/tests/droptable.c (revision 9970) +++ trunk/ippdb/tests/droptable.c (revision 10060) @@ -28,4 +28,19 @@ } + if (!summitImfileDropTable(dbh)) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + if (!pzPendingExpDropTable(dbh)) { exit(EXIT_FAILURE); @@ -44,4 +59,34 @@ if (!pzPendingImfileDropTable(dbh)) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if (!pzDoneExpDropTable(dbh)) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if (!pzDoneImfileDropTable(dbh)) { exit(EXIT_FAILURE); } Index: trunk/ippdb/tests/insert.c =================================================================== --- trunk/ippdb/tests/insert.c (revision 9970) +++ trunk/ippdb/tests/insert.c (revision 10060) @@ -13,50 +13,95 @@ } - if (!summitExpInsert(dbh, "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 (!pzPendingExpInsert(dbh, "a string", "a string", "a string", "a string", -32)) { - exit(EXIT_FAILURE); - } - - psDBCleanup(dbh); - } - - { - psDB *dbh; - - dbh = psDBInit("localhost", "test", NULL, "test"); - if (!dbh) { - exit(EXIT_FAILURE); - } - - if (!pzPendingImfileInsert(dbh, "a string", "a string", "a string", -32, "a string", "a string", "a string", "a string")) { - exit(EXIT_FAILURE); - } - - psDBCleanup(dbh); - } - - { - psDB *dbh; - - dbh = psDBInit("localhost", "test", NULL, "test"); - if (!dbh) { - exit(EXIT_FAILURE); - } - - if (!newExpInsert(dbh, "a string", "a string", "a string", "a string", "a string", -32)) { + if (!summitExpInsert(dbh, "a string", "a string", "a string", "0001-01-01T00:00:00Z", "a string", "a string", -32)) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if (!summitImfileInsert(dbh, "a string", "a string", "a string", -32, "a string", "a string", "a string", "a string")) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if (!pzPendingExpInsert(dbh, "a string", "a string", "a string")) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if (!pzPendingImfileInsert(dbh, "a string", "a string", "a string", "a string", "a string", "a string")) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if (!pzDoneExpInsert(dbh, "a string", "a string", "a string")) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if (!pzDoneImfileInsert(dbh, "a string", "a string", "a string", "a string", "a string", "a string", "a string")) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if (!newExpInsert(dbh, 64, "a string", "a string", "a string", "0001-01-01T00:00:00Z", "a string", -32)) { exit(EXIT_FAILURE); } Index: trunk/ippdb/tests/insertfits.c =================================================================== --- trunk/ippdb/tests/insertfits.c (revision 9970) +++ trunk/ippdb/tests/insertfits.c (revision 10060) @@ -50,4 +50,30 @@ } + if (!summitImfileInsertFits(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 (!pzPendingExpInsertFits(dbh, fits)) { exit(EXIT_FAILURE); @@ -77,4 +103,56 @@ if (!pzPendingImfileInsertFits(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 (!pzDoneExpInsertFits(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 (!pzDoneImfileInsertFits(dbh, fits)) { exit(EXIT_FAILURE); } Index: trunk/ippdb/tests/insertobject.c =================================================================== --- trunk/ippdb/tests/insertobject.c (revision 9970) +++ trunk/ippdb/tests/insertobject.c (revision 10060) @@ -14,5 +14,5 @@ } - object = summitExpRowAlloc("a string", "a string", "a string", "0001-01-01T00:00:00Z", "a string", "a string"); + object = summitExpRowAlloc("a string", "a string", "a string", "0001-01-01T00:00:00Z", "a string", "a string", -32); if (!object) { exit(EXIT_FAILURE); @@ -29,4 +29,26 @@ { psDB *dbh; + summitImfileRow *object; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + object = summitImfileRowAlloc("a string", "a string", "a string", -32, "a string", "a string", "a string", "a string"); + if (!object) { + exit(EXIT_FAILURE); + } + + if (!summitImfileInsertObject(dbh, object)) { + exit(EXIT_FAILURE); + } + + psFree(object); + psDBCleanup(dbh); + } + + { + psDB *dbh; pzPendingExpRow *object; @@ -36,5 +58,5 @@ } - object = pzPendingExpRowAlloc("a string", "a string", "a string", "a string", -32); + object = pzPendingExpRowAlloc("a string", "a string", "a string"); if (!object) { exit(EXIT_FAILURE); @@ -58,5 +80,5 @@ } - object = pzPendingImfileRowAlloc("a string", "a string", "a string", -32, "a string", "a string", "a string", "a string"); + object = pzPendingImfileRowAlloc("a string", "a string", "a string", "a string", "a string", "a string"); if (!object) { exit(EXIT_FAILURE); @@ -73,4 +95,48 @@ { psDB *dbh; + pzDoneExpRow *object; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + object = pzDoneExpRowAlloc("a string", "a string", "a string"); + if (!object) { + exit(EXIT_FAILURE); + } + + if (!pzDoneExpInsertObject(dbh, object)) { + exit(EXIT_FAILURE); + } + + psFree(object); + psDBCleanup(dbh); + } + + { + psDB *dbh; + pzDoneImfileRow *object; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + object = pzDoneImfileRowAlloc("a string", "a string", "a string", "a string", "a string", "a string", "a string"); + if (!object) { + exit(EXIT_FAILURE); + } + + if (!pzDoneImfileInsertObject(dbh, object)) { + exit(EXIT_FAILURE); + } + + psFree(object); + psDBCleanup(dbh); + } + + { + psDB *dbh; newExpRow *object; @@ -80,5 +146,5 @@ } - object = newExpRowAlloc("a string", "a string", "a string", "a string", "a string", -32); + object = newExpRowAlloc(64, "a string", "a string", "a string", "0001-01-01T00:00:00Z", "a string", -32); if (!object) { exit(EXIT_FAILURE); Index: trunk/ippdb/tests/metadatafromobject.c =================================================================== --- trunk/ippdb/tests/metadatafromobject.c (revision 9970) +++ trunk/ippdb/tests/metadatafromobject.c (revision 10060) @@ -13,5 +13,5 @@ bool status; - object = summitExpRowAlloc("a string", "a string", "a string", "0001-01-01T00:00:00Z", "a string", "a string"); + object = summitExpRowAlloc("a string", "a string", "a string", "0001-01-01T00:00:00Z", "a string", "a string", -32); if (!object) { exit(EXIT_FAILURE); @@ -48,4 +48,61 @@ exit(EXIT_FAILURE); } + if (!psMetadataLookupS32(&status, md, "imfiles") == -32) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + } + + { + psMetadata *md; + summitImfileRow *object; + bool status; + + object = summitImfileRowAlloc("a string", "a string", "a string", -32, "a string", "a string", "a string", "a string"); + if (!object) { + exit(EXIT_FAILURE); + } + + md = summitImfileMetadataFromObject(object); + if (!md) { + exit(EXIT_FAILURE); + } + + psFree(object); + + if (strncmp(psMetadataLookupPtr(&status, md, "exp_id"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "camera"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "telescope"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupS32(&status, md, "bytes") == -32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "md5sum"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "class"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "class_id"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "uri"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } psFree(md); @@ -57,5 +114,5 @@ bool status; - object = pzPendingExpRowAlloc("a string", "a string", "a string", "a string", -32); + object = pzPendingExpRowAlloc("a string", "a string", "a string"); if (!object) { exit(EXIT_FAILURE); @@ -81,12 +138,4 @@ exit(EXIT_FAILURE); } - if (strncmp(psMetadataLookupPtr(&status, md, "exp_type"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupS32(&status, md, "imfiles") == -32) { - psFree(md); - exit(EXIT_FAILURE); - } psFree(md); @@ -98,5 +147,5 @@ bool status; - object = pzPendingImfileRowAlloc("a string", "a string", "a string", -32, "a string", "a string", "a string", "a string"); + object = pzPendingImfileRowAlloc("a string", "a string", "a string", "a string", "a string", "a string"); if (!object) { exit(EXIT_FAILURE); @@ -122,12 +171,4 @@ exit(EXIT_FAILURE); } - if (!psMetadataLookupS32(&status, md, "bytes") == -32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "md5sum"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } if (strncmp(psMetadataLookupPtr(&status, md, "class"), "a string", MAX_STRING_LENGTH)) { psFree(md); @@ -138,4 +179,86 @@ exit(EXIT_FAILURE); } + if (strncmp(psMetadataLookupPtr(&status, md, "exp_tag"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + } + + { + psMetadata *md; + pzDoneExpRow *object; + bool status; + + object = pzDoneExpRowAlloc("a string", "a string", "a string"); + if (!object) { + exit(EXIT_FAILURE); + } + + md = pzDoneExpMetadataFromObject(object); + if (!md) { + exit(EXIT_FAILURE); + } + + psFree(object); + + if (strncmp(psMetadataLookupPtr(&status, md, "exp_id"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "camera"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "telescope"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + } + + { + psMetadata *md; + pzDoneImfileRow *object; + bool status; + + object = pzDoneImfileRowAlloc("a string", "a string", "a string", "a string", "a string", "a string", "a string"); + if (!object) { + exit(EXIT_FAILURE); + } + + md = pzDoneImfileMetadataFromObject(object); + if (!md) { + exit(EXIT_FAILURE); + } + + psFree(object); + + if (strncmp(psMetadataLookupPtr(&status, md, "exp_id"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "camera"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "telescope"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "class"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "class_id"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "exp_tag"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } if (strncmp(psMetadataLookupPtr(&status, md, "uri"), "a string", MAX_STRING_LENGTH)) { psFree(md); @@ -151,5 +274,5 @@ bool status; - object = newExpRowAlloc("a string", "a string", "a string", "a string", "a string", -32); + object = newExpRowAlloc(64, "a string", "a string", "a string", "0001-01-01T00:00:00Z", "a string", -32); if (!object) { exit(EXIT_FAILURE); @@ -163,5 +286,4 @@ psFree(object); - if (strncmp(psMetadataLookupPtr(&status, md, "exp_tag"), "a string", MAX_STRING_LENGTH)) { psFree(md); exit(EXIT_FAILURE); @@ -176,4 +298,7 @@ } if (strncmp(psMetadataLookupPtr(&status, md, "telescope"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } psFree(md); exit(EXIT_FAILURE); Index: trunk/ippdb/tests/objectfrommetadata.c =================================================================== --- trunk/ippdb/tests/objectfrommetadata.c (revision 9970) +++ trunk/ippdb/tests/objectfrommetadata.c (revision 10060) @@ -36,4 +36,8 @@ exit(EXIT_FAILURE); } + if (!psMetadataAddS32(md, PS_LIST_TAIL, "imfiles", 0, NULL, -32)) { + psFree(md); + exit(EXIT_FAILURE); + } object = summitExpObjectFromMetadata(md); @@ -68,4 +72,90 @@ exit(EXIT_FAILURE); } + if (!object->imfiles == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + psMetadata *md; + summitImfileRow *object; + + md = psMetadataAlloc(); + if (!psMetadataAddStr(md, PS_LIST_TAIL, "exp_id", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "camera", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "telescope", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddS32(md, PS_LIST_TAIL, "bytes", 0, NULL, -32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "md5sum", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "class_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); + } + + object = summitImfileObjectFromMetadata(md); + if (!object) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + + if (strncmp(object->exp_id, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->camera, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->telescope, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->bytes == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->md5sum, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->class, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->class_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); + } psFree(object); @@ -89,4 +179,234 @@ exit(EXIT_FAILURE); } + + object = pzPendingExpObjectFromMetadata(md); + if (!object) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + + if (strncmp(object->exp_id, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->camera, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->telescope, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + psMetadata *md; + pzPendingImfileRow *object; + + md = psMetadataAlloc(); + if (!psMetadataAddStr(md, PS_LIST_TAIL, "exp_id", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "camera", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "telescope", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "class_id", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "exp_tag", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + + object = pzPendingImfileObjectFromMetadata(md); + if (!object) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + + if (strncmp(object->exp_id, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->camera, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->telescope, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->class, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->class_id, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->exp_tag, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + psMetadata *md; + pzDoneExpRow *object; + + md = psMetadataAlloc(); + if (!psMetadataAddStr(md, PS_LIST_TAIL, "exp_id", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "camera", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "telescope", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + + object = pzDoneExpObjectFromMetadata(md); + if (!object) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + + if (strncmp(object->exp_id, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->camera, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->telescope, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + psMetadata *md; + pzDoneImfileRow *object; + + md = psMetadataAlloc(); + if (!psMetadataAddStr(md, PS_LIST_TAIL, "exp_id", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "camera", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "telescope", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "class_id", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "exp_tag", 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); + } + + object = pzDoneImfileObjectFromMetadata(md); + if (!object) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + + if (strncmp(object->exp_id, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->camera, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->telescope, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->class, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->class_id, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->exp_tag, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->uri, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + psMetadata *md; + newExpRow *object; + + md = psMetadataAlloc(); + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "exp_id", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "camera", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "telescope", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + psFree(md); + exit(EXIT_FAILURE); + } if (!psMetadataAddStr(md, PS_LIST_TAIL, "exp_type", 0, NULL, "a string")) { psFree(md); @@ -98,12 +418,15 @@ } - object = pzPendingExpObjectFromMetadata(md); - if (!object) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - + object = newExpObjectFromMetadata(md); + if (!object) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + + psFree(object); + exit(EXIT_FAILURE); + } if (strncmp(object->exp_id, "a string", MAX_STRING_LENGTH)) { psFree(object); @@ -118,149 +441,4 @@ exit(EXIT_FAILURE); } - if (strncmp(object->exp_type, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->imfiles == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - psMetadata *md; - pzPendingImfileRow *object; - - md = psMetadataAlloc(); - if (!psMetadataAddStr(md, PS_LIST_TAIL, "exp_id", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "camera", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "telescope", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddS32(md, PS_LIST_TAIL, "bytes", 0, NULL, -32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "md5sum", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "class_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); - } - - object = pzPendingImfileObjectFromMetadata(md); - if (!object) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - - if (strncmp(object->exp_id, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->camera, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->telescope, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->bytes == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->md5sum, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->class, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->class_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); - } - - psFree(object); - } - - { - psMetadata *md; - newExpRow *object; - - md = psMetadataAlloc(); - if (!psMetadataAddStr(md, PS_LIST_TAIL, "exp_tag", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "exp_id", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "camera", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "telescope", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "exp_type", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddS32(md, PS_LIST_TAIL, "imfiles", 0, NULL, -32)) { - psFree(md); - exit(EXIT_FAILURE); - } - - object = newExpObjectFromMetadata(md); - if (!object) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - - if (strncmp(object->exp_tag, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->exp_id, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->camera, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->telescope, "a string", MAX_STRING_LENGTH)) { psFree(object); exit(EXIT_FAILURE); Index: trunk/ippdb/tests/selectrowsfits.c =================================================================== --- trunk/ippdb/tests/selectrowsfits.c (revision 9970) +++ trunk/ippdb/tests/selectrowsfits.c (revision 10060) @@ -43,4 +43,26 @@ } + if (!summitImfileSelectRowsFits(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 (!pzPendingExpSelectRowsFits(dbh, fits, NULL, 1)) { exit(EXIT_FAILURE); @@ -66,4 +88,48 @@ if (!pzPendingImfileSelectRowsFits(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 (!pzDoneExpSelectRowsFits(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 (!pzDoneImfileSelectRowsFits(dbh, fits, NULL, 1)) { exit(EXIT_FAILURE); }