Index: trunk/ippdb/tests/alloc.c =================================================================== --- trunk/ippdb/tests/alloc.c (revision 8080) +++ trunk/ippdb/tests/alloc.c (revision 8085) @@ -421,5 +421,5 @@ newExpRow *object; - object = newExpRowAlloc("a string", "a string", "a string", "a string", -32, "a string" ); + object = newExpRowAlloc("a string", "a string", "a string", "a string", -32 ); if (!object) { @@ -447,22 +447,67 @@ exit(EXIT_FAILURE); } + + psFree(object); + } + + { + newImfileRow *object; + + object = newImfileRowAlloc("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->class, "a string", MAX_STRING_LENGTH)) { psFree(object); exit(EXIT_FAILURE); } - - psFree(object); - } - - { - newImfileRow *object; - - object = newImfileRowAlloc("a string", "a string", "a string", "a string" ); - - if (!object) { - exit(EXIT_FAILURE); - } - - if (strncmp(object->exp_id, "a string", MAX_STRING_LENGTH)) { + 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); + } + + { + rawDetrendExpRow *object; + + object = rawDetrendExpRowAlloc("a string", "a string", "a string", "a string", -32, "a string", "a string", 32.32, 64.64, 64.64, 32.32, 64.64 ); + + 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->exp_type, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->imfiles == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->filter, "a string", MAX_STRING_LENGTH)) { psFree(object); exit(EXIT_FAILURE); @@ -472,4 +517,106 @@ exit(EXIT_FAILURE); } + if (!object->airmass == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->ra == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->dec == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->exp_time == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->background == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + rawScienceExpRow *object; + + object = rawScienceExpRowAlloc("a string", "a string", "a string", "a string", -32, "a string", "a string", 32.32, 64.64, 64.64, 32.32, 64.64 ); + + 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->exp_type, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->imfiles == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->filter, "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 (!object->airmass == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->ra == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->dec == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->exp_time == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->background == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + rawImfileRow *object; + + object = rawImfileRowAlloc("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->class, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } if (strncmp(object->class_id, "a string", MAX_STRING_LENGTH)) { psFree(object); @@ -485,7 +632,7 @@ { - rawDetrendExpRow *object; - - object = rawDetrendExpRowAlloc("a string", "a string", "a string", "a string", -32, "a string", "a string", 32.32, 32.32, 32.32, 32.32 ); + p1PendingExpRow *object; + + object = p1PendingExpRowAlloc("a string", "a string", "a string", "a string", -32, "a string", 32.32, 64.64, 64.64, 32.32, 64.64, "a string", -32 ); if (!object) { @@ -517,17 +664,188 @@ exit(EXIT_FAILURE); } - if (strncmp(object->class, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } if (!object->airmass == 32.32) { psFree(object); exit(EXIT_FAILURE); } + if (!object->ra == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->dec == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->exp_time == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->background == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->recipe, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->p1_version == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + p2PendingExpRow *object; + + object = p2PendingExpRowAlloc("a string", "a string", "a string", "a string", -32, "a string", 32.32, 32.32, 64.64, 64.64, 64.64, "a string", -32, -32 ); + + 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->exp_type, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->imfiles == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->filter, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->airmass == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } if (!object->ra == 32.32) { psFree(object); exit(EXIT_FAILURE); } - if (!object->dec == 32.32) { + if (!object->dec == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->exp_time == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->background == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->recipe, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->p1_version == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->p2_version == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + p2PendingImfileRow *object; + + object = p2PendingImfileRowAlloc("a string", "a string", "a string", "a string", "a string", -32, -32 ); + + if (!object) { + exit(EXIT_FAILURE); + } + + if (strncmp(object->exp_id, "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->stats, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->recipe, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->p1_version == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->p2_version == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + p2DoneExpRow *object; + + object = p2DoneExpRowAlloc("a string", "a string", "a string", "a string", -32, "a string", 32.32, 64.64, 64.64, 32.32, 64.64, "a string", -32, -32 ); + + 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->exp_type, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->imfiles == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->filter, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->airmass == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->ra == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->dec == 64.64) { psFree(object); exit(EXIT_FAILURE); @@ -537,12 +855,69 @@ exit(EXIT_FAILURE); } - - psFree(object); - } - - { - rawScienceExpRow *object; - - object = rawScienceExpRowAlloc("a string", "a string", "a string", "a string", -32, "a string", "a string", 32.32, 32.32, 32.32, 32.32 ); + if (!object->background == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->recipe, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->p1_version == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->p2_version == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + p2DoneImfileRow *object; + + object = p2DoneImfileRowAlloc("a string", "a string", "a string", "a string", "a string", -32, -32 ); + + if (!object) { + exit(EXIT_FAILURE); + } + + if (strncmp(object->exp_id, "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->stats, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->recipe, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->p1_version == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->p2_version == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + p3PendingExpRow *object; + + object = p3PendingExpRowAlloc("a string", "a string", "a string", -32, "a string", 32.32, 64.64, 64.64, 32.32, 64.64, "a string", -32, -32 ); if (!object) { @@ -558,4 +933,98 @@ 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); + } + if (strncmp(object->filter, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->airmass == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->ra == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->dec == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->exp_time == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->background == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->recipe, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->p2_version == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->p3_version == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + detRunRow *object; + + object = detRunRowAlloc(-32, "a string" ); + + if (!object) { + exit(EXIT_FAILURE); + } + + if (!object->iteration == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->det_type, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + detInputExpRow *object; + + object = detInputExpRowAlloc(-32, -32, "a string", "a string", "a string", "a string", -32, "a string", 32.32, 64.64, 64.64, 32.32, 64.64 ); + + if (!object) { + exit(EXIT_FAILURE); + } + + if (!object->det_id == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->iteration == -32) { + 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); @@ -574,17 +1043,13 @@ exit(EXIT_FAILURE); } - if (strncmp(object->class, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } if (!object->airmass == 32.32) { psFree(object); exit(EXIT_FAILURE); } - if (!object->ra == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->dec == 32.32) { + if (!object->ra == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->dec == 64.64) { psFree(object); exit(EXIT_FAILURE); @@ -594,470 +1059,5 @@ exit(EXIT_FAILURE); } - - psFree(object); - } - - { - rawImfileRow *object; - - object = rawImfileRowAlloc("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->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); - } - if (strncmp(object->stats, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - p1PendingExpRow *object; - - object = p1PendingExpRowAlloc("a string", "a string", "a string", "a string", -32, "a string", "a string", 32.32, 32.32, 32.32, 32.32, "a string", -32 ); - - 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->exp_type, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->imfiles == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->filter, "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 (!object->airmass == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->ra == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->dec == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->exp_time == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->recipe, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->p1_version == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - p2PendingExpRow *object; - - object = p2PendingExpRowAlloc("a string", "a string", "a string", "a string", -32, "a string", "a string", 32.32, 32.32, 32.32, 32.32, "a string", -32, -32 ); - - 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->exp_type, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->imfiles == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->filter, "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 (!object->airmass == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->ra == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->dec == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->exp_time == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->recipe, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->p1_version == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->p2_version == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - p2PendingImfileRow *object; - - object = p2PendingImfileRowAlloc("a string", "a string", "a string", "a string", "a string", -32, -32 ); - - if (!object) { - exit(EXIT_FAILURE); - } - - if (strncmp(object->exp_id, "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->stats, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->recipe, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->p1_version == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->p2_version == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - p2DoneExpRow *object; - - object = p2DoneExpRowAlloc("a string", "a string", "a string", "a string", -32, "a string", "a string", 32.32, 32.32, 32.32, 32.32, "a string", -32, -32 ); - - 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->exp_type, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->imfiles == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->filter, "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 (!object->airmass == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->ra == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->dec == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->exp_time == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->recipe, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->p1_version == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->p2_version == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - p2DoneImfileRow *object; - - object = p2DoneImfileRowAlloc("a string", "a string", "a string", "a string", "a string", -32, -32 ); - - if (!object) { - exit(EXIT_FAILURE); - } - - if (strncmp(object->exp_id, "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->stats, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->recipe, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->p1_version == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->p2_version == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - p3PendingExpRow *object; - - object = p3PendingExpRowAlloc("a string", "a string", "a string", -32, "a string", "a string", 32.32, 32.32, 32.32, 32.32, "a string", -32, -32 ); - - 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->exp_type, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->imfiles == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->filter, "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 (!object->airmass == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->ra == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->dec == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->exp_time == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->recipe, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->p2_version == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->p3_version == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - detRunRow *object; - - object = detRunRowAlloc(-32, "a string" ); - - if (!object) { - exit(EXIT_FAILURE); - } - - if (!object->iteration == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->det_type, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - detInputExpRow *object; - - object = detInputExpRowAlloc(-32, -32, "a string", "a string", "a string", "a string", -32, "a string", "a string", 32.32, 32.32, 32.32, 32.32 ); - - if (!object) { - exit(EXIT_FAILURE); - } - - if (!object->det_id == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->iteration == -32) { - 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); - } - if (strncmp(object->exp_type, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->imfiles == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->filter, "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 (!object->airmass == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->ra == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->dec == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->exp_time == 32.32) { + if (!object->background == 64.64) { psFree(object); exit(EXIT_FAILURE); Index: trunk/ippdb/tests/insert.c =================================================================== --- trunk/ippdb/tests/insert.c (revision 8080) +++ trunk/ippdb/tests/insert.c (revision 8085) @@ -178,5 +178,5 @@ } - if (!newExpInsert(dbh, "a string", "a string", "a string", "a string", -32, "a string")) { + if (!newExpInsert(dbh, "a string", "a string", "a string", "a string", -32)) { exit(EXIT_FAILURE); } @@ -208,65 +208,65 @@ } - if (!rawDetrendExpInsert(dbh, "a string", "a string", "a string", "a string", -32, "a string", "a string", 32.32, 32.32, 32.32, 32.32)) { - exit(EXIT_FAILURE); - } - - psDBCleanup(dbh); - } - - { - psDB *dbh; - - dbh = psDBInit("localhost", "test", NULL, "test"); - if (!dbh) { - exit(EXIT_FAILURE); - } - - if (!rawScienceExpInsert(dbh, "a string", "a string", "a string", "a string", -32, "a string", "a string", 32.32, 32.32, 32.32, 32.32)) { - exit(EXIT_FAILURE); - } - - psDBCleanup(dbh); - } - - { - psDB *dbh; - - dbh = psDBInit("localhost", "test", NULL, "test"); - if (!dbh) { - exit(EXIT_FAILURE); - } - - if (!rawImfileInsert(dbh, "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 (!p1PendingExpInsert(dbh, "a string", "a string", "a string", "a string", -32, "a string", "a string", 32.32, 32.32, 32.32, 32.32, "a string", -32)) { - exit(EXIT_FAILURE); - } - - psDBCleanup(dbh); - } - - { - psDB *dbh; - - dbh = psDBInit("localhost", "test", NULL, "test"); - if (!dbh) { - exit(EXIT_FAILURE); - } - - if (!p2PendingExpInsert(dbh, "a string", "a string", "a string", "a string", -32, "a string", "a string", 32.32, 32.32, 32.32, 32.32, "a string", -32, -32)) { + if (!rawDetrendExpInsert(dbh, "a string", "a string", "a string", "a string", -32, "a string", "a string", 32.32, 64.64, 64.64, 32.32, 64.64)) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if (!rawScienceExpInsert(dbh, "a string", "a string", "a string", "a string", -32, "a string", "a string", 32.32, 64.64, 64.64, 32.32, 64.64)) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if (!rawImfileInsert(dbh, "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 (!p1PendingExpInsert(dbh, "a string", "a string", "a string", "a string", -32, "a string", 32.32, 64.64, 64.64, 32.32, 64.64, "a string", -32)) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if (!p2PendingExpInsert(dbh, "a string", "a string", "a string", "a string", -32, "a string", 32.32, 32.32, 64.64, 64.64, 64.64, "a string", -32, -32)) { exit(EXIT_FAILURE); } @@ -298,5 +298,5 @@ } - if (!p2DoneExpInsert(dbh, "a string", "a string", "a string", "a string", -32, "a string", "a string", 32.32, 32.32, 32.32, 32.32, "a string", -32, -32)) { + if (!p2DoneExpInsert(dbh, "a string", "a string", "a string", "a string", -32, "a string", 32.32, 64.64, 64.64, 32.32, 64.64, "a string", -32, -32)) { exit(EXIT_FAILURE); } @@ -328,5 +328,5 @@ } - if (!p3PendingExpInsert(dbh, "a string", "a string", "a string", -32, "a string", "a string", 32.32, 32.32, 32.32, 32.32, "a string", -32, -32)) { + if (!p3PendingExpInsert(dbh, "a string", "a string", "a string", -32, "a string", 32.32, 64.64, 64.64, 32.32, 64.64, "a string", -32, -32)) { exit(EXIT_FAILURE); } @@ -358,5 +358,5 @@ } - if (!detInputExpInsert(dbh, -32, -32, "a string", "a string", "a string", "a string", -32, "a string", "a string", 32.32, 32.32, 32.32, 32.32)) { + if (!detInputExpInsert(dbh, -32, -32, "a string", "a string", "a string", "a string", -32, "a string", 32.32, 64.64, 64.64, 32.32, 64.64)) { exit(EXIT_FAILURE); } Index: trunk/ippdb/tests/insertobject.c =================================================================== --- trunk/ippdb/tests/insertobject.c (revision 8080) +++ trunk/ippdb/tests/insertobject.c (revision 8085) @@ -256,5 +256,5 @@ } - object = newExpRowAlloc("a string", "a string", "a string", "a string", -32, "a string"); + object = newExpRowAlloc("a string", "a string", "a string", "a string", -32); if (!object) { exit(EXIT_FAILURE); @@ -300,5 +300,5 @@ } - object = rawDetrendExpRowAlloc("a string", "a string", "a string", "a string", -32, "a string", "a string", 32.32, 32.32, 32.32, 32.32); + object = rawDetrendExpRowAlloc("a string", "a string", "a string", "a string", -32, "a string", "a string", 32.32, 64.64, 64.64, 32.32, 64.64); if (!object) { exit(EXIT_FAILURE); @@ -322,5 +322,5 @@ } - object = rawScienceExpRowAlloc("a string", "a string", "a string", "a string", -32, "a string", "a string", 32.32, 32.32, 32.32, 32.32); + object = rawScienceExpRowAlloc("a string", "a string", "a string", "a string", -32, "a string", "a string", 32.32, 64.64, 64.64, 32.32, 64.64); if (!object) { exit(EXIT_FAILURE); @@ -344,5 +344,5 @@ } - object = rawImfileRowAlloc("a string", "a string", "a string", "a string", "a string"); + object = rawImfileRowAlloc("a string", "a string", "a string", "a string"); if (!object) { exit(EXIT_FAILURE); @@ -366,5 +366,5 @@ } - object = p1PendingExpRowAlloc("a string", "a string", "a string", "a string", -32, "a string", "a string", 32.32, 32.32, 32.32, 32.32, "a string", -32); + object = p1PendingExpRowAlloc("a string", "a string", "a string", "a string", -32, "a string", 32.32, 64.64, 64.64, 32.32, 64.64, "a string", -32); if (!object) { exit(EXIT_FAILURE); @@ -388,5 +388,5 @@ } - object = p2PendingExpRowAlloc("a string", "a string", "a string", "a string", -32, "a string", "a string", 32.32, 32.32, 32.32, 32.32, "a string", -32, -32); + object = p2PendingExpRowAlloc("a string", "a string", "a string", "a string", -32, "a string", 32.32, 32.32, 64.64, 64.64, 64.64, "a string", -32, -32); if (!object) { exit(EXIT_FAILURE); @@ -432,5 +432,5 @@ } - object = p2DoneExpRowAlloc("a string", "a string", "a string", "a string", -32, "a string", "a string", 32.32, 32.32, 32.32, 32.32, "a string", -32, -32); + object = p2DoneExpRowAlloc("a string", "a string", "a string", "a string", -32, "a string", 32.32, 64.64, 64.64, 32.32, 64.64, "a string", -32, -32); if (!object) { exit(EXIT_FAILURE); @@ -476,5 +476,5 @@ } - object = p3PendingExpRowAlloc("a string", "a string", "a string", -32, "a string", "a string", 32.32, 32.32, 32.32, 32.32, "a string", -32, -32); + object = p3PendingExpRowAlloc("a string", "a string", "a string", -32, "a string", 32.32, 64.64, 64.64, 32.32, 64.64, "a string", -32, -32); if (!object) { exit(EXIT_FAILURE); @@ -520,5 +520,5 @@ } - object = detInputExpRowAlloc(-32, -32, "a string", "a string", "a string", "a string", -32, "a string", "a string", 32.32, 32.32, 32.32, 32.32); + object = detInputExpRowAlloc(-32, -32, "a string", "a string", "a string", "a string", -32, "a string", 32.32, 64.64, 64.64, 32.32, 64.64); if (!object) { exit(EXIT_FAILURE); Index: trunk/ippdb/tests/metadatafromobject.c =================================================================== --- trunk/ippdb/tests/metadatafromobject.c (revision 8080) +++ trunk/ippdb/tests/metadatafromobject.c (revision 8085) @@ -512,5 +512,5 @@ bool status; - object = newExpRowAlloc("a string", "a string", "a string", "a string", -32, "a string"); + object = newExpRowAlloc("a string", "a string", "a string", "a string", -32); if (!object) { exit(EXIT_FAILURE); @@ -544,30 +544,83 @@ exit(EXIT_FAILURE); } + + psFree(md); + } + + { + psMetadata *md; + newImfileRow *object; + bool status; + + object = newImfileRowAlloc("a string", "a string", "a string", "a string"); + if (!object) { + exit(EXIT_FAILURE); + } + + md = newImfileMetadataFromObject(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, "class"), "a string", MAX_STRING_LENGTH)) { psFree(md); exit(EXIT_FAILURE); } - - psFree(md); - } - - { - psMetadata *md; - newImfileRow *object; - bool status; - - object = newImfileRowAlloc("a string", "a string", "a string", "a string"); - if (!object) { - exit(EXIT_FAILURE); - } - - md = newImfileMetadataFromObject(object); - if (!md) { - exit(EXIT_FAILURE); - } - - psFree(object); - - if (strncmp(psMetadataLookupPtr(&status, md, "exp_id"), "a string", MAX_STRING_LENGTH)) { + 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); + } + + { + psMetadata *md; + rawDetrendExpRow *object; + bool status; + + object = rawDetrendExpRowAlloc("a string", "a string", "a string", "a string", -32, "a string", "a string", 32.32, 64.64, 64.64, 32.32, 64.64); + if (!object) { + exit(EXIT_FAILURE); + } + + md = rawDetrendExpMetadataFromObject(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, "exp_type"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupS32(&status, md, "imfiles") == -32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "filter"), "a string", MAX_STRING_LENGTH)) { psFree(md); exit(EXIT_FAILURE); @@ -577,4 +630,122 @@ exit(EXIT_FAILURE); } + if (!psMetadataLookupF32(&status, md, "airmass") == 32.32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF64(&status, md, "ra") == 64.64) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF64(&status, md, "dec") == 64.64) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF32(&status, md, "exp_time") == 32.32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF64(&status, md, "background") == 64.64) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + } + + { + psMetadata *md; + rawScienceExpRow *object; + bool status; + + object = rawScienceExpRowAlloc("a string", "a string", "a string", "a string", -32, "a string", "a string", 32.32, 64.64, 64.64, 32.32, 64.64); + if (!object) { + exit(EXIT_FAILURE); + } + + md = rawScienceExpMetadataFromObject(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, "exp_type"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupS32(&status, md, "imfiles") == -32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "filter"), "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 (!psMetadataLookupF32(&status, md, "airmass") == 32.32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF64(&status, md, "ra") == 64.64) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF64(&status, md, "dec") == 64.64) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF32(&status, md, "exp_time") == 32.32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF64(&status, md, "background") == 64.64) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + } + + { + psMetadata *md; + rawImfileRow *object; + bool status; + + object = rawImfileRowAlloc("a string", "a string", "a string", "a string"); + if (!object) { + exit(EXIT_FAILURE); + } + + md = rawImfileMetadataFromObject(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, "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); @@ -591,13 +762,13 @@ { psMetadata *md; - rawDetrendExpRow *object; - bool status; - - object = rawDetrendExpRowAlloc("a string", "a string", "a string", "a string", -32, "a string", "a string", 32.32, 32.32, 32.32, 32.32); - if (!object) { - exit(EXIT_FAILURE); - } - - md = rawDetrendExpMetadataFromObject(object); + p1PendingExpRow *object; + bool status; + + object = p1PendingExpRowAlloc("a string", "a string", "a string", "a string", -32, "a string", 32.32, 64.64, 64.64, 32.32, 64.64, "a string", -32); + if (!object) { + exit(EXIT_FAILURE); + } + + md = p1PendingExpMetadataFromObject(object); if (!md) { exit(EXIT_FAILURE); @@ -630,17 +801,212 @@ exit(EXIT_FAILURE); } - if (strncmp(psMetadataLookupPtr(&status, md, "class"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } if (!psMetadataLookupF32(&status, md, "airmass") == 32.32) { psFree(md); exit(EXIT_FAILURE); } + if (!psMetadataLookupF64(&status, md, "ra") == 64.64) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF64(&status, md, "dec") == 64.64) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF32(&status, md, "exp_time") == 32.32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF64(&status, md, "background") == 64.64) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "recipe"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupS32(&status, md, "p1_version") == -32) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + } + + { + psMetadata *md; + p2PendingExpRow *object; + bool status; + + object = p2PendingExpRowAlloc("a string", "a string", "a string", "a string", -32, "a string", 32.32, 32.32, 64.64, 64.64, 64.64, "a string", -32, -32); + if (!object) { + exit(EXIT_FAILURE); + } + + md = p2PendingExpMetadataFromObject(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, "exp_type"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupS32(&status, md, "imfiles") == -32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "filter"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF32(&status, md, "airmass") == 32.32) { + psFree(md); + exit(EXIT_FAILURE); + } if (!psMetadataLookupF32(&status, md, "ra") == 32.32) { psFree(md); exit(EXIT_FAILURE); } - if (!psMetadataLookupF32(&status, md, "dec") == 32.32) { + if (!psMetadataLookupF64(&status, md, "dec") == 64.64) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF64(&status, md, "exp_time") == 64.64) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF64(&status, md, "background") == 64.64) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "recipe"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupS32(&status, md, "p1_version") == -32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupS32(&status, md, "p2_version") == -32) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + } + + { + psMetadata *md; + p2PendingImfileRow *object; + bool status; + + object = p2PendingImfileRowAlloc("a string", "a string", "a string", "a string", "a string", -32, -32); + if (!object) { + exit(EXIT_FAILURE); + } + + md = p2PendingImfileMetadataFromObject(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, "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, "stats"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "recipe"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupS32(&status, md, "p1_version") == -32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupS32(&status, md, "p2_version") == -32) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + } + + { + psMetadata *md; + p2DoneExpRow *object; + bool status; + + object = p2DoneExpRowAlloc("a string", "a string", "a string", "a string", -32, "a string", 32.32, 64.64, 64.64, 32.32, 64.64, "a string", -32, -32); + if (!object) { + exit(EXIT_FAILURE); + } + + md = p2DoneExpMetadataFromObject(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, "exp_type"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupS32(&status, md, "imfiles") == -32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "filter"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF32(&status, md, "airmass") == 32.32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF64(&status, md, "ra") == 64.64) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF64(&status, md, "dec") == 64.64) { psFree(md); exit(EXIT_FAILURE); @@ -650,19 +1016,84 @@ exit(EXIT_FAILURE); } - - psFree(md); - } - - { - psMetadata *md; - rawScienceExpRow *object; - bool status; - - object = rawScienceExpRowAlloc("a string", "a string", "a string", "a string", -32, "a string", "a string", 32.32, 32.32, 32.32, 32.32); - if (!object) { - exit(EXIT_FAILURE); - } - - md = rawScienceExpMetadataFromObject(object); + if (!psMetadataLookupF64(&status, md, "background") == 64.64) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "recipe"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupS32(&status, md, "p1_version") == -32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupS32(&status, md, "p2_version") == -32) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + } + + { + psMetadata *md; + p2DoneImfileRow *object; + bool status; + + object = p2DoneImfileRowAlloc("a string", "a string", "a string", "a string", "a string", -32, -32); + if (!object) { + exit(EXIT_FAILURE); + } + + md = p2DoneImfileMetadataFromObject(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, "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, "stats"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "recipe"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupS32(&status, md, "p1_version") == -32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupS32(&status, md, "p2_version") == -32) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + } + + { + psMetadata *md; + p3PendingExpRow *object; + bool status; + + object = p3PendingExpRowAlloc("a string", "a string", "a string", -32, "a string", 32.32, 64.64, 64.64, 32.32, 64.64, "a string", -32, -32); + if (!object) { + exit(EXIT_FAILURE); + } + + md = p3PendingExpMetadataFromObject(object); if (!md) { exit(EXIT_FAILURE); @@ -679,4 +1110,114 @@ 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); + } + if (strncmp(psMetadataLookupPtr(&status, md, "filter"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF32(&status, md, "airmass") == 32.32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF64(&status, md, "ra") == 64.64) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF64(&status, md, "dec") == 64.64) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF32(&status, md, "exp_time") == 32.32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF64(&status, md, "background") == 64.64) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "recipe"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupS32(&status, md, "p2_version") == -32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupS32(&status, md, "p3_version") == -32) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + } + + { + psMetadata *md; + detRunRow *object; + bool status; + + object = detRunRowAlloc(-32, "a string"); + if (!object) { + exit(EXIT_FAILURE); + } + + md = detRunMetadataFromObject(object); + if (!md) { + exit(EXIT_FAILURE); + } + + psFree(object); + + if (!psMetadataLookupS32(&status, md, "iteration") == -32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "det_type"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + } + + { + psMetadata *md; + detInputExpRow *object; + bool status; + + object = detInputExpRowAlloc(-32, -32, "a string", "a string", "a string", "a string", -32, "a string", 32.32, 64.64, 64.64, 32.32, 64.64); + if (!object) { + exit(EXIT_FAILURE); + } + + md = detInputExpMetadataFromObject(object); + if (!md) { + exit(EXIT_FAILURE); + } + + psFree(object); + + if (!psMetadataLookupS32(&status, md, "det_id") == -32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupS32(&status, md, "iteration") == -32) { + psFree(md); + exit(EXIT_FAILURE); + } + 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); @@ -695,17 +1236,13 @@ exit(EXIT_FAILURE); } - if (strncmp(psMetadataLookupPtr(&status, md, "class"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } if (!psMetadataLookupF32(&status, md, "airmass") == 32.32) { psFree(md); exit(EXIT_FAILURE); } - if (!psMetadataLookupF32(&status, md, "ra") == 32.32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupF32(&status, md, "dec") == 32.32) { + if (!psMetadataLookupF64(&status, md, "ra") == 64.64) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF64(&status, md, "dec") == 64.64) { psFree(md); exit(EXIT_FAILURE); @@ -715,542 +1252,5 @@ exit(EXIT_FAILURE); } - - psFree(md); - } - - { - psMetadata *md; - rawImfileRow *object; - bool status; - - object = rawImfileRowAlloc("a string", "a string", "a string", "a string", "a string"); - if (!object) { - exit(EXIT_FAILURE); - } - - md = rawImfileMetadataFromObject(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, "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); - } - if (strncmp(psMetadataLookupPtr(&status, md, "stats"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - } - - { - psMetadata *md; - p1PendingExpRow *object; - bool status; - - object = p1PendingExpRowAlloc("a string", "a string", "a string", "a string", -32, "a string", "a string", 32.32, 32.32, 32.32, 32.32, "a string", -32); - if (!object) { - exit(EXIT_FAILURE); - } - - md = p1PendingExpMetadataFromObject(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, "exp_type"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupS32(&status, md, "imfiles") == -32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "filter"), "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 (!psMetadataLookupF32(&status, md, "airmass") == 32.32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupF32(&status, md, "ra") == 32.32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupF32(&status, md, "dec") == 32.32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupF32(&status, md, "exp_time") == 32.32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "recipe"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupS32(&status, md, "p1_version") == -32) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - } - - { - psMetadata *md; - p2PendingExpRow *object; - bool status; - - object = p2PendingExpRowAlloc("a string", "a string", "a string", "a string", -32, "a string", "a string", 32.32, 32.32, 32.32, 32.32, "a string", -32, -32); - if (!object) { - exit(EXIT_FAILURE); - } - - md = p2PendingExpMetadataFromObject(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, "exp_type"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupS32(&status, md, "imfiles") == -32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "filter"), "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 (!psMetadataLookupF32(&status, md, "airmass") == 32.32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupF32(&status, md, "ra") == 32.32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupF32(&status, md, "dec") == 32.32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupF32(&status, md, "exp_time") == 32.32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "recipe"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupS32(&status, md, "p1_version") == -32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupS32(&status, md, "p2_version") == -32) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - } - - { - psMetadata *md; - p2PendingImfileRow *object; - bool status; - - object = p2PendingImfileRowAlloc("a string", "a string", "a string", "a string", "a string", -32, -32); - if (!object) { - exit(EXIT_FAILURE); - } - - md = p2PendingImfileMetadataFromObject(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, "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, "stats"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "recipe"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupS32(&status, md, "p1_version") == -32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupS32(&status, md, "p2_version") == -32) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - } - - { - psMetadata *md; - p2DoneExpRow *object; - bool status; - - object = p2DoneExpRowAlloc("a string", "a string", "a string", "a string", -32, "a string", "a string", 32.32, 32.32, 32.32, 32.32, "a string", -32, -32); - if (!object) { - exit(EXIT_FAILURE); - } - - md = p2DoneExpMetadataFromObject(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, "exp_type"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupS32(&status, md, "imfiles") == -32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "filter"), "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 (!psMetadataLookupF32(&status, md, "airmass") == 32.32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupF32(&status, md, "ra") == 32.32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupF32(&status, md, "dec") == 32.32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupF32(&status, md, "exp_time") == 32.32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "recipe"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupS32(&status, md, "p1_version") == -32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupS32(&status, md, "p2_version") == -32) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - } - - { - psMetadata *md; - p2DoneImfileRow *object; - bool status; - - object = p2DoneImfileRowAlloc("a string", "a string", "a string", "a string", "a string", -32, -32); - if (!object) { - exit(EXIT_FAILURE); - } - - md = p2DoneImfileMetadataFromObject(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, "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, "stats"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "recipe"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupS32(&status, md, "p1_version") == -32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupS32(&status, md, "p2_version") == -32) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - } - - { - psMetadata *md; - p3PendingExpRow *object; - bool status; - - object = p3PendingExpRowAlloc("a string", "a string", "a string", -32, "a string", "a string", 32.32, 32.32, 32.32, 32.32, "a string", -32, -32); - if (!object) { - exit(EXIT_FAILURE); - } - - md = p3PendingExpMetadataFromObject(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, "exp_type"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupS32(&status, md, "imfiles") == -32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "filter"), "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 (!psMetadataLookupF32(&status, md, "airmass") == 32.32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupF32(&status, md, "ra") == 32.32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupF32(&status, md, "dec") == 32.32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupF32(&status, md, "exp_time") == 32.32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "recipe"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupS32(&status, md, "p2_version") == -32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupS32(&status, md, "p3_version") == -32) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - } - - { - psMetadata *md; - detRunRow *object; - bool status; - - object = detRunRowAlloc(-32, "a string"); - if (!object) { - exit(EXIT_FAILURE); - } - - md = detRunMetadataFromObject(object); - if (!md) { - exit(EXIT_FAILURE); - } - - psFree(object); - - if (!psMetadataLookupS32(&status, md, "iteration") == -32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "det_type"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - } - - { - psMetadata *md; - detInputExpRow *object; - bool status; - - object = detInputExpRowAlloc(-32, -32, "a string", "a string", "a string", "a string", -32, "a string", "a string", 32.32, 32.32, 32.32, 32.32); - if (!object) { - exit(EXIT_FAILURE); - } - - md = detInputExpMetadataFromObject(object); - if (!md) { - exit(EXIT_FAILURE); - } - - psFree(object); - - if (!psMetadataLookupS32(&status, md, "det_id") == -32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupS32(&status, md, "iteration") == -32) { - psFree(md); - exit(EXIT_FAILURE); - } - 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, "exp_type"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupS32(&status, md, "imfiles") == -32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "filter"), "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 (!psMetadataLookupF32(&status, md, "airmass") == 32.32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupF32(&status, md, "ra") == 32.32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupF32(&status, md, "dec") == 32.32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupF32(&status, md, "exp_time") == 32.32) { + if (!psMetadataLookupF64(&status, md, "background") == 64.64) { psFree(md); exit(EXIT_FAILURE); Index: trunk/ippdb/tests/objectfrommetadata.c =================================================================== --- trunk/ippdb/tests/objectfrommetadata.c (revision 8080) +++ trunk/ippdb/tests/objectfrommetadata.c (revision 8085) @@ -767,10 +767,60 @@ exit(EXIT_FAILURE); } + + object = newExpObjectFromMetadata(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->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; + newImfileRow *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, "class", 0, NULL, "a string")) { psFree(md); exit(EXIT_FAILURE); } - - object = newExpObjectFromMetadata(md); + 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 = newImfileObjectFromMetadata(md); if (!object) { psFree(md); @@ -784,4 +834,86 @@ 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; + rawDetrendExpRow *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, "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); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "filter", 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 (!psMetadataAddF32(md, PS_LIST_TAIL, "airmass", 0, NULL, 32.32)) { + psFree(md); + 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, "dec", 0, NULL, 64.64)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF32(md, PS_LIST_TAIL, "exp_time", 0, NULL, 32.32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "background", 0, NULL, 64.64)) { + psFree(md); + exit(EXIT_FAILURE); + } + + object = rawDetrendExpObjectFromMetadata(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); @@ -800,15 +932,39 @@ exit(EXIT_FAILURE); } + if (strncmp(object->filter, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } if (strncmp(object->class, "a string", MAX_STRING_LENGTH)) { psFree(object); exit(EXIT_FAILURE); } - - psFree(object); - } - - { - psMetadata *md; - newImfileRow *object; + if (!object->airmass == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->ra == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->dec == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->exp_time == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->background == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + psMetadata *md; + rawScienceExpRow *object; md = psMetadataAlloc(); @@ -817,8 +973,122 @@ 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); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "filter", 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 (!psMetadataAddF32(md, PS_LIST_TAIL, "airmass", 0, NULL, 32.32)) { + psFree(md); + 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, "dec", 0, NULL, 64.64)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF32(md, PS_LIST_TAIL, "exp_time", 0, NULL, 32.32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "background", 0, NULL, 64.64)) { + psFree(md); + exit(EXIT_FAILURE); + } + + object = rawScienceExpObjectFromMetadata(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->exp_type, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->imfiles == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->filter, "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 (!object->airmass == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->ra == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->dec == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->exp_time == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->background == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + psMetadata *md; + rawImfileRow *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, "class", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } if (!psMetadataAddStr(md, PS_LIST_TAIL, "class_id", 0, NULL, "a string")) { psFree(md); @@ -830,5 +1100,5 @@ } - object = newImfileObjectFromMetadata(md); + object = rawImfileObjectFromMetadata(md); if (!object) { psFree(md); @@ -860,5 +1130,5 @@ { psMetadata *md; - rawDetrendExpRow *object; + p1PendingExpRow *object; md = psMetadataAlloc(); @@ -887,17 +1157,339 @@ exit(EXIT_FAILURE); } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } if (!psMetadataAddF32(md, PS_LIST_TAIL, "airmass", 0, NULL, 32.32)) { psFree(md); 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, "dec", 0, NULL, 64.64)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF32(md, PS_LIST_TAIL, "exp_time", 0, NULL, 32.32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "background", 0, NULL, 64.64)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "recipe", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddS32(md, PS_LIST_TAIL, "p1_version", 0, NULL, -32)) { + psFree(md); + exit(EXIT_FAILURE); + } + + object = p1PendingExpObjectFromMetadata(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->exp_type, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->imfiles == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->filter, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->airmass == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->ra == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->dec == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->exp_time == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->background == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->recipe, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->p1_version == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + psMetadata *md; + p2PendingExpRow *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, "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); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "filter", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF32(md, PS_LIST_TAIL, "airmass", 0, NULL, 32.32)) { + psFree(md); + exit(EXIT_FAILURE); + } if (!psMetadataAddF32(md, PS_LIST_TAIL, "ra", 0, NULL, 32.32)) { psFree(md); exit(EXIT_FAILURE); } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "dec", 0, NULL, 32.32)) { + if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec", 0, NULL, 64.64)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "exp_time", 0, NULL, 64.64)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "background", 0, NULL, 64.64)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "recipe", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddS32(md, PS_LIST_TAIL, "p1_version", 0, NULL, -32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddS32(md, PS_LIST_TAIL, "p2_version", 0, NULL, -32)) { + psFree(md); + exit(EXIT_FAILURE); + } + + object = p2PendingExpObjectFromMetadata(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->exp_type, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->imfiles == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->filter, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->airmass == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->ra == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->dec == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->exp_time == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->background == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->recipe, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->p1_version == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->p2_version == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + psMetadata *md; + p2PendingImfileRow *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, "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, "stats", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "recipe", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddS32(md, PS_LIST_TAIL, "p1_version", 0, NULL, -32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddS32(md, PS_LIST_TAIL, "p2_version", 0, NULL, -32)) { + psFree(md); + exit(EXIT_FAILURE); + } + + object = p2PendingImfileObjectFromMetadata(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->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->stats, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->recipe, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->p1_version == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->p2_version == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + psMetadata *md; + p2DoneExpRow *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, "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); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "filter", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF32(md, PS_LIST_TAIL, "airmass", 0, NULL, 32.32)) { + psFree(md); + 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, "dec", 0, NULL, 64.64)) { psFree(md); exit(EXIT_FAILURE); @@ -907,6 +1499,22 @@ exit(EXIT_FAILURE); } - - object = rawDetrendExpObjectFromMetadata(md); + if (!psMetadataAddF64(md, PS_LIST_TAIL, "background", 0, NULL, 64.64)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "recipe", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddS32(md, PS_LIST_TAIL, "p1_version", 0, NULL, -32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddS32(md, PS_LIST_TAIL, "p2_version", 0, NULL, -32)) { + psFree(md); + exit(EXIT_FAILURE); + } + + object = p2DoneExpObjectFromMetadata(md); if (!object) { psFree(md); @@ -940,17 +1548,13 @@ exit(EXIT_FAILURE); } - if (strncmp(object->class, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } if (!object->airmass == 32.32) { psFree(object); exit(EXIT_FAILURE); } - if (!object->ra == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->dec == 32.32) { + if (!object->ra == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->dec == 64.64) { psFree(object); exit(EXIT_FAILURE); @@ -960,11 +1564,27 @@ exit(EXIT_FAILURE); } - - psFree(object); - } - - { - psMetadata *md; - rawScienceExpRow *object; + if (!object->background == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->recipe, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->p1_version == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->p2_version == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + psMetadata *md; + p2DoneImfileRow *object; md = psMetadataAlloc(); @@ -973,8 +1593,246 @@ 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, "stats", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "recipe", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddS32(md, PS_LIST_TAIL, "p1_version", 0, NULL, -32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddS32(md, PS_LIST_TAIL, "p2_version", 0, NULL, -32)) { + psFree(md); + exit(EXIT_FAILURE); + } + + object = p2DoneImfileObjectFromMetadata(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->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->stats, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->recipe, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->p1_version == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->p2_version == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + psMetadata *md; + p3PendingExpRow *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, "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); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "filter", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF32(md, PS_LIST_TAIL, "airmass", 0, NULL, 32.32)) { + psFree(md); + 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, "dec", 0, NULL, 64.64)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF32(md, PS_LIST_TAIL, "exp_time", 0, NULL, 32.32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "background", 0, NULL, 64.64)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "recipe", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddS32(md, PS_LIST_TAIL, "p2_version", 0, NULL, -32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddS32(md, PS_LIST_TAIL, "p3_version", 0, NULL, -32)) { + psFree(md); + exit(EXIT_FAILURE); + } + + object = p3PendingExpObjectFromMetadata(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->exp_type, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->imfiles == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->filter, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->airmass == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->ra == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->dec == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->exp_time == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->background == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->recipe, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->p2_version == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->p3_version == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + psMetadata *md; + detRunRow *object; + + md = psMetadataAlloc(); + if (!psMetadataAddS32(md, PS_LIST_TAIL, "iteration", 0, NULL, -32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "det_type", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + + object = detRunObjectFromMetadata(md); + if (!object) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + + if (!object->iteration == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->det_type, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + psMetadata *md; + detInputExpRow *object; + + md = psMetadataAlloc(); + if (!psMetadataAddS32(md, PS_LIST_TAIL, "det_id", 0, NULL, -32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddS32(md, PS_LIST_TAIL, "iteration", 0, NULL, -32)) { + 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); @@ -993,17 +1851,13 @@ exit(EXIT_FAILURE); } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } if (!psMetadataAddF32(md, PS_LIST_TAIL, "airmass", 0, NULL, 32.32)) { psFree(md); exit(EXIT_FAILURE); } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "ra", 0, NULL, 32.32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "dec", 0, NULL, 32.32)) { + if (!psMetadataAddF64(md, PS_LIST_TAIL, "ra", 0, NULL, 64.64)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec", 0, NULL, 64.64)) { psFree(md); exit(EXIT_FAILURE); @@ -1013,13 +1867,25 @@ exit(EXIT_FAILURE); } - - object = rawScienceExpObjectFromMetadata(md); - if (!object) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - + if (!psMetadataAddF64(md, PS_LIST_TAIL, "background", 0, NULL, 64.64)) { + psFree(md); + exit(EXIT_FAILURE); + } + + object = detInputExpObjectFromMetadata(md); + if (!object) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + + if (!object->det_id == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->iteration == -32) { + psFree(object); + exit(EXIT_FAILURE); + } if (strncmp(object->exp_id, "a string", MAX_STRING_LENGTH)) { psFree(object); @@ -1046,17 +1912,13 @@ exit(EXIT_FAILURE); } - if (strncmp(object->class, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } if (!object->airmass == 32.32) { psFree(object); exit(EXIT_FAILURE); } - if (!object->ra == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->dec == 32.32) { + if (!object->ra == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->dec == 64.64) { psFree(object); exit(EXIT_FAILURE); @@ -1066,867 +1928,5 @@ exit(EXIT_FAILURE); } - - psFree(object); - } - - { - psMetadata *md; - rawImfileRow *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, "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); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "stats", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - - object = rawImfileObjectFromMetadata(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->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); - } - if (strncmp(object->stats, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - psMetadata *md; - p1PendingExpRow *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, "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); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "filter", 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 (!psMetadataAddF32(md, PS_LIST_TAIL, "airmass", 0, NULL, 32.32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "ra", 0, NULL, 32.32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "dec", 0, NULL, 32.32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "exp_time", 0, NULL, 32.32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "recipe", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddS32(md, PS_LIST_TAIL, "p1_version", 0, NULL, -32)) { - psFree(md); - exit(EXIT_FAILURE); - } - - object = p1PendingExpObjectFromMetadata(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->exp_type, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->imfiles == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->filter, "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 (!object->airmass == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->ra == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->dec == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->exp_time == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->recipe, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->p1_version == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - psMetadata *md; - p2PendingExpRow *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, "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); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "filter", 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 (!psMetadataAddF32(md, PS_LIST_TAIL, "airmass", 0, NULL, 32.32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "ra", 0, NULL, 32.32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "dec", 0, NULL, 32.32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "exp_time", 0, NULL, 32.32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "recipe", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddS32(md, PS_LIST_TAIL, "p1_version", 0, NULL, -32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddS32(md, PS_LIST_TAIL, "p2_version", 0, NULL, -32)) { - psFree(md); - exit(EXIT_FAILURE); - } - - object = p2PendingExpObjectFromMetadata(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->exp_type, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->imfiles == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->filter, "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 (!object->airmass == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->ra == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->dec == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->exp_time == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->recipe, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->p1_version == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->p2_version == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - psMetadata *md; - p2PendingImfileRow *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, "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, "stats", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "recipe", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddS32(md, PS_LIST_TAIL, "p1_version", 0, NULL, -32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddS32(md, PS_LIST_TAIL, "p2_version", 0, NULL, -32)) { - psFree(md); - exit(EXIT_FAILURE); - } - - object = p2PendingImfileObjectFromMetadata(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->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->stats, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->recipe, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->p1_version == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->p2_version == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - psMetadata *md; - p2DoneExpRow *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, "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); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "filter", 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 (!psMetadataAddF32(md, PS_LIST_TAIL, "airmass", 0, NULL, 32.32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "ra", 0, NULL, 32.32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "dec", 0, NULL, 32.32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "exp_time", 0, NULL, 32.32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "recipe", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddS32(md, PS_LIST_TAIL, "p1_version", 0, NULL, -32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddS32(md, PS_LIST_TAIL, "p2_version", 0, NULL, -32)) { - psFree(md); - exit(EXIT_FAILURE); - } - - object = p2DoneExpObjectFromMetadata(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->exp_type, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->imfiles == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->filter, "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 (!object->airmass == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->ra == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->dec == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->exp_time == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->recipe, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->p1_version == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->p2_version == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - psMetadata *md; - p2DoneImfileRow *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, "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, "stats", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "recipe", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddS32(md, PS_LIST_TAIL, "p1_version", 0, NULL, -32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddS32(md, PS_LIST_TAIL, "p2_version", 0, NULL, -32)) { - psFree(md); - exit(EXIT_FAILURE); - } - - object = p2DoneImfileObjectFromMetadata(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->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->stats, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->recipe, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->p1_version == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->p2_version == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - psMetadata *md; - p3PendingExpRow *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, "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); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "filter", 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 (!psMetadataAddF32(md, PS_LIST_TAIL, "airmass", 0, NULL, 32.32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "ra", 0, NULL, 32.32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "dec", 0, NULL, 32.32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "exp_time", 0, NULL, 32.32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "recipe", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddS32(md, PS_LIST_TAIL, "p2_version", 0, NULL, -32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddS32(md, PS_LIST_TAIL, "p3_version", 0, NULL, -32)) { - psFree(md); - exit(EXIT_FAILURE); - } - - object = p3PendingExpObjectFromMetadata(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->exp_type, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->imfiles == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->filter, "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 (!object->airmass == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->ra == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->dec == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->exp_time == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->recipe, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->p2_version == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->p3_version == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - psMetadata *md; - detRunRow *object; - - md = psMetadataAlloc(); - if (!psMetadataAddS32(md, PS_LIST_TAIL, "iteration", 0, NULL, -32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "det_type", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - - object = detRunObjectFromMetadata(md); - if (!object) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - - if (!object->iteration == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->det_type, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - psMetadata *md; - detInputExpRow *object; - - md = psMetadataAlloc(); - if (!psMetadataAddS32(md, PS_LIST_TAIL, "det_id", 0, NULL, -32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddS32(md, PS_LIST_TAIL, "iteration", 0, NULL, -32)) { - 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); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "filter", 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 (!psMetadataAddF32(md, PS_LIST_TAIL, "airmass", 0, NULL, 32.32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "ra", 0, NULL, 32.32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "dec", 0, NULL, 32.32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "exp_time", 0, NULL, 32.32)) { - psFree(md); - exit(EXIT_FAILURE); - } - - object = detInputExpObjectFromMetadata(md); - if (!object) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - - if (!object->det_id == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->iteration == -32) { - 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); - } - if (strncmp(object->exp_type, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->imfiles == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->filter, "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 (!object->airmass == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->ra == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->dec == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->exp_time == 32.32) { + if (!object->background == 64.64) { psFree(object); exit(EXIT_FAILURE); Index: trunk/ippdb/tests/pop.c =================================================================== --- trunk/ippdb/tests/pop.c (revision 8080) +++ trunk/ippdb/tests/pop.c (revision 8085) @@ -244,12 +244,11 @@ char exp_type[256]; psS32 imfiles; - char class[256]; - - dbh = psDBInit("localhost", "test", NULL, "test"); - if (!dbh) { - exit(EXIT_FAILURE); - } - - if (!newExpPop(dbh, (char **)&exp_id, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&class)) { + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if (!newExpPop(dbh, (char **)&exp_id, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles)) { exit(EXIT_FAILURE); } @@ -287,14 +286,15 @@ char class[256]; psF32 airmass; - psF32 ra; - psF32 dec; + psF64 ra; + psF64 dec; psF32 exp_time; - - dbh = psDBInit("localhost", "test", NULL, "test"); - if (!dbh) { - exit(EXIT_FAILURE); - } - - if (!rawDetrendExpPop(dbh, (char **)&exp_id, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, (char **)&class, &airmass, &ra, &dec, &exp_time)) { + psF64 background; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if (!rawDetrendExpPop(dbh, (char **)&exp_id, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, (char **)&class, &airmass, &ra, &dec, &exp_time, &background)) { exit(EXIT_FAILURE); } @@ -313,14 +313,15 @@ char class[256]; psF32 airmass; - psF32 ra; - psF32 dec; + psF64 ra; + psF64 dec; psF32 exp_time; - - dbh = psDBInit("localhost", "test", NULL, "test"); - if (!dbh) { - exit(EXIT_FAILURE); - } - - if (!rawScienceExpPop(dbh, (char **)&exp_id, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, (char **)&class, &airmass, &ra, &dec, &exp_time)) { + psF64 background; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if (!rawScienceExpPop(dbh, (char **)&exp_id, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, (char **)&class, &airmass, &ra, &dec, &exp_time, &background)) { exit(EXIT_FAILURE); } @@ -335,59 +336,58 @@ char class_id[256]; char uri[256]; - char stats[256]; - - dbh = psDBInit("localhost", "test", NULL, "test"); - if (!dbh) { - exit(EXIT_FAILURE); - } - - if (!rawImfilePop(dbh, (char **)&exp_id, (char **)&class, (char **)&class_id, (char **)&uri, (char **)&stats)) { - exit(EXIT_FAILURE); - } - - psDBCleanup(dbh); - } - - { - psDB *dbh; - char exp_id[256]; - char camera[256]; - char telescope[256]; - char exp_type[256]; - psS32 imfiles; - char filter[256]; - char class[256]; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if (!rawImfilePop(dbh, (char **)&exp_id, (char **)&class, (char **)&class_id, (char **)&uri)) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + char exp_id[256]; + char camera[256]; + char telescope[256]; + char exp_type[256]; + psS32 imfiles; + char filter[256]; + psF32 airmass; + psF64 ra; + psF64 dec; + psF32 exp_time; + psF64 background; + char recipe[256]; + psS32 p1_version; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if (!p1PendingExpPop(dbh, (char **)&exp_id, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, &airmass, &ra, &dec, &exp_time, &background, (char **)&recipe, &p1_version)) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + char exp_id[256]; + char camera[256]; + char telescope[256]; + char exp_type[256]; + psS32 imfiles; + char filter[256]; psF32 airmass; psF32 ra; - psF32 dec; - psF32 exp_time; - char recipe[256]; - psS32 p1_version; - - dbh = psDBInit("localhost", "test", NULL, "test"); - if (!dbh) { - exit(EXIT_FAILURE); - } - - if (!p1PendingExpPop(dbh, (char **)&exp_id, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, (char **)&class, &airmass, &ra, &dec, &exp_time, (char **)&recipe, &p1_version)) { - exit(EXIT_FAILURE); - } - - psDBCleanup(dbh); - } - - { - psDB *dbh; - char exp_id[256]; - char camera[256]; - char telescope[256]; - char exp_type[256]; - psS32 imfiles; - char filter[256]; - char class[256]; - psF32 airmass; - psF32 ra; - psF32 dec; - psF32 exp_time; + psF64 dec; + psF64 exp_time; + psF64 background; char recipe[256]; psS32 p1_version; @@ -399,5 +399,5 @@ } - if (!p2PendingExpPop(dbh, (char **)&exp_id, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, (char **)&class, &airmass, &ra, &dec, &exp_time, (char **)&recipe, &p1_version, &p2_version)) { + if (!p2PendingExpPop(dbh, (char **)&exp_id, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, &airmass, &ra, &dec, &exp_time, &background, (char **)&recipe, &p1_version, &p2_version)) { exit(EXIT_FAILURE); } @@ -436,9 +436,9 @@ psS32 imfiles; char filter[256]; - char class[256]; psF32 airmass; - psF32 ra; - psF32 dec; + psF64 ra; + psF64 dec; psF32 exp_time; + psF64 background; char recipe[256]; psS32 p1_version; @@ -450,5 +450,5 @@ } - if (!p2DoneExpPop(dbh, (char **)&exp_id, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, (char **)&class, &airmass, &ra, &dec, &exp_time, (char **)&recipe, &p1_version, &p2_version)) { + if (!p2DoneExpPop(dbh, (char **)&exp_id, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, &airmass, &ra, &dec, &exp_time, &background, (char **)&recipe, &p1_version, &p2_version)) { exit(EXIT_FAILURE); } @@ -486,9 +486,9 @@ psS32 imfiles; char filter[256]; - char class[256]; psF32 airmass; - psF32 ra; - psF32 dec; + psF64 ra; + psF64 dec; psF32 exp_time; + psF64 background; char recipe[256]; psS32 p2_version; @@ -500,5 +500,5 @@ } - if (!p3PendingExpPop(dbh, (char **)&exp_id, (char **)&camera, (char **)&exp_type, &imfiles, (char **)&filter, (char **)&class, &airmass, &ra, &dec, &exp_time, (char **)&recipe, &p2_version, &p3_version)) { + if (!p3PendingExpPop(dbh, (char **)&exp_id, (char **)&camera, (char **)&exp_type, &imfiles, (char **)&filter, &airmass, &ra, &dec, &exp_time, &background, (char **)&recipe, &p2_version, &p3_version)) { exit(EXIT_FAILURE); } @@ -534,16 +534,16 @@ psS32 imfiles; char filter[256]; - char class[256]; psF32 airmass; - psF32 ra; - psF32 dec; + psF64 ra; + psF64 dec; psF32 exp_time; - - dbh = psDBInit("localhost", "test", NULL, "test"); - if (!dbh) { - exit(EXIT_FAILURE); - } - - if (!detInputExpPop(dbh, &det_id, &iteration, (char **)&exp_id, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, (char **)&class, &airmass, &ra, &dec, &exp_time)) { + psF64 background; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if (!detInputExpPop(dbh, &det_id, &iteration, (char **)&exp_id, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, &airmass, &ra, &dec, &exp_time, &background)) { exit(EXIT_FAILURE); }