Index: /branches/jhoblitt/ippdb/configure.ac =================================================================== --- /branches/jhoblitt/ippdb/configure.ac (revision 8083) +++ /branches/jhoblitt/ippdb/configure.ac (revision 8084) @@ -1,5 +1,5 @@ AC_PREREQ(2.59) -AC_INIT([ippdb], [0.0.7], [pan-starrs.ifa.hawaii.edu]) +AC_INIT([ippdb], [0.0.8], [pan-starrs.ifa.hawaii.edu]) AC_CONFIG_SRCDIR([ippdb.pc.in]) Index: /branches/jhoblitt/ippdb/src/ippdb.c =================================================================== --- /branches/jhoblitt/ippdb/src/ippdb.c (revision 8083) +++ /branches/jhoblitt/ippdb/src/ippdb.c (revision 8084) @@ -5130,5 +5130,5 @@ static void newExpRowFree(newExpRow *object); -newExpRow *newExpRowAlloc(const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *class) +newExpRow *newExpRowAlloc(const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles) { newExpRow *object; @@ -5142,5 +5142,4 @@ object->exp_type = psStringCopy(exp_type); object->imfiles = imfiles; - object->class = psStringCopy(class); return object; @@ -5153,5 +5152,4 @@ psFree(object->telescope); psFree(object->exp_type); - psFree(object->class); } @@ -5192,9 +5190,4 @@ return false; } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, "64")) { - psError(PS_ERR_UNKNOWN, false, "failed to add item class"); - psFree(md); - return false; - } status = psDBCreateTable(dbh, NEWEXP_TABLE_NAME, md); @@ -5210,5 +5203,5 @@ } -bool newExpInsert(psDB * dbh, const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *class) +bool newExpInsert(psDB * dbh, const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles) { psMetadata *md; @@ -5241,9 +5234,4 @@ return false; } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, class)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item class"); - psFree(md); - return false; - } status = psDBInsertOneRow(dbh, NEWEXP_TABLE_NAME, md); @@ -5253,5 +5241,5 @@ } -bool newExpPop(psDB *dbh, char **exp_id, char **camera, char **telescope, char **exp_type, psS32 *imfiles, char **class) +bool newExpPop(psDB *dbh, char **exp_id, char **camera, char **telescope, char **exp_type, psS32 *imfiles) { psArray *rowSet; @@ -5327,10 +5315,4 @@ return false; } - *class = psMetadataLookupPtr(&status, row, "class"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item class"); - psFree(row); - return false; - } psFree(row); @@ -5341,5 +5323,5 @@ bool newExpInsertObject(psDB *dbh, newExpRow *object) { - return newExpInsert(dbh, object->exp_id, object->camera, object->telescope, object->exp_type, object->imfiles, object->class); + return newExpInsert(dbh, object->exp_id, object->camera, object->telescope, object->exp_type, object->imfiles); } @@ -5351,12 +5333,11 @@ char exp_type[256]; psS32 imfiles; - char class[256]; - - if (!newExpPop(dbh, (char **)&exp_id, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&class)) { + + if (!newExpPop(dbh, (char **)&exp_id, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles)) { psError(PS_ERR_UNKNOWN, false, "failed to pop a database row"); return NULL; } - return newExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, class); + return newExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles); } @@ -5482,9 +5463,4 @@ return NULL; } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, object->class)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item class"); - psFree(md); - return NULL; - } return md; @@ -5499,5 +5475,4 @@ char *exp_type; psS32 imfiles; - char *class; exp_id = psMetadataLookupPtr(&status, md, "exp_id"); @@ -5526,11 +5501,6 @@ return false; } - class = psMetadataLookupPtr(&status, md, "class"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item class"); - return false; - } - - return newExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, class); + + return newExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles); } psArray *newExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) @@ -5991,5 +5961,5 @@ static void rawDetrendExpRowFree(rawDetrendExpRow *object); -rawDetrendExpRow *rawDetrendExpRowAlloc(const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, const char *class, psF32 airmass, psF32 ra, psF32 dec, psF32 exp_time) +rawDetrendExpRow *rawDetrendExpRowAlloc(const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, const char *class, psF32 airmass, psF64 ra, psF64 dec, psF32 exp_time, psF64 background) { rawDetrendExpRow *object; @@ -6009,4 +5979,5 @@ object->dec = dec; object->exp_time = exp_time; + object->background = background; return object; @@ -6074,10 +6045,10 @@ return false; } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "ra", 0, NULL, 0.0)) { + if (!psMetadataAddF64(md, PS_LIST_TAIL, "ra", 0, NULL, 0.0)) { psError(PS_ERR_UNKNOWN, false, "failed to add item ra"); psFree(md); return false; } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "dec", 0, NULL, 0.0)) { + if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec", 0, NULL, 0.0)) { psError(PS_ERR_UNKNOWN, false, "failed to add item dec"); psFree(md); @@ -6089,4 +6060,9 @@ return false; } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "background", 0, NULL, 0.0)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item background"); + psFree(md); + return false; + } status = psDBCreateTable(dbh, RAWDETRENDEXP_TABLE_NAME, md); @@ -6102,5 +6078,5 @@ } -bool rawDetrendExpInsert(psDB * dbh, const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, const char *class, psF32 airmass, psF32 ra, psF32 dec, psF32 exp_time) +bool rawDetrendExpInsert(psDB * dbh, const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, const char *class, psF32 airmass, psF64 ra, psF64 dec, psF32 exp_time, psF64 background) { psMetadata *md; @@ -6148,10 +6124,10 @@ return false; } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "ra", 0, NULL, ra)) { + if (!psMetadataAddF64(md, PS_LIST_TAIL, "ra", 0, NULL, ra)) { psError(PS_ERR_UNKNOWN, false, "failed to add item ra"); psFree(md); return false; } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "dec", 0, NULL, dec)) { + if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec", 0, NULL, dec)) { psError(PS_ERR_UNKNOWN, false, "failed to add item dec"); psFree(md); @@ -6163,4 +6139,9 @@ return false; } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "background", 0, NULL, background)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item background"); + psFree(md); + return false; + } status = psDBInsertOneRow(dbh, RAWDETRENDEXP_TABLE_NAME, md); @@ -6170,5 +6151,5 @@ } -bool rawDetrendExpPop(psDB *dbh, char **exp_id, char **camera, char **telescope, char **exp_type, psS32 *imfiles, char **filter, char **class, psF32 *airmass, psF32 *ra, psF32 *dec, psF32 *exp_time) +bool rawDetrendExpPop(psDB *dbh, char **exp_id, char **camera, char **telescope, char **exp_type, psS32 *imfiles, char **filter, char **class, psF32 *airmass, psF64 *ra, psF64 *dec, psF32 *exp_time, psF64 *background) { psArray *rowSet; @@ -6262,5 +6243,5 @@ return false; } - *ra = psMetadataLookupF32(&status, row, "ra"); + *ra = psMetadataLookupF64(&status, row, "ra"); if (!status) { psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item ra"); @@ -6268,5 +6249,5 @@ return false; } - *dec = psMetadataLookupF32(&status, row, "dec"); + *dec = psMetadataLookupF64(&status, row, "dec"); if (!status) { psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item dec"); @@ -6280,4 +6261,10 @@ return false; } + *background = psMetadataLookupF64(&status, row, "background"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item background"); + psFree(row); + return false; + } psFree(row); @@ -6288,5 +6275,5 @@ bool rawDetrendExpInsertObject(psDB *dbh, rawDetrendExpRow *object) { - return rawDetrendExpInsert(dbh, object->exp_id, object->camera, object->telescope, object->exp_type, object->imfiles, object->filter, object->class, object->airmass, object->ra, object->dec, object->exp_time); + return rawDetrendExpInsert(dbh, object->exp_id, object->camera, object->telescope, object->exp_type, object->imfiles, object->filter, object->class, object->airmass, object->ra, object->dec, object->exp_time, object->background); } @@ -6301,14 +6288,15 @@ char class[256]; psF32 airmass; - psF32 ra; - psF32 dec; + psF64 ra; + psF64 dec; psF32 exp_time; - - 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; + + if (!rawDetrendExpPop(dbh, (char **)&exp_id, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, (char **)&class, &airmass, &ra, &dec, &exp_time, &background)) { psError(PS_ERR_UNKNOWN, false, "failed to pop a database row"); return NULL; } - return rawDetrendExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, class, airmass, ra, dec, exp_time); + return rawDetrendExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, class, airmass, ra, dec, exp_time, background); } @@ -6449,10 +6437,10 @@ return NULL; } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "ra", 0, NULL, object->ra)) { + if (!psMetadataAddF64(md, PS_LIST_TAIL, "ra", 0, NULL, object->ra)) { psError(PS_ERR_UNKNOWN, false, "failed to add item ra"); psFree(md); return NULL; } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "dec", 0, NULL, object->dec)) { + if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec", 0, NULL, object->dec)) { psError(PS_ERR_UNKNOWN, false, "failed to add item dec"); psFree(md); @@ -6461,4 +6449,9 @@ if (!psMetadataAddF32(md, PS_LIST_TAIL, "exp_time", 0, NULL, object->exp_time)) { psError(PS_ERR_UNKNOWN, false, "failed to add item exp_time"); + psFree(md); + return NULL; + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "background", 0, NULL, object->background)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item background"); psFree(md); return NULL; @@ -6479,7 +6472,8 @@ char *class; psF32 airmass; - psF32 ra; - psF32 dec; + psF64 ra; + psF64 dec; psF32 exp_time; + psF64 background; exp_id = psMetadataLookupPtr(&status, md, "exp_id"); @@ -6523,10 +6517,10 @@ return false; } - ra = psMetadataLookupF32(&status, md, "ra"); + ra = psMetadataLookupF64(&status, md, "ra"); if (!status) { psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item ra"); return false; } - dec = psMetadataLookupF32(&status, md, "dec"); + dec = psMetadataLookupF64(&status, md, "dec"); if (!status) { psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item dec"); @@ -6538,6 +6532,11 @@ return false; } - - return rawDetrendExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, class, airmass, ra, dec, exp_time); + background = psMetadataLookupF64(&status, md, "background"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item background"); + return false; + } + + return rawDetrendExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, class, airmass, ra, dec, exp_time, background); } psArray *rawDetrendExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) @@ -6597,5 +6596,5 @@ static void rawScienceExpRowFree(rawScienceExpRow *object); -rawScienceExpRow *rawScienceExpRowAlloc(const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, const char *class, psF32 airmass, psF32 ra, psF32 dec, psF32 exp_time) +rawScienceExpRow *rawScienceExpRowAlloc(const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, const char *class, psF32 airmass, psF64 ra, psF64 dec, psF32 exp_time, psF64 background) { rawScienceExpRow *object; @@ -6615,4 +6614,5 @@ object->dec = dec; object->exp_time = exp_time; + object->background = background; return object; @@ -6680,10 +6680,10 @@ return false; } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "ra", 0, NULL, 0.0)) { + if (!psMetadataAddF64(md, PS_LIST_TAIL, "ra", 0, NULL, 0.0)) { psError(PS_ERR_UNKNOWN, false, "failed to add item ra"); psFree(md); return false; } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "dec", 0, NULL, 0.0)) { + if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec", 0, NULL, 0.0)) { psError(PS_ERR_UNKNOWN, false, "failed to add item dec"); psFree(md); @@ -6695,4 +6695,9 @@ return false; } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "background", 0, NULL, 0.0)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item background"); + psFree(md); + return false; + } status = psDBCreateTable(dbh, RAWSCIENCEEXP_TABLE_NAME, md); @@ -6708,5 +6713,5 @@ } -bool rawScienceExpInsert(psDB * dbh, const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, const char *class, psF32 airmass, psF32 ra, psF32 dec, psF32 exp_time) +bool rawScienceExpInsert(psDB * dbh, const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, const char *class, psF32 airmass, psF64 ra, psF64 dec, psF32 exp_time, psF64 background) { psMetadata *md; @@ -6754,10 +6759,10 @@ return false; } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "ra", 0, NULL, ra)) { + if (!psMetadataAddF64(md, PS_LIST_TAIL, "ra", 0, NULL, ra)) { psError(PS_ERR_UNKNOWN, false, "failed to add item ra"); psFree(md); return false; } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "dec", 0, NULL, dec)) { + if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec", 0, NULL, dec)) { psError(PS_ERR_UNKNOWN, false, "failed to add item dec"); psFree(md); @@ -6769,4 +6774,9 @@ return false; } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "background", 0, NULL, background)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item background"); + psFree(md); + return false; + } status = psDBInsertOneRow(dbh, RAWSCIENCEEXP_TABLE_NAME, md); @@ -6776,5 +6786,5 @@ } -bool rawScienceExpPop(psDB *dbh, char **exp_id, char **camera, char **telescope, char **exp_type, psS32 *imfiles, char **filter, char **class, psF32 *airmass, psF32 *ra, psF32 *dec, psF32 *exp_time) +bool rawScienceExpPop(psDB *dbh, char **exp_id, char **camera, char **telescope, char **exp_type, psS32 *imfiles, char **filter, char **class, psF32 *airmass, psF64 *ra, psF64 *dec, psF32 *exp_time, psF64 *background) { psArray *rowSet; @@ -6868,5 +6878,5 @@ return false; } - *ra = psMetadataLookupF32(&status, row, "ra"); + *ra = psMetadataLookupF64(&status, row, "ra"); if (!status) { psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item ra"); @@ -6874,5 +6884,5 @@ return false; } - *dec = psMetadataLookupF32(&status, row, "dec"); + *dec = psMetadataLookupF64(&status, row, "dec"); if (!status) { psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item dec"); @@ -6886,4 +6896,10 @@ return false; } + *background = psMetadataLookupF64(&status, row, "background"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item background"); + psFree(row); + return false; + } psFree(row); @@ -6894,5 +6910,5 @@ bool rawScienceExpInsertObject(psDB *dbh, rawScienceExpRow *object) { - return rawScienceExpInsert(dbh, object->exp_id, object->camera, object->telescope, object->exp_type, object->imfiles, object->filter, object->class, object->airmass, object->ra, object->dec, object->exp_time); + return rawScienceExpInsert(dbh, object->exp_id, object->camera, object->telescope, object->exp_type, object->imfiles, object->filter, object->class, object->airmass, object->ra, object->dec, object->exp_time, object->background); } @@ -6907,14 +6923,15 @@ char class[256]; psF32 airmass; - psF32 ra; - psF32 dec; + psF64 ra; + psF64 dec; psF32 exp_time; - - 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; + + if (!rawScienceExpPop(dbh, (char **)&exp_id, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, (char **)&class, &airmass, &ra, &dec, &exp_time, &background)) { psError(PS_ERR_UNKNOWN, false, "failed to pop a database row"); return NULL; } - return rawScienceExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, class, airmass, ra, dec, exp_time); + return rawScienceExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, class, airmass, ra, dec, exp_time, background); } @@ -7055,10 +7072,10 @@ return NULL; } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "ra", 0, NULL, object->ra)) { + if (!psMetadataAddF64(md, PS_LIST_TAIL, "ra", 0, NULL, object->ra)) { psError(PS_ERR_UNKNOWN, false, "failed to add item ra"); psFree(md); return NULL; } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "dec", 0, NULL, object->dec)) { + if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec", 0, NULL, object->dec)) { psError(PS_ERR_UNKNOWN, false, "failed to add item dec"); psFree(md); @@ -7067,4 +7084,9 @@ if (!psMetadataAddF32(md, PS_LIST_TAIL, "exp_time", 0, NULL, object->exp_time)) { psError(PS_ERR_UNKNOWN, false, "failed to add item exp_time"); + psFree(md); + return NULL; + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "background", 0, NULL, object->background)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item background"); psFree(md); return NULL; @@ -7085,7 +7107,8 @@ char *class; psF32 airmass; - psF32 ra; - psF32 dec; + psF64 ra; + psF64 dec; psF32 exp_time; + psF64 background; exp_id = psMetadataLookupPtr(&status, md, "exp_id"); @@ -7129,10 +7152,10 @@ return false; } - ra = psMetadataLookupF32(&status, md, "ra"); + ra = psMetadataLookupF64(&status, md, "ra"); if (!status) { psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item ra"); return false; } - dec = psMetadataLookupF32(&status, md, "dec"); + dec = psMetadataLookupF64(&status, md, "dec"); if (!status) { psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item dec"); @@ -7144,6 +7167,11 @@ return false; } - - return rawScienceExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, class, airmass, ra, dec, exp_time); + background = psMetadataLookupF64(&status, md, "background"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item background"); + return false; + } + + return rawScienceExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, class, airmass, ra, dec, exp_time, background); } psArray *rawScienceExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) @@ -7203,5 +7231,5 @@ static void rawImfileRowFree(rawImfileRow *object); -rawImfileRow *rawImfileRowAlloc(const char *exp_id, const char *class, const char *class_id, const char *uri, const char *stats) +rawImfileRow *rawImfileRowAlloc(const char *exp_id, const char *class, const char *class_id, const char *uri) { rawImfileRow *object; @@ -7214,5 +7242,4 @@ object->class_id = psStringCopy(class_id); object->uri = psStringCopy(uri); - object->stats = psStringCopy(stats); return object; @@ -7225,5 +7252,4 @@ psFree(object->class_id); psFree(object->uri); - psFree(object->stats); } @@ -7259,9 +7285,4 @@ return false; } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "stats", 0, NULL, "255")) { - psError(PS_ERR_UNKNOWN, false, "failed to add item stats"); - psFree(md); - return false; - } status = psDBCreateTable(dbh, RAWIMFILE_TABLE_NAME, md); @@ -7277,5 +7298,5 @@ } -bool rawImfileInsert(psDB * dbh, const char *exp_id, const char *class, const char *class_id, const char *uri, const char *stats) +bool rawImfileInsert(psDB * dbh, const char *exp_id, const char *class, const char *class_id, const char *uri) { psMetadata *md; @@ -7303,9 +7324,4 @@ return false; } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "stats", 0, NULL, stats)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item stats"); - psFree(md); - return false; - } status = psDBInsertOneRow(dbh, RAWIMFILE_TABLE_NAME, md); @@ -7315,5 +7331,5 @@ } -bool rawImfilePop(psDB *dbh, char **exp_id, char **class, char **class_id, char **uri, char **stats) +bool rawImfilePop(psDB *dbh, char **exp_id, char **class, char **class_id, char **uri) { psArray *rowSet; @@ -7383,10 +7399,4 @@ return false; } - *stats = psMetadataLookupPtr(&status, row, "stats"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item stats"); - psFree(row); - return false; - } psFree(row); @@ -7397,5 +7407,5 @@ bool rawImfileInsertObject(psDB *dbh, rawImfileRow *object) { - return rawImfileInsert(dbh, object->exp_id, object->class, object->class_id, object->uri, object->stats); + return rawImfileInsert(dbh, object->exp_id, object->class, object->class_id, object->uri); } @@ -7406,12 +7416,11 @@ char class_id[256]; char uri[256]; - char stats[256]; - - if (!rawImfilePop(dbh, (char **)&exp_id, (char **)&class, (char **)&class_id, (char **)&uri, (char **)&stats)) { + + if (!rawImfilePop(dbh, (char **)&exp_id, (char **)&class, (char **)&class_id, (char **)&uri)) { psError(PS_ERR_UNKNOWN, false, "failed to pop a database row"); return NULL; } - return rawImfileRowAlloc(exp_id, class, class_id, uri, stats); + return rawImfileRowAlloc(exp_id, class, class_id, uri); } @@ -7532,9 +7541,4 @@ return NULL; } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "stats", 0, NULL, object->stats)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item stats"); - psFree(md); - return NULL; - } return md; @@ -7548,5 +7552,4 @@ char *class_id; char *uri; - char *stats; exp_id = psMetadataLookupPtr(&status, md, "exp_id"); @@ -7570,11 +7573,6 @@ return false; } - stats = psMetadataLookupPtr(&status, md, "stats"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item stats"); - return false; - } - - return rawImfileRowAlloc(exp_id, class, class_id, uri, stats); + + return rawImfileRowAlloc(exp_id, class, class_id, uri); } psArray *rawImfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) @@ -7634,5 +7632,5 @@ static void p1PendingExpRowFree(p1PendingExpRow *object); -p1PendingExpRow *p1PendingExpRowAlloc(const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, const char *class, psF32 airmass, psF32 ra, psF32 dec, psF32 exp_time, const char *recipe, psS32 p1_version) +p1PendingExpRow *p1PendingExpRowAlloc(const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 dec, psF32 exp_time, psF64 background, const char *recipe, psS32 p1_version) { p1PendingExpRow *object; @@ -7647,9 +7645,9 @@ object->imfiles = imfiles; object->filter = psStringCopy(filter); - object->class = psStringCopy(class); object->airmass = airmass; object->ra = ra; object->dec = dec; object->exp_time = exp_time; + object->background = background; object->recipe = psStringCopy(recipe); object->p1_version = p1_version; @@ -7665,5 +7663,4 @@ psFree(object->exp_type); psFree(object->filter); - psFree(object->class); psFree(object->recipe); } @@ -7710,9 +7707,4 @@ return false; } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, "255")) { - psError(PS_ERR_UNKNOWN, false, "failed to add item class"); - psFree(md); - return false; - } if (!psMetadataAddF32(md, PS_LIST_TAIL, "airmass", 0, NULL, 0.0)) { psError(PS_ERR_UNKNOWN, false, "failed to add item airmass"); @@ -7720,10 +7712,10 @@ return false; } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "ra", 0, NULL, 0.0)) { + if (!psMetadataAddF64(md, PS_LIST_TAIL, "ra", 0, NULL, 0.0)) { psError(PS_ERR_UNKNOWN, false, "failed to add item ra"); psFree(md); return false; } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "dec", 0, NULL, 0.0)) { + if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec", 0, NULL, 0.0)) { psError(PS_ERR_UNKNOWN, false, "failed to add item dec"); psFree(md); @@ -7735,4 +7727,9 @@ return false; } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "background", 0, NULL, 0.0)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item background"); + psFree(md); + return false; + } if (!psMetadataAddStr(md, PS_LIST_TAIL, "recipe", 0, NULL, "64")) { psError(PS_ERR_UNKNOWN, false, "failed to add item recipe"); @@ -7758,5 +7755,5 @@ } -bool p1PendingExpInsert(psDB * dbh, const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, const char *class, psF32 airmass, psF32 ra, psF32 dec, psF32 exp_time, const char *recipe, psS32 p1_version) +bool p1PendingExpInsert(psDB * dbh, const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 dec, psF32 exp_time, psF64 background, const char *recipe, psS32 p1_version) { psMetadata *md; @@ -7794,9 +7791,4 @@ return false; } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, class)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item class"); - psFree(md); - return false; - } if (!psMetadataAddF32(md, PS_LIST_TAIL, "airmass", 0, NULL, airmass)) { psError(PS_ERR_UNKNOWN, false, "failed to add item airmass"); @@ -7804,10 +7796,10 @@ return false; } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "ra", 0, NULL, ra)) { + if (!psMetadataAddF64(md, PS_LIST_TAIL, "ra", 0, NULL, ra)) { psError(PS_ERR_UNKNOWN, false, "failed to add item ra"); psFree(md); return false; } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "dec", 0, NULL, dec)) { + if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec", 0, NULL, dec)) { psError(PS_ERR_UNKNOWN, false, "failed to add item dec"); psFree(md); @@ -7819,4 +7811,9 @@ return false; } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "background", 0, NULL, background)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item background"); + psFree(md); + return false; + } if (!psMetadataAddStr(md, PS_LIST_TAIL, "recipe", 0, NULL, recipe)) { psError(PS_ERR_UNKNOWN, false, "failed to add item recipe"); @@ -7836,5 +7833,5 @@ } -bool p1PendingExpPop(psDB *dbh, char **exp_id, char **camera, char **telescope, char **exp_type, psS32 *imfiles, char **filter, char **class, psF32 *airmass, psF32 *ra, psF32 *dec, psF32 *exp_time, char **recipe, psS32 *p1_version) +bool p1PendingExpPop(psDB *dbh, char **exp_id, char **camera, char **telescope, char **exp_type, psS32 *imfiles, char **filter, psF32 *airmass, psF64 *ra, psF64 *dec, psF32 *exp_time, psF64 *background, char **recipe, psS32 *p1_version) { psArray *rowSet; @@ -7916,10 +7913,4 @@ return false; } - *class = psMetadataLookupPtr(&status, row, "class"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item class"); - psFree(row); - return false; - } *airmass = psMetadataLookupF32(&status, row, "airmass"); if (!status) { @@ -7928,5 +7919,5 @@ return false; } - *ra = psMetadataLookupF32(&status, row, "ra"); + *ra = psMetadataLookupF64(&status, row, "ra"); if (!status) { psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item ra"); @@ -7934,5 +7925,5 @@ return false; } - *dec = psMetadataLookupF32(&status, row, "dec"); + *dec = psMetadataLookupF64(&status, row, "dec"); if (!status) { psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item dec"); @@ -7946,4 +7937,10 @@ return false; } + *background = psMetadataLookupF64(&status, row, "background"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item background"); + psFree(row); + return false; + } *recipe = psMetadataLookupPtr(&status, row, "recipe"); if (!status) { @@ -7966,5 +7963,5 @@ bool p1PendingExpInsertObject(psDB *dbh, p1PendingExpRow *object) { - return p1PendingExpInsert(dbh, object->exp_id, object->camera, object->telescope, object->exp_type, object->imfiles, object->filter, object->class, object->airmass, object->ra, object->dec, object->exp_time, object->recipe, object->p1_version); + return p1PendingExpInsert(dbh, object->exp_id, object->camera, object->telescope, object->exp_type, object->imfiles, object->filter, object->airmass, object->ra, object->dec, object->exp_time, object->background, object->recipe, object->p1_version); } @@ -7977,18 +7974,18 @@ 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; - 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)) { + 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)) { psError(PS_ERR_UNKNOWN, false, "failed to pop a database row"); return NULL; } - return p1PendingExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, class, airmass, ra, dec, exp_time, recipe, p1_version); + return p1PendingExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, airmass, ra, dec, exp_time, background, recipe, p1_version); } @@ -8119,9 +8116,4 @@ return NULL; } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, object->class)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item class"); - psFree(md); - return NULL; - } if (!psMetadataAddF32(md, PS_LIST_TAIL, "airmass", 0, NULL, object->airmass)) { psError(PS_ERR_UNKNOWN, false, "failed to add item airmass"); @@ -8129,10 +8121,10 @@ return NULL; } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "ra", 0, NULL, object->ra)) { + if (!psMetadataAddF64(md, PS_LIST_TAIL, "ra", 0, NULL, object->ra)) { psError(PS_ERR_UNKNOWN, false, "failed to add item ra"); psFree(md); return NULL; } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "dec", 0, NULL, object->dec)) { + if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec", 0, NULL, object->dec)) { psError(PS_ERR_UNKNOWN, false, "failed to add item dec"); psFree(md); @@ -8141,4 +8133,9 @@ if (!psMetadataAddF32(md, PS_LIST_TAIL, "exp_time", 0, NULL, object->exp_time)) { psError(PS_ERR_UNKNOWN, false, "failed to add item exp_time"); + psFree(md); + return NULL; + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "background", 0, NULL, object->background)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item background"); psFree(md); return NULL; @@ -8167,9 +8164,9 @@ psS32 imfiles; char *filter; - char *class; psF32 airmass; - psF32 ra; - psF32 dec; + psF64 ra; + psF64 dec; psF32 exp_time; + psF64 background; char *recipe; psS32 p1_version; @@ -8205,9 +8202,4 @@ return false; } - class = psMetadataLookupPtr(&status, md, "class"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item class"); - return false; - } airmass = psMetadataLookupF32(&status, md, "airmass"); if (!status) { @@ -8215,10 +8207,10 @@ return false; } - ra = psMetadataLookupF32(&status, md, "ra"); + ra = psMetadataLookupF64(&status, md, "ra"); if (!status) { psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item ra"); return false; } - dec = psMetadataLookupF32(&status, md, "dec"); + dec = psMetadataLookupF64(&status, md, "dec"); if (!status) { psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item dec"); @@ -8230,4 +8222,9 @@ return false; } + background = psMetadataLookupF64(&status, md, "background"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item background"); + return false; + } recipe = psMetadataLookupPtr(&status, md, "recipe"); if (!status) { @@ -8241,5 +8238,5 @@ } - return p1PendingExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, class, airmass, ra, dec, exp_time, recipe, p1_version); + return p1PendingExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, airmass, ra, dec, exp_time, background, recipe, p1_version); } psArray *p1PendingExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) @@ -8299,5 +8296,5 @@ static void p2PendingExpRowFree(p2PendingExpRow *object); -p2PendingExpRow *p2PendingExpRowAlloc(const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, const char *class, psF32 airmass, psF32 ra, psF32 dec, psF32 exp_time, const char *recipe, psS32 p1_version, psS32 p2_version) +p2PendingExpRow *p2PendingExpRowAlloc(const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF32 ra, psF64 dec, psF64 exp_time, psF64 background, const char *recipe, psS32 p1_version, psS32 p2_version) { p2PendingExpRow *object; @@ -8312,9 +8309,9 @@ object->imfiles = imfiles; object->filter = psStringCopy(filter); - object->class = psStringCopy(class); object->airmass = airmass; object->ra = ra; object->dec = dec; object->exp_time = exp_time; + object->background = background; object->recipe = psStringCopy(recipe); object->p1_version = p1_version; @@ -8331,5 +8328,4 @@ psFree(object->exp_type); psFree(object->filter); - psFree(object->class); psFree(object->recipe); } @@ -8376,9 +8372,4 @@ return false; } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, "255")) { - psError(PS_ERR_UNKNOWN, false, "failed to add item class"); - psFree(md); - return false; - } if (!psMetadataAddF32(md, PS_LIST_TAIL, "airmass", 0, NULL, 0.0)) { psError(PS_ERR_UNKNOWN, false, "failed to add item airmass"); @@ -8391,11 +8382,16 @@ return false; } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "dec", 0, NULL, 0.0)) { + if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec", 0, NULL, 0.0)) { psError(PS_ERR_UNKNOWN, false, "failed to add item dec"); psFree(md); return false; } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "exp_time", 0, NULL, 0.0)) { + if (!psMetadataAddF64(md, PS_LIST_TAIL, "exp_time", 0, NULL, 0.0)) { psError(PS_ERR_UNKNOWN, false, "failed to add item exp_time"); + psFree(md); + return false; + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "background", 0, NULL, 0.0)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item background"); psFree(md); return false; @@ -8429,5 +8425,5 @@ } -bool p2PendingExpInsert(psDB * dbh, const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, const char *class, psF32 airmass, psF32 ra, psF32 dec, psF32 exp_time, const char *recipe, psS32 p1_version, psS32 p2_version) +bool p2PendingExpInsert(psDB * dbh, const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF32 ra, psF64 dec, psF64 exp_time, psF64 background, const char *recipe, psS32 p1_version, psS32 p2_version) { psMetadata *md; @@ -8465,9 +8461,4 @@ return false; } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, class)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item class"); - psFree(md); - return false; - } if (!psMetadataAddF32(md, PS_LIST_TAIL, "airmass", 0, NULL, airmass)) { psError(PS_ERR_UNKNOWN, false, "failed to add item airmass"); @@ -8480,11 +8471,16 @@ return false; } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "dec", 0, NULL, dec)) { + if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec", 0, NULL, dec)) { psError(PS_ERR_UNKNOWN, false, "failed to add item dec"); psFree(md); return false; } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "exp_time", 0, NULL, exp_time)) { + if (!psMetadataAddF64(md, PS_LIST_TAIL, "exp_time", 0, NULL, exp_time)) { psError(PS_ERR_UNKNOWN, false, "failed to add item exp_time"); + psFree(md); + return false; + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "background", 0, NULL, background)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item background"); psFree(md); return false; @@ -8512,5 +8508,5 @@ } -bool p2PendingExpPop(psDB *dbh, char **exp_id, char **camera, char **telescope, char **exp_type, psS32 *imfiles, char **filter, char **class, psF32 *airmass, psF32 *ra, psF32 *dec, psF32 *exp_time, char **recipe, psS32 *p1_version, psS32 *p2_version) +bool p2PendingExpPop(psDB *dbh, char **exp_id, char **camera, char **telescope, char **exp_type, psS32 *imfiles, char **filter, psF32 *airmass, psF32 *ra, psF64 *dec, psF64 *exp_time, psF64 *background, char **recipe, psS32 *p1_version, psS32 *p2_version) { psArray *rowSet; @@ -8592,10 +8588,4 @@ return false; } - *class = psMetadataLookupPtr(&status, row, "class"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item class"); - psFree(row); - return false; - } *airmass = psMetadataLookupF32(&status, row, "airmass"); if (!status) { @@ -8610,5 +8600,5 @@ return false; } - *dec = psMetadataLookupF32(&status, row, "dec"); + *dec = psMetadataLookupF64(&status, row, "dec"); if (!status) { psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item dec"); @@ -8616,5 +8606,5 @@ return false; } - *exp_time = psMetadataLookupF32(&status, row, "exp_time"); + *exp_time = psMetadataLookupF64(&status, row, "exp_time"); if (!status) { psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item exp_time"); @@ -8622,4 +8612,10 @@ return false; } + *background = psMetadataLookupF64(&status, row, "background"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item background"); + psFree(row); + return false; + } *recipe = psMetadataLookupPtr(&status, row, "recipe"); if (!status) { @@ -8648,5 +8644,5 @@ bool p2PendingExpInsertObject(psDB *dbh, p2PendingExpRow *object) { - return p2PendingExpInsert(dbh, object->exp_id, object->camera, object->telescope, object->exp_type, object->imfiles, object->filter, object->class, object->airmass, object->ra, object->dec, object->exp_time, object->recipe, object->p1_version, object->p2_version); + return p2PendingExpInsert(dbh, object->exp_id, object->camera, object->telescope, object->exp_type, object->imfiles, object->filter, object->airmass, object->ra, object->dec, object->exp_time, object->background, object->recipe, object->p1_version, object->p2_version); } @@ -8659,19 +8655,19 @@ 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; psS32 p2_version; - 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)) { psError(PS_ERR_UNKNOWN, false, "failed to pop a database row"); return NULL; } - return p2PendingExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, class, airmass, ra, dec, exp_time, recipe, p1_version, p2_version); + return p2PendingExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, airmass, ra, dec, exp_time, background, recipe, p1_version, p2_version); } @@ -8802,9 +8798,4 @@ return NULL; } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, object->class)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item class"); - psFree(md); - return NULL; - } if (!psMetadataAddF32(md, PS_LIST_TAIL, "airmass", 0, NULL, object->airmass)) { psError(PS_ERR_UNKNOWN, false, "failed to add item airmass"); @@ -8817,11 +8808,16 @@ return NULL; } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "dec", 0, NULL, object->dec)) { + if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec", 0, NULL, object->dec)) { psError(PS_ERR_UNKNOWN, false, "failed to add item dec"); psFree(md); return NULL; } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "exp_time", 0, NULL, object->exp_time)) { + if (!psMetadataAddF64(md, PS_LIST_TAIL, "exp_time", 0, NULL, object->exp_time)) { psError(PS_ERR_UNKNOWN, false, "failed to add item exp_time"); + psFree(md); + return NULL; + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "background", 0, NULL, object->background)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item background"); psFree(md); return NULL; @@ -8855,9 +8851,9 @@ psS32 imfiles; char *filter; - char *class; psF32 airmass; psF32 ra; - psF32 dec; - psF32 exp_time; + psF64 dec; + psF64 exp_time; + psF64 background; char *recipe; psS32 p1_version; @@ -8894,9 +8890,4 @@ return false; } - class = psMetadataLookupPtr(&status, md, "class"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item class"); - return false; - } airmass = psMetadataLookupF32(&status, md, "airmass"); if (!status) { @@ -8909,14 +8900,19 @@ return false; } - dec = psMetadataLookupF32(&status, md, "dec"); + dec = psMetadataLookupF64(&status, md, "dec"); if (!status) { psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item dec"); return false; } - exp_time = psMetadataLookupF32(&status, md, "exp_time"); + exp_time = psMetadataLookupF64(&status, md, "exp_time"); if (!status) { psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item exp_time"); return false; } + background = psMetadataLookupF64(&status, md, "background"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item background"); + return false; + } recipe = psMetadataLookupPtr(&status, md, "recipe"); if (!status) { @@ -8935,5 +8931,5 @@ } - return p2PendingExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, class, airmass, ra, dec, exp_time, recipe, p1_version, p2_version); + return p2PendingExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, airmass, ra, dec, exp_time, background, recipe, p1_version, p2_version); } psArray *p2PendingExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) @@ -9482,5 +9478,5 @@ static void p2DoneExpRowFree(p2DoneExpRow *object); -p2DoneExpRow *p2DoneExpRowAlloc(const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, const char *class, psF32 airmass, psF32 ra, psF32 dec, psF32 exp_time, const char *recipe, psS32 p1_version, psS32 p2_version) +p2DoneExpRow *p2DoneExpRowAlloc(const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 dec, psF32 exp_time, psF64 background, const char *recipe, psS32 p1_version, psS32 p2_version) { p2DoneExpRow *object; @@ -9495,9 +9491,9 @@ object->imfiles = imfiles; object->filter = psStringCopy(filter); - object->class = psStringCopy(class); object->airmass = airmass; object->ra = ra; object->dec = dec; object->exp_time = exp_time; + object->background = background; object->recipe = psStringCopy(recipe); object->p1_version = p1_version; @@ -9514,5 +9510,4 @@ psFree(object->exp_type); psFree(object->filter); - psFree(object->class); psFree(object->recipe); } @@ -9559,9 +9554,4 @@ return false; } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, "255")) { - psError(PS_ERR_UNKNOWN, false, "failed to add item class"); - psFree(md); - return false; - } if (!psMetadataAddF32(md, PS_LIST_TAIL, "airmass", 0, NULL, 0.0)) { psError(PS_ERR_UNKNOWN, false, "failed to add item airmass"); @@ -9569,10 +9559,10 @@ return false; } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "ra", 0, NULL, 0.0)) { + if (!psMetadataAddF64(md, PS_LIST_TAIL, "ra", 0, NULL, 0.0)) { psError(PS_ERR_UNKNOWN, false, "failed to add item ra"); psFree(md); return false; } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "dec", 0, NULL, 0.0)) { + if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec", 0, NULL, 0.0)) { psError(PS_ERR_UNKNOWN, false, "failed to add item dec"); psFree(md); @@ -9584,4 +9574,9 @@ return false; } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "background", 0, NULL, 0.0)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item background"); + psFree(md); + return false; + } if (!psMetadataAddStr(md, PS_LIST_TAIL, "recipe", 0, NULL, "64")) { psError(PS_ERR_UNKNOWN, false, "failed to add item recipe"); @@ -9612,5 +9607,5 @@ } -bool p2DoneExpInsert(psDB * dbh, const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, const char *class, psF32 airmass, psF32 ra, psF32 dec, psF32 exp_time, const char *recipe, psS32 p1_version, psS32 p2_version) +bool p2DoneExpInsert(psDB * dbh, const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 dec, psF32 exp_time, psF64 background, const char *recipe, psS32 p1_version, psS32 p2_version) { psMetadata *md; @@ -9648,9 +9643,4 @@ return false; } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, class)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item class"); - psFree(md); - return false; - } if (!psMetadataAddF32(md, PS_LIST_TAIL, "airmass", 0, NULL, airmass)) { psError(PS_ERR_UNKNOWN, false, "failed to add item airmass"); @@ -9658,10 +9648,10 @@ return false; } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "ra", 0, NULL, ra)) { + if (!psMetadataAddF64(md, PS_LIST_TAIL, "ra", 0, NULL, ra)) { psError(PS_ERR_UNKNOWN, false, "failed to add item ra"); psFree(md); return false; } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "dec", 0, NULL, dec)) { + if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec", 0, NULL, dec)) { psError(PS_ERR_UNKNOWN, false, "failed to add item dec"); psFree(md); @@ -9673,4 +9663,9 @@ return false; } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "background", 0, NULL, background)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item background"); + psFree(md); + return false; + } if (!psMetadataAddStr(md, PS_LIST_TAIL, "recipe", 0, NULL, recipe)) { psError(PS_ERR_UNKNOWN, false, "failed to add item recipe"); @@ -9695,5 +9690,5 @@ } -bool p2DoneExpPop(psDB *dbh, char **exp_id, char **camera, char **telescope, char **exp_type, psS32 *imfiles, char **filter, char **class, psF32 *airmass, psF32 *ra, psF32 *dec, psF32 *exp_time, char **recipe, psS32 *p1_version, psS32 *p2_version) +bool p2DoneExpPop(psDB *dbh, char **exp_id, char **camera, char **telescope, char **exp_type, psS32 *imfiles, char **filter, psF32 *airmass, psF64 *ra, psF64 *dec, psF32 *exp_time, psF64 *background, char **recipe, psS32 *p1_version, psS32 *p2_version) { psArray *rowSet; @@ -9775,10 +9770,4 @@ return false; } - *class = psMetadataLookupPtr(&status, row, "class"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item class"); - psFree(row); - return false; - } *airmass = psMetadataLookupF32(&status, row, "airmass"); if (!status) { @@ -9787,5 +9776,5 @@ return false; } - *ra = psMetadataLookupF32(&status, row, "ra"); + *ra = psMetadataLookupF64(&status, row, "ra"); if (!status) { psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item ra"); @@ -9793,5 +9782,5 @@ return false; } - *dec = psMetadataLookupF32(&status, row, "dec"); + *dec = psMetadataLookupF64(&status, row, "dec"); if (!status) { psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item dec"); @@ -9805,4 +9794,10 @@ return false; } + *background = psMetadataLookupF64(&status, row, "background"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item background"); + psFree(row); + return false; + } *recipe = psMetadataLookupPtr(&status, row, "recipe"); if (!status) { @@ -9831,5 +9826,5 @@ bool p2DoneExpInsertObject(psDB *dbh, p2DoneExpRow *object) { - return p2DoneExpInsert(dbh, object->exp_id, object->camera, object->telescope, object->exp_type, object->imfiles, object->filter, object->class, object->airmass, object->ra, object->dec, object->exp_time, object->recipe, object->p1_version, object->p2_version); + return p2DoneExpInsert(dbh, object->exp_id, object->camera, object->telescope, object->exp_type, object->imfiles, object->filter, object->airmass, object->ra, object->dec, object->exp_time, object->background, object->recipe, object->p1_version, object->p2_version); } @@ -9842,19 +9837,19 @@ 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; psS32 p2_version; - 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)) { psError(PS_ERR_UNKNOWN, false, "failed to pop a database row"); return NULL; } - return p2DoneExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, class, airmass, ra, dec, exp_time, recipe, p1_version, p2_version); + return p2DoneExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, airmass, ra, dec, exp_time, background, recipe, p1_version, p2_version); } @@ -9985,9 +9980,4 @@ return NULL; } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, object->class)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item class"); - psFree(md); - return NULL; - } if (!psMetadataAddF32(md, PS_LIST_TAIL, "airmass", 0, NULL, object->airmass)) { psError(PS_ERR_UNKNOWN, false, "failed to add item airmass"); @@ -9995,10 +9985,10 @@ return NULL; } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "ra", 0, NULL, object->ra)) { + if (!psMetadataAddF64(md, PS_LIST_TAIL, "ra", 0, NULL, object->ra)) { psError(PS_ERR_UNKNOWN, false, "failed to add item ra"); psFree(md); return NULL; } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "dec", 0, NULL, object->dec)) { + if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec", 0, NULL, object->dec)) { psError(PS_ERR_UNKNOWN, false, "failed to add item dec"); psFree(md); @@ -10007,4 +9997,9 @@ if (!psMetadataAddF32(md, PS_LIST_TAIL, "exp_time", 0, NULL, object->exp_time)) { psError(PS_ERR_UNKNOWN, false, "failed to add item exp_time"); + psFree(md); + return NULL; + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "background", 0, NULL, object->background)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item background"); psFree(md); return NULL; @@ -10038,9 +10033,9 @@ psS32 imfiles; char *filter; - char *class; psF32 airmass; - psF32 ra; - psF32 dec; + psF64 ra; + psF64 dec; psF32 exp_time; + psF64 background; char *recipe; psS32 p1_version; @@ -10077,9 +10072,4 @@ return false; } - class = psMetadataLookupPtr(&status, md, "class"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item class"); - return false; - } airmass = psMetadataLookupF32(&status, md, "airmass"); if (!status) { @@ -10087,10 +10077,10 @@ return false; } - ra = psMetadataLookupF32(&status, md, "ra"); + ra = psMetadataLookupF64(&status, md, "ra"); if (!status) { psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item ra"); return false; } - dec = psMetadataLookupF32(&status, md, "dec"); + dec = psMetadataLookupF64(&status, md, "dec"); if (!status) { psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item dec"); @@ -10102,4 +10092,9 @@ return false; } + background = psMetadataLookupF64(&status, md, "background"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item background"); + return false; + } recipe = psMetadataLookupPtr(&status, md, "recipe"); if (!status) { @@ -10118,5 +10113,5 @@ } - return p2DoneExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, class, airmass, ra, dec, exp_time, recipe, p1_version, p2_version); + return p2DoneExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, airmass, ra, dec, exp_time, background, recipe, p1_version, p2_version); } psArray *p2DoneExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) @@ -10665,5 +10660,5 @@ static void p3PendingExpRowFree(p3PendingExpRow *object); -p3PendingExpRow *p3PendingExpRowAlloc(const char *exp_id, const char *camera, const char *exp_type, psS32 imfiles, const char *filter, const char *class, psF32 airmass, psF32 ra, psF32 dec, psF32 exp_time, const char *recipe, psS32 p2_version, psS32 p3_version) +p3PendingExpRow *p3PendingExpRowAlloc(const char *exp_id, const char *camera, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 dec, psF32 exp_time, psF64 background, const char *recipe, psS32 p2_version, psS32 p3_version) { p3PendingExpRow *object; @@ -10677,9 +10672,9 @@ object->imfiles = imfiles; object->filter = psStringCopy(filter); - object->class = psStringCopy(class); object->airmass = airmass; object->ra = ra; object->dec = dec; object->exp_time = exp_time; + object->background = background; object->recipe = psStringCopy(recipe); object->p2_version = p2_version; @@ -10695,5 +10690,4 @@ psFree(object->exp_type); psFree(object->filter); - psFree(object->class); psFree(object->recipe); } @@ -10735,9 +10729,4 @@ return false; } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, "255")) { - psError(PS_ERR_UNKNOWN, false, "failed to add item class"); - psFree(md); - return false; - } if (!psMetadataAddF32(md, PS_LIST_TAIL, "airmass", 0, NULL, 0.0)) { psError(PS_ERR_UNKNOWN, false, "failed to add item airmass"); @@ -10745,10 +10734,10 @@ return false; } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "ra", 0, NULL, 0.0)) { + if (!psMetadataAddF64(md, PS_LIST_TAIL, "ra", 0, NULL, 0.0)) { psError(PS_ERR_UNKNOWN, false, "failed to add item ra"); psFree(md); return false; } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "dec", 0, NULL, 0.0)) { + if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec", 0, NULL, 0.0)) { psError(PS_ERR_UNKNOWN, false, "failed to add item dec"); psFree(md); @@ -10760,4 +10749,9 @@ return false; } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "background", 0, NULL, 0.0)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item background"); + psFree(md); + return false; + } if (!psMetadataAddStr(md, PS_LIST_TAIL, "recipe", 0, NULL, "64")) { psError(PS_ERR_UNKNOWN, false, "failed to add item recipe"); @@ -10788,5 +10782,5 @@ } -bool p3PendingExpInsert(psDB * dbh, const char *exp_id, const char *camera, const char *exp_type, psS32 imfiles, const char *filter, const char *class, psF32 airmass, psF32 ra, psF32 dec, psF32 exp_time, const char *recipe, psS32 p2_version, psS32 p3_version) +bool p3PendingExpInsert(psDB * dbh, const char *exp_id, const char *camera, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 dec, psF32 exp_time, psF64 background, const char *recipe, psS32 p2_version, psS32 p3_version) { psMetadata *md; @@ -10819,9 +10813,4 @@ return false; } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, class)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item class"); - psFree(md); - return false; - } if (!psMetadataAddF32(md, PS_LIST_TAIL, "airmass", 0, NULL, airmass)) { psError(PS_ERR_UNKNOWN, false, "failed to add item airmass"); @@ -10829,10 +10818,10 @@ return false; } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "ra", 0, NULL, ra)) { + if (!psMetadataAddF64(md, PS_LIST_TAIL, "ra", 0, NULL, ra)) { psError(PS_ERR_UNKNOWN, false, "failed to add item ra"); psFree(md); return false; } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "dec", 0, NULL, dec)) { + if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec", 0, NULL, dec)) { psError(PS_ERR_UNKNOWN, false, "failed to add item dec"); psFree(md); @@ -10844,4 +10833,9 @@ return false; } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "background", 0, NULL, background)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item background"); + psFree(md); + return false; + } if (!psMetadataAddStr(md, PS_LIST_TAIL, "recipe", 0, NULL, recipe)) { psError(PS_ERR_UNKNOWN, false, "failed to add item recipe"); @@ -10866,5 +10860,5 @@ } -bool p3PendingExpPop(psDB *dbh, char **exp_id, char **camera, char **exp_type, psS32 *imfiles, char **filter, char **class, psF32 *airmass, psF32 *ra, psF32 *dec, psF32 *exp_time, char **recipe, psS32 *p2_version, psS32 *p3_version) +bool p3PendingExpPop(psDB *dbh, char **exp_id, char **camera, char **exp_type, psS32 *imfiles, char **filter, psF32 *airmass, psF64 *ra, psF64 *dec, psF32 *exp_time, psF64 *background, char **recipe, psS32 *p2_version, psS32 *p3_version) { psArray *rowSet; @@ -10940,10 +10934,4 @@ return false; } - *class = psMetadataLookupPtr(&status, row, "class"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item class"); - psFree(row); - return false; - } *airmass = psMetadataLookupF32(&status, row, "airmass"); if (!status) { @@ -10952,5 +10940,5 @@ return false; } - *ra = psMetadataLookupF32(&status, row, "ra"); + *ra = psMetadataLookupF64(&status, row, "ra"); if (!status) { psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item ra"); @@ -10958,5 +10946,5 @@ return false; } - *dec = psMetadataLookupF32(&status, row, "dec"); + *dec = psMetadataLookupF64(&status, row, "dec"); if (!status) { psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item dec"); @@ -10970,4 +10958,10 @@ return false; } + *background = psMetadataLookupF64(&status, row, "background"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item background"); + psFree(row); + return false; + } *recipe = psMetadataLookupPtr(&status, row, "recipe"); if (!status) { @@ -10996,5 +10990,5 @@ bool p3PendingExpInsertObject(psDB *dbh, p3PendingExpRow *object) { - return p3PendingExpInsert(dbh, object->exp_id, object->camera, object->exp_type, object->imfiles, object->filter, object->class, object->airmass, object->ra, object->dec, object->exp_time, object->recipe, object->p2_version, object->p3_version); + return p3PendingExpInsert(dbh, object->exp_id, object->camera, object->exp_type, object->imfiles, object->filter, object->airmass, object->ra, object->dec, object->exp_time, object->background, object->recipe, object->p2_version, object->p3_version); } @@ -11006,19 +11000,19 @@ 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; psS32 p3_version; - 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)) { psError(PS_ERR_UNKNOWN, false, "failed to pop a database row"); return NULL; } - return p3PendingExpRowAlloc(exp_id, camera, exp_type, imfiles, filter, class, airmass, ra, dec, exp_time, recipe, p2_version, p3_version); + return p3PendingExpRowAlloc(exp_id, camera, exp_type, imfiles, filter, airmass, ra, dec, exp_time, background, recipe, p2_version, p3_version); } @@ -11144,9 +11138,4 @@ return NULL; } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, object->class)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item class"); - psFree(md); - return NULL; - } if (!psMetadataAddF32(md, PS_LIST_TAIL, "airmass", 0, NULL, object->airmass)) { psError(PS_ERR_UNKNOWN, false, "failed to add item airmass"); @@ -11154,10 +11143,10 @@ return NULL; } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "ra", 0, NULL, object->ra)) { + if (!psMetadataAddF64(md, PS_LIST_TAIL, "ra", 0, NULL, object->ra)) { psError(PS_ERR_UNKNOWN, false, "failed to add item ra"); psFree(md); return NULL; } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "dec", 0, NULL, object->dec)) { + if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec", 0, NULL, object->dec)) { psError(PS_ERR_UNKNOWN, false, "failed to add item dec"); psFree(md); @@ -11166,4 +11155,9 @@ if (!psMetadataAddF32(md, PS_LIST_TAIL, "exp_time", 0, NULL, object->exp_time)) { psError(PS_ERR_UNKNOWN, false, "failed to add item exp_time"); + psFree(md); + return NULL; + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "background", 0, NULL, object->background)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item background"); psFree(md); return NULL; @@ -11196,9 +11190,9 @@ psS32 imfiles; char *filter; - char *class; psF32 airmass; - psF32 ra; - psF32 dec; + psF64 ra; + psF64 dec; psF32 exp_time; + psF64 background; char *recipe; psS32 p2_version; @@ -11230,9 +11224,4 @@ return false; } - class = psMetadataLookupPtr(&status, md, "class"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item class"); - return false; - } airmass = psMetadataLookupF32(&status, md, "airmass"); if (!status) { @@ -11240,10 +11229,10 @@ return false; } - ra = psMetadataLookupF32(&status, md, "ra"); + ra = psMetadataLookupF64(&status, md, "ra"); if (!status) { psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item ra"); return false; } - dec = psMetadataLookupF32(&status, md, "dec"); + dec = psMetadataLookupF64(&status, md, "dec"); if (!status) { psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item dec"); @@ -11255,4 +11244,9 @@ return false; } + background = psMetadataLookupF64(&status, md, "background"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item background"); + return false; + } recipe = psMetadataLookupPtr(&status, md, "recipe"); if (!status) { @@ -11271,5 +11265,5 @@ } - return p3PendingExpRowAlloc(exp_id, camera, exp_type, imfiles, filter, class, airmass, ra, dec, exp_time, recipe, p2_version, p3_version); + return p3PendingExpRowAlloc(exp_id, camera, exp_type, imfiles, filter, airmass, ra, dec, exp_time, background, recipe, p2_version, p3_version); } psArray *p3PendingExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) @@ -11669,5 +11663,5 @@ static void detInputExpRowFree(detInputExpRow *object); -detInputExpRow *detInputExpRowAlloc(psS32 det_id, psS32 iteration, const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, const char *class, psF32 airmass, psF32 ra, psF32 dec, psF32 exp_time) +detInputExpRow *detInputExpRowAlloc(psS32 det_id, psS32 iteration, const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 dec, psF32 exp_time, psF64 background) { detInputExpRow *object; @@ -11684,9 +11678,9 @@ object->imfiles = imfiles; object->filter = psStringCopy(filter); - object->class = psStringCopy(class); object->airmass = airmass; object->ra = ra; object->dec = dec; object->exp_time = exp_time; + object->background = background; return object; @@ -11700,5 +11694,4 @@ psFree(object->exp_type); psFree(object->filter); - psFree(object->class); } @@ -11754,9 +11747,4 @@ return false; } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, "255")) { - psError(PS_ERR_UNKNOWN, false, "failed to add item class"); - psFree(md); - return false; - } if (!psMetadataAddF32(md, PS_LIST_TAIL, "airmass", 0, NULL, 0.0)) { psError(PS_ERR_UNKNOWN, false, "failed to add item airmass"); @@ -11764,10 +11752,10 @@ return false; } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "ra", 0, NULL, 0.0)) { + if (!psMetadataAddF64(md, PS_LIST_TAIL, "ra", 0, NULL, 0.0)) { psError(PS_ERR_UNKNOWN, false, "failed to add item ra"); psFree(md); return false; } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "dec", 0, NULL, 0.0)) { + if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec", 0, NULL, 0.0)) { psError(PS_ERR_UNKNOWN, false, "failed to add item dec"); psFree(md); @@ -11779,4 +11767,9 @@ return false; } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "background", 0, NULL, 0.0)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item background"); + psFree(md); + return false; + } status = psDBCreateTable(dbh, DETINPUTEXP_TABLE_NAME, md); @@ -11792,5 +11785,5 @@ } -bool detInputExpInsert(psDB * dbh, psS32 det_id, psS32 iteration, const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, const char *class, psF32 airmass, psF32 ra, psF32 dec, psF32 exp_time) +bool detInputExpInsert(psDB * dbh, psS32 det_id, psS32 iteration, const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 dec, psF32 exp_time, psF64 background) { psMetadata *md; @@ -11838,9 +11831,4 @@ return false; } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, class)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item class"); - psFree(md); - return false; - } if (!psMetadataAddF32(md, PS_LIST_TAIL, "airmass", 0, NULL, airmass)) { psError(PS_ERR_UNKNOWN, false, "failed to add item airmass"); @@ -11848,10 +11836,10 @@ return false; } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "ra", 0, NULL, ra)) { + if (!psMetadataAddF64(md, PS_LIST_TAIL, "ra", 0, NULL, ra)) { psError(PS_ERR_UNKNOWN, false, "failed to add item ra"); psFree(md); return false; } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "dec", 0, NULL, dec)) { + if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec", 0, NULL, dec)) { psError(PS_ERR_UNKNOWN, false, "failed to add item dec"); psFree(md); @@ -11863,4 +11851,9 @@ return false; } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "background", 0, NULL, background)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item background"); + psFree(md); + return false; + } status = psDBInsertOneRow(dbh, DETINPUTEXP_TABLE_NAME, md); @@ -11870,5 +11863,5 @@ } -bool detInputExpPop(psDB *dbh, psS32 *det_id, psS32 *iteration, char **exp_id, char **camera, char **telescope, char **exp_type, psS32 *imfiles, char **filter, char **class, psF32 *airmass, psF32 *ra, psF32 *dec, psF32 *exp_time) +bool detInputExpPop(psDB *dbh, psS32 *det_id, psS32 *iteration, char **exp_id, char **camera, char **telescope, char **exp_type, psS32 *imfiles, char **filter, psF32 *airmass, psF64 *ra, psF64 *dec, psF32 *exp_time, psF64 *background) { psArray *rowSet; @@ -11962,10 +11955,4 @@ return false; } - *class = psMetadataLookupPtr(&status, row, "class"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item class"); - psFree(row); - return false; - } *airmass = psMetadataLookupF32(&status, row, "airmass"); if (!status) { @@ -11974,5 +11961,5 @@ return false; } - *ra = psMetadataLookupF32(&status, row, "ra"); + *ra = psMetadataLookupF64(&status, row, "ra"); if (!status) { psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item ra"); @@ -11980,5 +11967,5 @@ return false; } - *dec = psMetadataLookupF32(&status, row, "dec"); + *dec = psMetadataLookupF64(&status, row, "dec"); if (!status) { psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item dec"); @@ -11992,4 +11979,10 @@ return false; } + *background = psMetadataLookupF64(&status, row, "background"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item background"); + psFree(row); + return false; + } psFree(row); @@ -12000,5 +11993,5 @@ bool detInputExpInsertObject(psDB *dbh, detInputExpRow *object) { - return detInputExpInsert(dbh, object->det_id, object->iteration, object->exp_id, object->camera, object->telescope, object->exp_type, object->imfiles, object->filter, object->class, object->airmass, object->ra, object->dec, object->exp_time); + return detInputExpInsert(dbh, object->det_id, object->iteration, object->exp_id, object->camera, object->telescope, object->exp_type, object->imfiles, object->filter, object->airmass, object->ra, object->dec, object->exp_time, object->background); } @@ -12013,16 +12006,16 @@ psS32 imfiles; char filter[256]; - char class[256]; psF32 airmass; - psF32 ra; - psF32 dec; + psF64 ra; + psF64 dec; psF32 exp_time; - - 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; + + 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)) { psError(PS_ERR_UNKNOWN, false, "failed to pop a database row"); return NULL; } - return detInputExpRowAlloc(det_id, iteration, exp_id, camera, telescope, exp_type, imfiles, filter, class, airmass, ra, dec, exp_time); + return detInputExpRowAlloc(det_id, iteration, exp_id, camera, telescope, exp_type, imfiles, filter, airmass, ra, dec, exp_time, background); } @@ -12163,9 +12156,4 @@ return NULL; } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, object->class)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item class"); - psFree(md); - return NULL; - } if (!psMetadataAddF32(md, PS_LIST_TAIL, "airmass", 0, NULL, object->airmass)) { psError(PS_ERR_UNKNOWN, false, "failed to add item airmass"); @@ -12173,10 +12161,10 @@ return NULL; } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "ra", 0, NULL, object->ra)) { + if (!psMetadataAddF64(md, PS_LIST_TAIL, "ra", 0, NULL, object->ra)) { psError(PS_ERR_UNKNOWN, false, "failed to add item ra"); psFree(md); return NULL; } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "dec", 0, NULL, object->dec)) { + if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec", 0, NULL, object->dec)) { psError(PS_ERR_UNKNOWN, false, "failed to add item dec"); psFree(md); @@ -12185,4 +12173,9 @@ if (!psMetadataAddF32(md, PS_LIST_TAIL, "exp_time", 0, NULL, object->exp_time)) { psError(PS_ERR_UNKNOWN, false, "failed to add item exp_time"); + psFree(md); + return NULL; + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "background", 0, NULL, object->background)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item background"); psFree(md); return NULL; @@ -12203,9 +12196,9 @@ psS32 imfiles; char *filter; - char *class; psF32 airmass; - psF32 ra; - psF32 dec; + psF64 ra; + psF64 dec; psF32 exp_time; + psF64 background; det_id = psMetadataLookupS32(&status, md, "det_id"); @@ -12249,9 +12242,4 @@ return false; } - class = psMetadataLookupPtr(&status, md, "class"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item class"); - return false; - } airmass = psMetadataLookupF32(&status, md, "airmass"); if (!status) { @@ -12259,10 +12247,10 @@ return false; } - ra = psMetadataLookupF32(&status, md, "ra"); + ra = psMetadataLookupF64(&status, md, "ra"); if (!status) { psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item ra"); return false; } - dec = psMetadataLookupF32(&status, md, "dec"); + dec = psMetadataLookupF64(&status, md, "dec"); if (!status) { psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item dec"); @@ -12274,6 +12262,11 @@ return false; } - - return detInputExpRowAlloc(det_id, iteration, exp_id, camera, telescope, exp_type, imfiles, filter, class, airmass, ra, dec, exp_time); + background = psMetadataLookupF64(&status, md, "background"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item background"); + return false; + } + + return detInputExpRowAlloc(det_id, iteration, exp_id, camera, telescope, exp_type, imfiles, filter, airmass, ra, dec, exp_time, background); } psArray *detInputExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) Index: /branches/jhoblitt/ippdb/src/ippdb.h =================================================================== --- /branches/jhoblitt/ippdb/src/ippdb.h (revision 8083) +++ /branches/jhoblitt/ippdb/src/ippdb.h (revision 8084) @@ -2103,5 +2103,4 @@ char *exp_type; psS32 imfiles; - char *class; } newExpRow; @@ -2116,6 +2115,5 @@ const char *telescope, const char *exp_type, - psS32 imfiles, - const char *class + psS32 imfiles ); @@ -2151,6 +2149,5 @@ const char *telescope, const char *exp_type, - psS32 imfiles, - const char *class + psS32 imfiles ); @@ -2166,6 +2163,5 @@ char **telescope, char **exp_type, - psS32 *imfiles, - char **class + psS32 *imfiles ); @@ -2472,7 +2468,8 @@ char *class; psF32 airmass; - psF32 ra; - psF32 dec; + psF64 ra; + psF64 dec; psF32 exp_time; + psF64 background; } rawDetrendExpRow; @@ -2491,7 +2488,8 @@ const char *class, psF32 airmass, - psF32 ra, - psF32 dec, - psF32 exp_time + psF64 ra, + psF64 dec, + psF32 exp_time, + psF64 background ); @@ -2531,7 +2529,8 @@ const char *class, psF32 airmass, - psF32 ra, - psF32 dec, - psF32 exp_time + psF64 ra, + psF64 dec, + psF32 exp_time, + psF64 background ); @@ -2551,7 +2550,8 @@ char **class, psF32 *airmass, - psF32 *ra, - psF32 *dec, - psF32 *exp_time + psF64 *ra, + psF64 *dec, + psF32 *exp_time, + psF64 *background ); @@ -2679,7 +2679,8 @@ char *class; psF32 airmass; - psF32 ra; - psF32 dec; + psF64 ra; + psF64 dec; psF32 exp_time; + psF64 background; } rawScienceExpRow; @@ -2698,7 +2699,8 @@ const char *class, psF32 airmass, - psF32 ra, - psF32 dec, - psF32 exp_time + psF64 ra, + psF64 dec, + psF32 exp_time, + psF64 background ); @@ -2738,7 +2740,8 @@ const char *class, psF32 airmass, - psF32 ra, - psF32 dec, - psF32 exp_time + psF64 ra, + psF64 dec, + psF32 exp_time, + psF64 background ); @@ -2758,7 +2761,8 @@ char **class, psF32 *airmass, - psF32 *ra, - psF32 *dec, - psF32 *exp_time + psF64 *ra, + psF64 *dec, + psF32 *exp_time, + psF64 *background ); @@ -2882,5 +2886,4 @@ char *class_id; char *uri; - char *stats; } rawImfileRow; @@ -2894,6 +2897,5 @@ const char *class, const char *class_id, - const char *uri, - const char *stats + const char *uri ); @@ -2928,6 +2930,5 @@ const char *class, const char *class_id, - const char *uri, - const char *stats + const char *uri ); @@ -2942,6 +2943,5 @@ char **class, char **class_id, - char **uri, - char **stats + char **uri ); @@ -3067,9 +3067,9 @@ psS32 imfiles; char *filter; - char *class; psF32 airmass; - psF32 ra; - psF32 dec; + psF64 ra; + psF64 dec; psF32 exp_time; + psF64 background; char *recipe; psS32 p1_version; @@ -3088,9 +3088,9 @@ psS32 imfiles, const char *filter, - const char *class, psF32 airmass, - psF32 ra, - psF32 dec, + psF64 ra, + psF64 dec, psF32 exp_time, + psF64 background, const char *recipe, psS32 p1_version @@ -3130,9 +3130,9 @@ psS32 imfiles, const char *filter, - const char *class, psF32 airmass, - psF32 ra, - psF32 dec, + psF64 ra, + psF64 dec, psF32 exp_time, + psF64 background, const char *recipe, psS32 p1_version @@ -3152,9 +3152,9 @@ psS32 *imfiles, char **filter, - char **class, psF32 *airmass, - psF32 *ra, - psF32 *dec, + psF64 *ra, + psF64 *dec, psF32 *exp_time, + psF64 *background, char **recipe, psS32 *p1_version @@ -3282,9 +3282,9 @@ psS32 imfiles; char *filter; - char *class; psF32 airmass; psF32 ra; - psF32 dec; - psF32 exp_time; + psF64 dec; + psF64 exp_time; + psF64 background; char *recipe; psS32 p1_version; @@ -3304,9 +3304,9 @@ psS32 imfiles, const char *filter, - const char *class, psF32 airmass, psF32 ra, - psF32 dec, - psF32 exp_time, + psF64 dec, + psF64 exp_time, + psF64 background, const char *recipe, psS32 p1_version, @@ -3347,9 +3347,9 @@ psS32 imfiles, const char *filter, - const char *class, psF32 airmass, psF32 ra, - psF32 dec, - psF32 exp_time, + psF64 dec, + psF64 exp_time, + psF64 background, const char *recipe, psS32 p1_version, @@ -3370,9 +3370,9 @@ psS32 *imfiles, char **filter, - char **class, psF32 *airmass, psF32 *ra, - psF32 *dec, - psF32 *exp_time, + psF64 *dec, + psF64 *exp_time, + psF64 *background, char **recipe, psS32 *p1_version, @@ -3692,9 +3692,9 @@ psS32 imfiles; char *filter; - char *class; psF32 airmass; - psF32 ra; - psF32 dec; + psF64 ra; + psF64 dec; psF32 exp_time; + psF64 background; char *recipe; psS32 p1_version; @@ -3714,9 +3714,9 @@ psS32 imfiles, const char *filter, - const char *class, psF32 airmass, - psF32 ra, - psF32 dec, + psF64 ra, + psF64 dec, psF32 exp_time, + psF64 background, const char *recipe, psS32 p1_version, @@ -3757,9 +3757,9 @@ psS32 imfiles, const char *filter, - const char *class, psF32 airmass, - psF32 ra, - psF32 dec, + psF64 ra, + psF64 dec, psF32 exp_time, + psF64 background, const char *recipe, psS32 p1_version, @@ -3780,9 +3780,9 @@ psS32 *imfiles, char **filter, - char **class, psF32 *airmass, - psF32 *ra, - psF32 *dec, + psF64 *ra, + psF64 *dec, psF32 *exp_time, + psF64 *background, char **recipe, psS32 *p1_version, @@ -4101,9 +4101,9 @@ psS32 imfiles; char *filter; - char *class; psF32 airmass; - psF32 ra; - psF32 dec; + psF64 ra; + psF64 dec; psF32 exp_time; + psF64 background; char *recipe; psS32 p2_version; @@ -4122,9 +4122,9 @@ psS32 imfiles, const char *filter, - const char *class, psF32 airmass, - psF32 ra, - psF32 dec, + psF64 ra, + psF64 dec, psF32 exp_time, + psF64 background, const char *recipe, psS32 p2_version, @@ -4164,9 +4164,9 @@ psS32 imfiles, const char *filter, - const char *class, psF32 airmass, - psF32 ra, - psF32 dec, + psF64 ra, + psF64 dec, psF32 exp_time, + psF64 background, const char *recipe, psS32 p2_version, @@ -4186,9 +4186,9 @@ psS32 *imfiles, char **filter, - char **class, psF32 *airmass, - psF32 *ra, - psF32 *dec, + psF64 *ra, + psF64 *dec, psF32 *exp_time, + psF64 *background, char **recipe, psS32 *p2_version, @@ -4490,9 +4490,9 @@ psS32 imfiles; char *filter; - char *class; psF32 airmass; - psF32 ra; - psF32 dec; + psF64 ra; + psF64 dec; psF32 exp_time; + psF64 background; } detInputExpRow; @@ -4511,9 +4511,9 @@ psS32 imfiles, const char *filter, - const char *class, psF32 airmass, - psF32 ra, - psF32 dec, - psF32 exp_time + psF64 ra, + psF64 dec, + psF32 exp_time, + psF64 background ); @@ -4553,9 +4553,9 @@ psS32 imfiles, const char *filter, - const char *class, psF32 airmass, - psF32 ra, - psF32 dec, - psF32 exp_time + psF64 ra, + psF64 dec, + psF32 exp_time, + psF64 background ); @@ -4575,9 +4575,9 @@ psS32 *imfiles, char **filter, - char **class, psF32 *airmass, - psF32 *ra, - psF32 *dec, - psF32 *exp_time + psF64 *ra, + psF64 *dec, + psF32 *exp_time, + psF64 *background ); Index: /branches/jhoblitt/ippdb/tests/alloc.c =================================================================== --- /branches/jhoblitt/ippdb/tests/alloc.c (revision 8083) +++ /branches/jhoblitt/ippdb/tests/alloc.c (revision 8084) @@ -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: /branches/jhoblitt/ippdb/tests/insert.c =================================================================== --- /branches/jhoblitt/ippdb/tests/insert.c (revision 8083) +++ /branches/jhoblitt/ippdb/tests/insert.c (revision 8084) @@ -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: /branches/jhoblitt/ippdb/tests/insertobject.c =================================================================== --- /branches/jhoblitt/ippdb/tests/insertobject.c (revision 8083) +++ /branches/jhoblitt/ippdb/tests/insertobject.c (revision 8084) @@ -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: /branches/jhoblitt/ippdb/tests/metadatafromobject.c =================================================================== --- /branches/jhoblitt/ippdb/tests/metadatafromobject.c (revision 8083) +++ /branches/jhoblitt/ippdb/tests/metadatafromobject.c (revision 8084) @@ -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: /branches/jhoblitt/ippdb/tests/objectfrommetadata.c =================================================================== --- /branches/jhoblitt/ippdb/tests/objectfrommetadata.c (revision 8083) +++ /branches/jhoblitt/ippdb/tests/objectfrommetadata.c (revision 8084) @@ -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: /branches/jhoblitt/ippdb/tests/pop.c =================================================================== --- /branches/jhoblitt/ippdb/tests/pop.c (revision 8083) +++ /branches/jhoblitt/ippdb/tests/pop.c (revision 8084) @@ -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); }