Index: trunk/ippdb/tests/alloc.c =================================================================== --- trunk/ippdb/tests/alloc.c (revision 11193) +++ trunk/ippdb/tests/alloc.c (revision 11679) @@ -17,4 +17,5 @@ } + if (!object->counter == 64) { psFree(object); exit(EXIT_FAILURE); @@ -399,4 +400,5 @@ exit(EXIT_FAILURE); } + if (!object->fault == -16) { psFree(object); exit(EXIT_FAILURE); @@ -490,4 +492,5 @@ exit(EXIT_FAILURE); } + if (!object->fault == -16) { psFree(object); exit(EXIT_FAILURE); @@ -691,4 +694,5 @@ exit(EXIT_FAILURE); } + if (!object->fault == -16) { psFree(object); exit(EXIT_FAILURE); @@ -800,4 +804,5 @@ exit(EXIT_FAILURE); } + if (!object->fault == -16) { psFree(object); exit(EXIT_FAILURE); @@ -1002,4 +1007,5 @@ exit(EXIT_FAILURE); } + if (!object->fault == -16) { psFree(object); exit(EXIT_FAILURE); @@ -1050,4 +1056,5 @@ exit(EXIT_FAILURE); } + if (!object->fault == -16) { psFree(object); exit(EXIT_FAILURE); @@ -1098,4 +1105,5 @@ exit(EXIT_FAILURE); } + if (!object->fault == -16) { psFree(object); exit(EXIT_FAILURE); @@ -1130,4 +1138,5 @@ exit(EXIT_FAILURE); } + if (!object->fault == -16) { psFree(object); exit(EXIT_FAILURE); @@ -1182,4 +1191,5 @@ exit(EXIT_FAILURE); } + if (!object->fault == -16) { psFree(object); exit(EXIT_FAILURE); @@ -1230,4 +1240,5 @@ exit(EXIT_FAILURE); } + if (!object->fault == -16) { psFree(object); exit(EXIT_FAILURE); @@ -1290,4 +1301,5 @@ exit(EXIT_FAILURE); } + if (!object->fault == -16) { psFree(object); exit(EXIT_FAILURE); @@ -1346,4 +1358,5 @@ exit(EXIT_FAILURE); } + if (!object->fault == -16) { psFree(object); exit(EXIT_FAILURE); @@ -1386,25 +1399,22 @@ exit(EXIT_FAILURE); } - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - p4RunRow *object; - - object = p4RunRowAlloc(-32, "a string", "a string", "a string", "a string", "a string", "a string", 64.64, 64.64, "a string", "a string" ); - - if (!object) { - exit(EXIT_FAILURE); - } - - if (!object->p4_id == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->survey_mode, "a string", MAX_STRING_LENGTH)) { + if (!object->fault == -16) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + p4aRunRow *object; + + object = p4aRunRowAlloc(-32, "a string", "a string", true ); + + if (!object) { + exit(EXIT_FAILURE); + } + + if (!object->p4a_id == -32) { psFree(object); exit(EXIT_FAILURE); @@ -1418,5 +1428,47 @@ exit(EXIT_FAILURE); } - if (strncmp(object->filter, "a string", MAX_STRING_LENGTH)) { + if (!object->magic == true) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + p4aInputExpRow *object; + + object = p4aInputExpRowAlloc(-32, "a string", -32 ); + + if (!object) { + exit(EXIT_FAILURE); + } + + if (!object->p4a_id == -32) { + psFree(object); + 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); + } + + psFree(object); + } + + { + p4aScfileRow *object; + + object = p4aScfileRowAlloc(-32, "a string", "a string", "a string", -32, "a string", 64.64, 64.64 ); + + if (!object) { + exit(EXIT_FAILURE); + } + + if (!object->p4a_id == -32) { psFree(object); exit(EXIT_FAILURE); @@ -1430,37 +1482,4 @@ exit(EXIT_FAILURE); } - if (!object->ra == 64.64) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->decl == 64.64) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->input_ss, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->output_ss, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - p4InputImfileRow *object; - - object = p4InputImfileRowAlloc(-32, "a string", -32, "a string" ); - - if (!object) { - exit(EXIT_FAILURE); - } - - if (!object->p4_id == -32) { - psFree(object); - exit(EXIT_FAILURE); - } if (strncmp(object->exp_tag, "a string", MAX_STRING_LENGTH)) { psFree(object); @@ -1471,153 +1490,293 @@ 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); + } + + { + p4bRunRow *object; + + object = p4bRunRowAlloc(-32, "a string", "a string", true ); + + if (!object) { + exit(EXIT_FAILURE); + } + + if (!object->p4b_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 (!object->magic == true) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + p4bInputScfileRow *object; + + object = p4bInputScfileRowAlloc(-32, "a string", "a string", "a string", -32, "a string" ); + + if (!object) { + exit(EXIT_FAILURE); + } + + if (!object->p4b_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->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->kind, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + p4bDiffScfileRow *object; + + object = p4bDiffScfileRowAlloc(-32, "a string", "a string", "a string", -32, "a string", 64.64, 64.64 ); + + if (!object) { + exit(EXIT_FAILURE); + } + + if (!object->p4b_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->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); + 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); + } + + { + p4cRunRow *object; + + object = p4cRunRowAlloc(-32, "a string", "a string", true ); + + if (!object) { + exit(EXIT_FAILURE); + } + + if (!object->p4c_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 (!object->magic == true) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + p4cInputExpRow *object; + + object = p4cInputExpRowAlloc(-32, "a string", -32 ); + + if (!object) { + exit(EXIT_FAILURE); + } + + if (!object->p4c_id == -32) { + psFree(object); + 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); + } + + psFree(object); + } + + { + p4MagicMaskImfileRow *object; + + object = p4MagicMaskImfileRowAlloc(-32, "a string", -32, "a string", "a string" ); + + if (!object) { + exit(EXIT_FAILURE); + } + + if (!object->p4c_id == -32) { + psFree(object); + 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->class_id, "a string", MAX_STRING_LENGTH)) { psFree(object); exit(EXIT_FAILURE); } - - psFree(object); - } - - { - p4WarpedImfileRow *object; - - object = p4WarpedImfileRowAlloc(-32, "a string", -32, "a string", "a string", "a string", "a string" ); - - if (!object) { - exit(EXIT_FAILURE); - } - - if (!object->p4_id == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->exp_tag, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->p3_version == -32) { + if (strncmp(object->uri, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + skyCellRow *object; + + object = skyCellRowAlloc("a string", "a string", 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64 ); + + if (!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 (!object->ra1 == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->decl1 == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->ra2 == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->decl2 == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->ra3 == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->decl3 == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->ra4 == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->decl4 == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + skyCellMapRow *object; + + object = skyCellMapRowAlloc("a string", "a string", "a string", "a string" ); + + if (!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->exp_tag, "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); - } - if (strncmp(object->b1_uri, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->b2_uri, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - p4StackedImfileRow *object; - - object = p4StackedImfileRowAlloc(-32, "a string", "a string", "a string", "a string" ); - - if (!object) { - exit(EXIT_FAILURE); - } - - if (!object->p4_id == -32) { - 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); - } - if (strncmp(object->b1_uri, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->b2_uri, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - p4DiffImfileRow *object; - - object = p4DiffImfileRowAlloc(-32, "a string", -32, "a string", "a string", "a string", "a string" ); - - if (!object) { - exit(EXIT_FAILURE); - } - - if (!object->p4_id == -32) { - psFree(object); - 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->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); - } - if (strncmp(object->b1_uri, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->b2_uri, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - p4MagicMaskImfileRow *object; - - object = p4MagicMaskImfileRowAlloc(-32, "a string", -32, "a string", "a string" ); - - if (!object) { - exit(EXIT_FAILURE); - } - - if (!object->p4_id == -32) { - psFree(object); - 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->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); Index: trunk/ippdb/tests/createtable.c =================================================================== --- trunk/ippdb/tests/createtable.c (revision 11193) +++ trunk/ippdb/tests/createtable.c (revision 11679) @@ -478,65 +478,110 @@ } - if(!p4RunCreateTable(dbh)) { - exit(EXIT_FAILURE); - } - - psDBCleanup(dbh); - } - - { - psDB *dbh; - - dbh = psDBInit("localhost", "test", NULL, "test"); - if (!dbh) { - exit(EXIT_FAILURE); - } - - if(!p4InputImfileCreateTable(dbh)) { - exit(EXIT_FAILURE); - } - - psDBCleanup(dbh); - } - - { - psDB *dbh; - - dbh = psDBInit("localhost", "test", NULL, "test"); - if (!dbh) { - exit(EXIT_FAILURE); - } - - if(!p4WarpedImfileCreateTable(dbh)) { - exit(EXIT_FAILURE); - } - - psDBCleanup(dbh); - } - - { - psDB *dbh; - - dbh = psDBInit("localhost", "test", NULL, "test"); - if (!dbh) { - exit(EXIT_FAILURE); - } - - if(!p4StackedImfileCreateTable(dbh)) { - exit(EXIT_FAILURE); - } - - psDBCleanup(dbh); - } - - { - psDB *dbh; - - dbh = psDBInit("localhost", "test", NULL, "test"); - if (!dbh) { - exit(EXIT_FAILURE); - } - - if(!p4DiffImfileCreateTable(dbh)) { + if(!p4aRunCreateTable(dbh)) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if(!p4aInputExpCreateTable(dbh)) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if(!p4aScfileCreateTable(dbh)) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if(!p4bRunCreateTable(dbh)) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if(!p4bInputScfileCreateTable(dbh)) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if(!p4bDiffScfileCreateTable(dbh)) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if(!p4cRunCreateTable(dbh)) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if(!p4cInputExpCreateTable(dbh)) { exit(EXIT_FAILURE); } @@ -554,4 +599,34 @@ if(!p4MagicMaskImfileCreateTable(dbh)) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if(!skyCellCreateTable(dbh)) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if(!skyCellMapCreateTable(dbh)) { exit(EXIT_FAILURE); } Index: trunk/ippdb/tests/dbcleanup.c =================================================================== --- trunk/ippdb/tests/dbcleanup.c (revision 11193) +++ trunk/ippdb/tests/dbcleanup.c (revision 11679) @@ -6,5 +6,5 @@ psDB *dbh; - dbh = psDBInit("localhost", "test", NULL, "test"); + dbh = psDBInit("localhost", "test", NULL, "test", 0); if (!dbh) { exit(EXIT_FAILURE); @@ -42,10 +42,15 @@ p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS detResidExp"); p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS detRunSummary"); - p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4Run"); - p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4InputImfile"); - p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4WarpedImfile"); - p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4StackedImfile"); - p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4DiffImfile"); + p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4aRun"); + p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4aInputExp"); + p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4aScfile"); + p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4bRun"); + p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4bInputScfile"); + p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4bDiffScfile"); + p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4cRun"); + p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4cInputExp"); p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4MagicMaskImfile"); + p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS skyCell"); + p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS skyCellMap"); psDBCleanup(dbh); Index: trunk/ippdb/tests/dbsetup.c =================================================================== --- trunk/ippdb/tests/dbsetup.c (revision 11193) +++ trunk/ippdb/tests/dbsetup.c (revision 11679) @@ -7,5 +7,5 @@ psDB *dbh; - dbh = psDBInit("localhost", "test", NULL, "test"); + dbh = psDBInit("localhost", "test", NULL, "test", 0); if (!dbh) { exit(EXIT_FAILURE); @@ -106,21 +106,36 @@ detRunSummaryCreateTable(dbh); - p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4Run"); - p4RunCreateTable(dbh); + p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4aRun"); + p4aRunCreateTable(dbh); - p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4InputImfile"); - p4InputImfileCreateTable(dbh); + p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4aInputExp"); + p4aInputExpCreateTable(dbh); - p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4WarpedImfile"); - p4WarpedImfileCreateTable(dbh); + p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4aScfile"); + p4aScfileCreateTable(dbh); - p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4StackedImfile"); - p4StackedImfileCreateTable(dbh); + p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4bRun"); + p4bRunCreateTable(dbh); - p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4DiffImfile"); - p4DiffImfileCreateTable(dbh); + p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4bInputScfile"); + p4bInputScfileCreateTable(dbh); + + p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4bDiffScfile"); + p4bDiffScfileCreateTable(dbh); + + p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4cRun"); + p4cRunCreateTable(dbh); + + p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4cInputExp"); + p4cInputExpCreateTable(dbh); p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4MagicMaskImfile"); p4MagicMaskImfileCreateTable(dbh); + + p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS skyCell"); + skyCellCreateTable(dbh); + + p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS skyCellMap"); + skyCellMapCreateTable(dbh); psDBCleanup(dbh); Index: trunk/ippdb/tests/droptable.c =================================================================== --- trunk/ippdb/tests/droptable.c (revision 11193) +++ trunk/ippdb/tests/droptable.c (revision 11679) @@ -478,65 +478,110 @@ } - if (!p4RunDropTable(dbh)) { - exit(EXIT_FAILURE); - } - - psDBCleanup(dbh); - } - - { - psDB *dbh; - - dbh = psDBInit("localhost", "test", NULL, "test"); - if (!dbh) { - exit(EXIT_FAILURE); - } - - if (!p4InputImfileDropTable(dbh)) { - exit(EXIT_FAILURE); - } - - psDBCleanup(dbh); - } - - { - psDB *dbh; - - dbh = psDBInit("localhost", "test", NULL, "test"); - if (!dbh) { - exit(EXIT_FAILURE); - } - - if (!p4WarpedImfileDropTable(dbh)) { - exit(EXIT_FAILURE); - } - - psDBCleanup(dbh); - } - - { - psDB *dbh; - - dbh = psDBInit("localhost", "test", NULL, "test"); - if (!dbh) { - exit(EXIT_FAILURE); - } - - if (!p4StackedImfileDropTable(dbh)) { - exit(EXIT_FAILURE); - } - - psDBCleanup(dbh); - } - - { - psDB *dbh; - - dbh = psDBInit("localhost", "test", NULL, "test"); - if (!dbh) { - exit(EXIT_FAILURE); - } - - if (!p4DiffImfileDropTable(dbh)) { + if (!p4aRunDropTable(dbh)) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if (!p4aInputExpDropTable(dbh)) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if (!p4aScfileDropTable(dbh)) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if (!p4bRunDropTable(dbh)) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if (!p4bInputScfileDropTable(dbh)) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if (!p4bDiffScfileDropTable(dbh)) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if (!p4cRunDropTable(dbh)) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if (!p4cInputExpDropTable(dbh)) { exit(EXIT_FAILURE); } @@ -554,4 +599,34 @@ if (!p4MagicMaskImfileDropTable(dbh)) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if (!skyCellDropTable(dbh)) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if (!skyCellMapDropTable(dbh)) { exit(EXIT_FAILURE); } Index: trunk/ippdb/tests/insert.c =================================================================== --- trunk/ippdb/tests/insert.c (revision 11193) +++ trunk/ippdb/tests/insert.c (revision 11679) @@ -478,65 +478,110 @@ } - if (!p4RunInsert(dbh, -32, "a string", "a string", "a string", "a string", "a string", "a string", 64.64, 64.64, "a string", "a string")) { - exit(EXIT_FAILURE); - } - - psDBCleanup(dbh); - } - - { - psDB *dbh; - - dbh = psDBInit("localhost", "test", NULL, "test"); - if (!dbh) { - exit(EXIT_FAILURE); - } - - if (!p4InputImfileInsert(dbh, -32, "a string", -32, "a string")) { - exit(EXIT_FAILURE); - } - - psDBCleanup(dbh); - } - - { - psDB *dbh; - - dbh = psDBInit("localhost", "test", NULL, "test"); - if (!dbh) { - exit(EXIT_FAILURE); - } - - if (!p4WarpedImfileInsert(dbh, -32, "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 (!p4StackedImfileInsert(dbh, -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 (!p4DiffImfileInsert(dbh, -32, "a string", -32, "a string", "a string", "a string", "a string")) { + if (!p4aRunInsert(dbh, -32, "a string", "a string", true)) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if (!p4aInputExpInsert(dbh, -32, "a string", -32)) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if (!p4aScfileInsert(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 (!p4bRunInsert(dbh, -32, "a string", "a string", true)) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if (!p4bInputScfileInsert(dbh, -32, "a string", "a string", "a string", -32, "a string")) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if (!p4bDiffScfileInsert(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 (!p4cRunInsert(dbh, -32, "a string", "a string", true)) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if (!p4cInputExpInsert(dbh, -32, "a string", -32)) { exit(EXIT_FAILURE); } @@ -554,4 +599,34 @@ if (!p4MagicMaskImfileInsert(dbh, -32, "a string", -32, "a string", "a string")) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if (!skyCellInsert(dbh, "a string", "a string", 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64)) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if (!skyCellMapInsert(dbh, "a string", "a string", "a string", "a string")) { exit(EXIT_FAILURE); } Index: trunk/ippdb/tests/insertfits.c =================================================================== --- trunk/ippdb/tests/insertfits.c (revision 11193) +++ trunk/ippdb/tests/insertfits.c (revision 11679) @@ -830,109 +830,187 @@ } - if (!p4RunInsertFits(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 (!p4InputImfileInsertFits(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 (!p4WarpedImfileInsertFits(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 (!p4StackedImfileInsertFits(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 (!p4DiffImfileInsertFits(dbh, fits)) { + if (!p4aRunInsertFits(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 (!p4aInputExpInsertFits(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 (!p4aScfileInsertFits(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 (!p4bRunInsertFits(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 (!p4bInputScfileInsertFits(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 (!p4bDiffScfileInsertFits(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 (!p4cRunInsertFits(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 (!p4cInputExpInsertFits(dbh, fits)) { exit(EXIT_FAILURE); } @@ -961,4 +1039,56 @@ if (!p4MagicMaskImfileInsertFits(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 (!skyCellInsertFits(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 (!skyCellMapInsertFits(dbh, fits)) { exit(EXIT_FAILURE); } Index: trunk/ippdb/tests/insertobject.c =================================================================== --- trunk/ippdb/tests/insertobject.c (revision 11193) +++ trunk/ippdb/tests/insertobject.c (revision 11679) @@ -689,105 +689,171 @@ { psDB *dbh; - p4RunRow *object; - - dbh = psDBInit("localhost", "test", NULL, "test"); - if (!dbh) { - exit(EXIT_FAILURE); - } - - object = p4RunRowAlloc(-32, "a string", "a string", "a string", "a string", "a string", "a string", 64.64, 64.64, "a string", "a string"); - if (!object) { - exit(EXIT_FAILURE); - } - - if (!p4RunInsertObject(dbh, object)) { - exit(EXIT_FAILURE); - } - - psFree(object); - psDBCleanup(dbh); - } - - { - psDB *dbh; - p4InputImfileRow *object; - - dbh = psDBInit("localhost", "test", NULL, "test"); - if (!dbh) { - exit(EXIT_FAILURE); - } - - object = p4InputImfileRowAlloc(-32, "a string", -32, "a string"); - if (!object) { - exit(EXIT_FAILURE); - } - - if (!p4InputImfileInsertObject(dbh, object)) { - exit(EXIT_FAILURE); - } - - psFree(object); - psDBCleanup(dbh); - } - - { - psDB *dbh; - p4WarpedImfileRow *object; - - dbh = psDBInit("localhost", "test", NULL, "test"); - if (!dbh) { - exit(EXIT_FAILURE); - } - - object = p4WarpedImfileRowAlloc(-32, "a string", -32, "a string", "a string", "a string", "a string"); - if (!object) { - exit(EXIT_FAILURE); - } - - if (!p4WarpedImfileInsertObject(dbh, object)) { - exit(EXIT_FAILURE); - } - - psFree(object); - psDBCleanup(dbh); - } - - { - psDB *dbh; - p4StackedImfileRow *object; - - dbh = psDBInit("localhost", "test", NULL, "test"); - if (!dbh) { - exit(EXIT_FAILURE); - } - - object = p4StackedImfileRowAlloc(-32, "a string", "a string", "a string", "a string"); - if (!object) { - exit(EXIT_FAILURE); - } - - if (!p4StackedImfileInsertObject(dbh, object)) { - exit(EXIT_FAILURE); - } - - psFree(object); - psDBCleanup(dbh); - } - - { - psDB *dbh; - p4DiffImfileRow *object; - - dbh = psDBInit("localhost", "test", NULL, "test"); - if (!dbh) { - exit(EXIT_FAILURE); - } - - object = p4DiffImfileRowAlloc(-32, "a string", -32, "a string", "a string", "a string", "a string"); - if (!object) { - exit(EXIT_FAILURE); - } - - if (!p4DiffImfileInsertObject(dbh, object)) { + p4aRunRow *object; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + object = p4aRunRowAlloc(-32, "a string", "a string", true); + if (!object) { + exit(EXIT_FAILURE); + } + + if (!p4aRunInsertObject(dbh, object)) { + exit(EXIT_FAILURE); + } + + psFree(object); + psDBCleanup(dbh); + } + + { + psDB *dbh; + p4aInputExpRow *object; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + object = p4aInputExpRowAlloc(-32, "a string", -32); + if (!object) { + exit(EXIT_FAILURE); + } + + if (!p4aInputExpInsertObject(dbh, object)) { + exit(EXIT_FAILURE); + } + + psFree(object); + psDBCleanup(dbh); + } + + { + psDB *dbh; + p4aScfileRow *object; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + object = p4aScfileRowAlloc(-32, "a string", "a string", "a string", -32, "a string", 64.64, 64.64); + if (!object) { + exit(EXIT_FAILURE); + } + + if (!p4aScfileInsertObject(dbh, object)) { + exit(EXIT_FAILURE); + } + + psFree(object); + psDBCleanup(dbh); + } + + { + psDB *dbh; + p4bRunRow *object; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + object = p4bRunRowAlloc(-32, "a string", "a string", true); + if (!object) { + exit(EXIT_FAILURE); + } + + if (!p4bRunInsertObject(dbh, object)) { + exit(EXIT_FAILURE); + } + + psFree(object); + psDBCleanup(dbh); + } + + { + psDB *dbh; + p4bInputScfileRow *object; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + object = p4bInputScfileRowAlloc(-32, "a string", "a string", "a string", -32, "a string"); + if (!object) { + exit(EXIT_FAILURE); + } + + if (!p4bInputScfileInsertObject(dbh, object)) { + exit(EXIT_FAILURE); + } + + psFree(object); + psDBCleanup(dbh); + } + + { + psDB *dbh; + p4bDiffScfileRow *object; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + object = p4bDiffScfileRowAlloc(-32, "a string", "a string", "a string", -32, "a string", 64.64, 64.64); + if (!object) { + exit(EXIT_FAILURE); + } + + if (!p4bDiffScfileInsertObject(dbh, object)) { + exit(EXIT_FAILURE); + } + + psFree(object); + psDBCleanup(dbh); + } + + { + psDB *dbh; + p4cRunRow *object; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + object = p4cRunRowAlloc(-32, "a string", "a string", true); + if (!object) { + exit(EXIT_FAILURE); + } + + if (!p4cRunInsertObject(dbh, object)) { + exit(EXIT_FAILURE); + } + + psFree(object); + psDBCleanup(dbh); + } + + { + psDB *dbh; + p4cInputExpRow *object; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + object = p4cInputExpRowAlloc(-32, "a string", -32); + if (!object) { + exit(EXIT_FAILURE); + } + + if (!p4cInputExpInsertObject(dbh, object)) { exit(EXIT_FAILURE); } @@ -812,4 +878,48 @@ if (!p4MagicMaskImfileInsertObject(dbh, object)) { + exit(EXIT_FAILURE); + } + + psFree(object); + psDBCleanup(dbh); + } + + { + psDB *dbh; + skyCellRow *object; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + object = skyCellRowAlloc("a string", "a string", 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64); + if (!object) { + exit(EXIT_FAILURE); + } + + if (!skyCellInsertObject(dbh, object)) { + exit(EXIT_FAILURE); + } + + psFree(object); + psDBCleanup(dbh); + } + + { + psDB *dbh; + skyCellMapRow *object; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + object = skyCellMapRowAlloc("a string", "a string", "a string", "a string"); + if (!object) { + exit(EXIT_FAILURE); + } + + if (!skyCellMapInsertObject(dbh, object)) { exit(EXIT_FAILURE); } Index: trunk/ippdb/tests/metadatafromobject.c =================================================================== --- trunk/ippdb/tests/metadatafromobject.c (revision 11193) +++ trunk/ippdb/tests/metadatafromobject.c (revision 11679) @@ -1643,24 +1643,20 @@ { psMetadata *md; - p4RunRow *object; - bool status; - - object = p4RunRowAlloc(-32, "a string", "a string", "a string", "a string", "a string", "a string", 64.64, 64.64, "a string", "a string"); - if (!object) { - exit(EXIT_FAILURE); - } - - md = p4RunMetadataFromObject(object); - if (!md) { - exit(EXIT_FAILURE); - } - - psFree(object); - - if (!psMetadataLookupS32(&status, md, "p4_id") == -32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "survey_mode"), "a string", MAX_STRING_LENGTH)) { + p4aRunRow *object; + bool status; + + object = p4aRunRowAlloc(-32, "a string", "a string", true); + if (!object) { + exit(EXIT_FAILURE); + } + + md = p4aRunMetadataFromObject(object); + if (!md) { + exit(EXIT_FAILURE); + } + + psFree(object); + + if (!psMetadataLookupS32(&status, md, "p4a_id") == -32) { psFree(md); exit(EXIT_FAILURE); @@ -1674,5 +1670,63 @@ exit(EXIT_FAILURE); } - if (strncmp(psMetadataLookupPtr(&status, md, "filter"), "a string", MAX_STRING_LENGTH)) { + if (!psMetadataLookupBool(&status, md, "magic") == true) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + } + + { + psMetadata *md; + p4aInputExpRow *object; + bool status; + + object = p4aInputExpRowAlloc(-32, "a string", -32); + if (!object) { + exit(EXIT_FAILURE); + } + + md = p4aInputExpMetadataFromObject(object); + if (!md) { + exit(EXIT_FAILURE); + } + + psFree(object); + + if (!psMetadataLookupS32(&status, md, "p4a_id") == -32) { + psFree(md); + 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); + } + + psFree(md); + } + + { + psMetadata *md; + p4aScfileRow *object; + bool status; + + object = p4aScfileRowAlloc(-32, "a string", "a string", "a string", -32, "a string", 64.64, 64.64); + if (!object) { + exit(EXIT_FAILURE); + } + + md = p4aScfileMetadataFromObject(object); + if (!md) { + exit(EXIT_FAILURE); + } + + psFree(object); + + if (!psMetadataLookupS32(&status, md, "p4a_id") == -32) { psFree(md); exit(EXIT_FAILURE); @@ -1686,45 +1740,4 @@ exit(EXIT_FAILURE); } - if (!psMetadataLookupF64(&status, md, "ra") == 64.64) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupF64(&status, md, "decl") == 64.64) { - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "input_ss"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "output_ss"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - } - - { - psMetadata *md; - p4InputImfileRow *object; - bool status; - - object = p4InputImfileRowAlloc(-32, "a string", -32, "a string"); - if (!object) { - exit(EXIT_FAILURE); - } - - md = p4InputImfileMetadataFromObject(object); - if (!md) { - exit(EXIT_FAILURE); - } - - psFree(object); - - if (!psMetadataLookupS32(&status, md, "p4_id") == -32) { - psFree(md); - exit(EXIT_FAILURE); - } if (strncmp(psMetadataLookupPtr(&status, md, "exp_tag"), "a string", MAX_STRING_LENGTH)) { psFree(md); @@ -1735,185 +1748,357 @@ 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; + p4bRunRow *object; + bool status; + + object = p4bRunRowAlloc(-32, "a string", "a string", true); + if (!object) { + exit(EXIT_FAILURE); + } + + md = p4bRunMetadataFromObject(object); + if (!md) { + exit(EXIT_FAILURE); + } + + psFree(object); + + if (!psMetadataLookupS32(&status, md, "p4b_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 (!psMetadataLookupBool(&status, md, "magic") == true) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + } + + { + psMetadata *md; + p4bInputScfileRow *object; + bool status; + + object = p4bInputScfileRowAlloc(-32, "a string", "a string", "a string", -32, "a string"); + if (!object) { + exit(EXIT_FAILURE); + } + + md = p4bInputScfileMetadataFromObject(object); + if (!md) { + exit(EXIT_FAILURE); + } + + psFree(object); + + if (!psMetadataLookupS32(&status, md, "p4b_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); + } + 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, "kind"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + } + + { + psMetadata *md; + p4bDiffScfileRow *object; + bool status; + + object = p4bDiffScfileRowAlloc(-32, "a string", "a string", "a string", -32, "a string", 64.64, 64.64); + if (!object) { + exit(EXIT_FAILURE); + } + + md = p4bDiffScfileMetadataFromObject(object); + if (!md) { + exit(EXIT_FAILURE); + } + + psFree(object); + + if (!psMetadataLookupS32(&status, md, "p4b_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); + } + 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); + 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; + p4cRunRow *object; + bool status; + + object = p4cRunRowAlloc(-32, "a string", "a string", true); + if (!object) { + exit(EXIT_FAILURE); + } + + md = p4cRunMetadataFromObject(object); + if (!md) { + exit(EXIT_FAILURE); + } + + psFree(object); + + if (!psMetadataLookupS32(&status, md, "p4c_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 (!psMetadataLookupBool(&status, md, "magic") == true) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + } + + { + psMetadata *md; + p4cInputExpRow *object; + bool status; + + object = p4cInputExpRowAlloc(-32, "a string", -32); + if (!object) { + exit(EXIT_FAILURE); + } + + md = p4cInputExpMetadataFromObject(object); + if (!md) { + exit(EXIT_FAILURE); + } + + psFree(object); + + if (!psMetadataLookupS32(&status, md, "p4c_id") == -32) { + psFree(md); + 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); + } + + psFree(md); + } + + { + psMetadata *md; + p4MagicMaskImfileRow *object; + bool status; + + object = p4MagicMaskImfileRowAlloc(-32, "a string", -32, "a string", "a string"); + if (!object) { + exit(EXIT_FAILURE); + } + + md = p4MagicMaskImfileMetadataFromObject(object); + if (!md) { + exit(EXIT_FAILURE); + } + + psFree(object); + + if (!psMetadataLookupS32(&status, md, "p4c_id") == -32) { + psFree(md); + 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, "class_id"), "a string", MAX_STRING_LENGTH)) { psFree(md); exit(EXIT_FAILURE); } - - psFree(md); - } - - { - psMetadata *md; - p4WarpedImfileRow *object; - bool status; - - object = p4WarpedImfileRowAlloc(-32, "a string", -32, "a string", "a string", "a string", "a string"); - if (!object) { - exit(EXIT_FAILURE); - } - - md = p4WarpedImfileMetadataFromObject(object); - if (!md) { - exit(EXIT_FAILURE); - } - - psFree(object); - - if (!psMetadataLookupS32(&status, md, "p4_id") == -32) { - psFree(md); - 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) { + if (strncmp(psMetadataLookupPtr(&status, md, "uri"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + } + + { + psMetadata *md; + skyCellRow *object; + bool status; + + object = skyCellRowAlloc("a string", "a string", 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64); + if (!object) { + exit(EXIT_FAILURE); + } + + md = skyCellMetadataFromObject(object); + if (!md) { + exit(EXIT_FAILURE); + } + + psFree(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); + } + if (!psMetadataLookupF64(&status, md, "ra1") == 64.64) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF64(&status, md, "decl1") == 64.64) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF64(&status, md, "ra2") == 64.64) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF64(&status, md, "decl2") == 64.64) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF64(&status, md, "ra3") == 64.64) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF64(&status, md, "decl3") == 64.64) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF64(&status, md, "ra4") == 64.64) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF64(&status, md, "decl4") == 64.64) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + } + + { + psMetadata *md; + skyCellMapRow *object; + bool status; + + object = skyCellMapRowAlloc("a string", "a string", "a string", "a string"); + if (!object) { + exit(EXIT_FAILURE); + } + + md = skyCellMapMetadataFromObject(object); + if (!md) { + exit(EXIT_FAILURE); + } + + psFree(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); + } + if (strncmp(psMetadataLookupPtr(&status, md, "exp_tag"), "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); - } - if (strncmp(psMetadataLookupPtr(&status, md, "b1_uri"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "b2_uri"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - } - - { - psMetadata *md; - p4StackedImfileRow *object; - bool status; - - object = p4StackedImfileRowAlloc(-32, "a string", "a string", "a string", "a string"); - if (!object) { - exit(EXIT_FAILURE); - } - - md = p4StackedImfileMetadataFromObject(object); - if (!md) { - exit(EXIT_FAILURE); - } - - psFree(object); - - if (!psMetadataLookupS32(&status, md, "p4_id") == -32) { - 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); - } - if (strncmp(psMetadataLookupPtr(&status, md, "b1_uri"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "b2_uri"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - } - - { - psMetadata *md; - p4DiffImfileRow *object; - bool status; - - object = p4DiffImfileRowAlloc(-32, "a string", -32, "a string", "a string", "a string", "a string"); - if (!object) { - exit(EXIT_FAILURE); - } - - md = p4DiffImfileMetadataFromObject(object); - if (!md) { - exit(EXIT_FAILURE); - } - - psFree(object); - - if (!psMetadataLookupS32(&status, md, "p4_id") == -32) { - psFree(md); - 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, "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); - } - if (strncmp(psMetadataLookupPtr(&status, md, "b1_uri"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "b2_uri"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - } - - { - psMetadata *md; - p4MagicMaskImfileRow *object; - bool status; - - object = p4MagicMaskImfileRowAlloc(-32, "a string", -32, "a string", "a string"); - if (!object) { - exit(EXIT_FAILURE); - } - - md = p4MagicMaskImfileMetadataFromObject(object); - if (!md) { - exit(EXIT_FAILURE); - } - - psFree(object); - - if (!psMetadataLookupS32(&status, md, "p4_id") == -32) { - psFree(md); - 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, "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); Index: trunk/ippdb/tests/objectfrommetadata.c =================================================================== --- trunk/ippdb/tests/objectfrommetadata.c (revision 11193) +++ trunk/ippdb/tests/objectfrommetadata.c (revision 11679) @@ -2532,12 +2532,8 @@ { psMetadata *md; - p4RunRow *object; - - md = psMetadataAlloc(); - if (!psMetadataAddS32(md, PS_LIST_TAIL, "p4_id", 0, NULL, -32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "survey_mode", 0, NULL, "a string")) { + p4aRunRow *object; + + md = psMetadataAlloc(); + if (!psMetadataAddS32(md, PS_LIST_TAIL, "p4a_id", 0, NULL, -32)) { psFree(md); exit(EXIT_FAILURE); @@ -2551,5 +2547,85 @@ exit(EXIT_FAILURE); } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "filter", 0, NULL, "a string")) { + if (!psMetadataAdd(md, PS_LIST_TAIL, "magic", PS_DATA_BOOL, NULL, true)) { + psFree(md); + exit(EXIT_FAILURE); + } + + object = p4aRunObjectFromMetadata(md); + if (!object) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + + if (!object->p4a_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 (!object->magic == true) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + psMetadata *md; + p4aInputExpRow *object; + + md = psMetadataAlloc(); + if (!psMetadataAddS32(md, PS_LIST_TAIL, "p4a_id", 0, NULL, -32)) { + psFree(md); + 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); + } + + object = p4aInputExpObjectFromMetadata(md); + if (!object) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + + if (!object->p4a_id == -32) { + psFree(object); + 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); + } + + psFree(object); + } + + { + psMetadata *md; + p4aScfileRow *object; + + md = psMetadataAlloc(); + if (!psMetadataAddS32(md, PS_LIST_TAIL, "p4a_id", 0, NULL, -32)) { psFree(md); exit(EXIT_FAILURE); @@ -2563,34 +2639,100 @@ exit(EXIT_FAILURE); } - if (!psMetadataAddF64(md, PS_LIST_TAIL, "ra", 0, NULL, 64.64)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddF64(md, PS_LIST_TAIL, "decl", 0, NULL, 64.64)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "input_ss", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "output_ss", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - - object = p4RunObjectFromMetadata(md); - if (!object) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - - if (!object->p4_id == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->survey_mode, "a string", MAX_STRING_LENGTH)) { + 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); + 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 = p4aScfileObjectFromMetadata(md); + if (!object) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + + if (!object->p4a_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->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); + 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; + p4bRunRow *object; + + md = psMetadataAlloc(); + if (!psMetadataAddS32(md, PS_LIST_TAIL, "p4b_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 (!psMetadataAdd(md, PS_LIST_TAIL, "magic", PS_DATA_BOOL, NULL, true)) { + psFree(md); + exit(EXIT_FAILURE); + } + + object = p4bRunObjectFromMetadata(md); + if (!object) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + + if (!object->p4b_id == -32) { psFree(object); exit(EXIT_FAILURE); @@ -2604,5 +2746,51 @@ exit(EXIT_FAILURE); } - if (strncmp(object->filter, "a string", MAX_STRING_LENGTH)) { + if (!object->magic == true) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + psMetadata *md; + p4bInputScfileRow *object; + + md = psMetadataAlloc(); + if (!psMetadataAddS32(md, PS_LIST_TAIL, "p4b_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, "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, "kind", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + + object = p4bInputScfileObjectFromMetadata(md); + if (!object) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + + if (!object->p4b_id == -32) { psFree(object); exit(EXIT_FAILURE); @@ -2616,30 +2804,34 @@ exit(EXIT_FAILURE); } - if (!object->ra == 64.64) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->decl == 64.64) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->input_ss, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->output_ss, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - psMetadata *md; - p4InputImfileRow *object; - - md = psMetadataAlloc(); - if (!psMetadataAddS32(md, PS_LIST_TAIL, "p4_id", 0, NULL, -32)) { + 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->kind, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + psMetadata *md; + p4bDiffScfileRow *object; + + md = psMetadataAlloc(); + if (!psMetadataAddS32(md, PS_LIST_TAIL, "p4b_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); @@ -2653,18 +2845,188 @@ 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 = p4bDiffScfileObjectFromMetadata(md); + if (!object) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + + if (!object->p4b_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->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); + 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; + p4cRunRow *object; + + md = psMetadataAlloc(); + if (!psMetadataAddS32(md, PS_LIST_TAIL, "p4c_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 (!psMetadataAdd(md, PS_LIST_TAIL, "magic", PS_DATA_BOOL, NULL, true)) { + psFree(md); + exit(EXIT_FAILURE); + } + + object = p4cRunObjectFromMetadata(md); + if (!object) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + + if (!object->p4c_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 (!object->magic == true) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + psMetadata *md; + p4cInputExpRow *object; + + md = psMetadataAlloc(); + if (!psMetadataAddS32(md, PS_LIST_TAIL, "p4c_id", 0, NULL, -32)) { + psFree(md); + 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); + } + + object = p4cInputExpObjectFromMetadata(md); + if (!object) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + + if (!object->p4c_id == -32) { + psFree(object); + 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); + } + + psFree(object); + } + + { + psMetadata *md; + p4MagicMaskImfileRow *object; + + md = psMetadataAlloc(); + if (!psMetadataAddS32(md, PS_LIST_TAIL, "p4c_id", 0, NULL, -32)) { + psFree(md); + 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, "class_id", 0, NULL, "a string")) { psFree(md); exit(EXIT_FAILURE); } - - object = p4InputImfileObjectFromMetadata(md); - if (!object) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - - if (!object->p4_id == -32) { + if (!psMetadataAddStr(md, PS_LIST_TAIL, "uri", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + + object = p4MagicMaskImfileObjectFromMetadata(md); + if (!object) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + + if (!object->p4c_id == -32) { psFree(object); exit(EXIT_FAILURE); @@ -2682,14 +3044,120 @@ exit(EXIT_FAILURE); } - - psFree(object); - } - - { - psMetadata *md; - p4WarpedImfileRow *object; - - md = psMetadataAlloc(); - if (!psMetadataAddS32(md, PS_LIST_TAIL, "p4_id", 0, NULL, -32)) { + if (strncmp(object->uri, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + psMetadata *md; + skyCellRow *object; + + md = psMetadataAlloc(); + 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 (!psMetadataAddF64(md, PS_LIST_TAIL, "ra1", 0, NULL, 64.64)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "decl1", 0, NULL, 64.64)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "ra2", 0, NULL, 64.64)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "decl2", 0, NULL, 64.64)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "ra3", 0, NULL, 64.64)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "decl3", 0, NULL, 64.64)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "ra4", 0, NULL, 64.64)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "decl4", 0, NULL, 64.64)) { + psFree(md); + exit(EXIT_FAILURE); + } + + object = skyCellObjectFromMetadata(md); + if (!object) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + + 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 (!object->ra1 == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->decl1 == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->ra2 == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->decl2 == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->ra3 == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->decl3 == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->ra4 == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->decl4 == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + psMetadata *md; + skyCellMapRow *object; + + md = psMetadataAlloc(); + 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); @@ -2699,34 +3167,22 @@ 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, "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); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "b1_uri", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "b2_uri", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - - object = p4WarpedImfileObjectFromMetadata(md); - if (!object) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - - if (!object->p4_id == -32) { + + object = skyCellMapObjectFromMetadata(md); + if (!object) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + + 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); @@ -2736,211 +3192,5 @@ exit(EXIT_FAILURE); } - if (!object->p3_version == -32) { - 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); - } - if (strncmp(object->b1_uri, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->b2_uri, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - psMetadata *md; - p4StackedImfileRow *object; - - md = psMetadataAlloc(); - if (!psMetadataAddS32(md, PS_LIST_TAIL, "p4_id", 0, NULL, -32)) { - 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); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "b1_uri", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "b2_uri", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - - object = p4StackedImfileObjectFromMetadata(md); - if (!object) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - - if (!object->p4_id == -32) { - 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); - } - if (strncmp(object->b1_uri, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->b2_uri, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - psMetadata *md; - p4DiffImfileRow *object; - - md = psMetadataAlloc(); - if (!psMetadataAddS32(md, PS_LIST_TAIL, "p4_id", 0, NULL, -32)) { - psFree(md); - 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, "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); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "b1_uri", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "b2_uri", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - - object = p4DiffImfileObjectFromMetadata(md); - if (!object) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - - if (!object->p4_id == -32) { - psFree(object); - 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->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); - } - if (strncmp(object->b1_uri, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->b2_uri, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - psMetadata *md; - p4MagicMaskImfileRow *object; - - md = psMetadataAlloc(); - if (!psMetadataAddS32(md, PS_LIST_TAIL, "p4_id", 0, NULL, -32)) { - psFree(md); - 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, "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 = p4MagicMaskImfileObjectFromMetadata(md); - if (!object) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - - if (!object->p4_id == -32) { - psFree(object); - 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->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); Index: trunk/ippdb/tests/selectrowsfits.c =================================================================== --- trunk/ippdb/tests/selectrowsfits.c (revision 11193) +++ trunk/ippdb/tests/selectrowsfits.c (revision 11679) @@ -703,93 +703,159 @@ } - if (!p4RunSelectRowsFits(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 (!p4InputImfileSelectRowsFits(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 (!p4WarpedImfileSelectRowsFits(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 (!p4StackedImfileSelectRowsFits(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 (!p4DiffImfileSelectRowsFits(dbh, fits, NULL, 1)) { + if (!p4aRunSelectRowsFits(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 (!p4aInputExpSelectRowsFits(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 (!p4aScfileSelectRowsFits(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 (!p4bRunSelectRowsFits(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 (!p4bInputScfileSelectRowsFits(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 (!p4bDiffScfileSelectRowsFits(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 (!p4cRunSelectRowsFits(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 (!p4cInputExpSelectRowsFits(dbh, fits, NULL, 1)) { exit(EXIT_FAILURE); } @@ -814,4 +880,48 @@ if (!p4MagicMaskImfileSelectRowsFits(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 (!skyCellSelectRowsFits(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 (!skyCellMapSelectRowsFits(dbh, fits, NULL, 1)) { exit(EXIT_FAILURE); }