Index: /trunk/ippdb/Makefile.am =================================================================== --- /trunk/ippdb/Makefile.am (revision 14168) +++ /trunk/ippdb/Makefile.am (revision 14169) @@ -22,5 +22,4 @@ $(top_builddir)/docs/man/man3/guidePendingExpRow.3 \ $(top_builddir)/docs/man/man3/chipRunRow.3 \ - $(top_builddir)/docs/man/man3/chipInputImfileRow.3 \ $(top_builddir)/docs/man/man3/chipProcessedImfileRow.3 \ $(top_builddir)/docs/man/man3/chipMaskRow.3 \ @@ -51,5 +50,5 @@ -docs/man/man3/ippdb.3 docs/man/man3/summitExpRow.3 docs/man/man3/summitImfileRow.3 docs/man/man3/pzPendingExpRow.3 docs/man/man3/pzPendingImfileRow.3 docs/man/man3/pzDoneExpRow.3 docs/man/man3/pzDoneImfileRow.3 docs/man/man3/newExpRow.3 docs/man/man3/newImfileRow.3 docs/man/man3/rawExpRow.3 docs/man/man3/rawImfileRow.3 docs/man/man3/guidePendingExpRow.3 docs/man/man3/chipRunRow.3 docs/man/man3/chipInputImfileRow.3 docs/man/man3/chipProcessedImfileRow.3 docs/man/man3/chipMaskRow.3 docs/man/man3/camRunRow.3 docs/man/man3/camProcessedExpRow.3 docs/man/man3/camMaskRow.3 docs/man/man3/warpRunRow.3 docs/man/man3/warpInputExpRow.3 docs/man/man3/warpSkyCellMapRow.3 docs/man/man3/warpSkyfileRow.3 docs/man/man3/diffRunRow.3 docs/man/man3/diffInputSkyfileRow.3 docs/man/man3/diffSkyfileRow.3 docs/man/man3/stackRunRow.3 docs/man/man3/stackInputSkyfileRow.3 docs/man/man3/stackSumSkyfileRow.3 docs/man/man3/detRunRow.3 docs/man/man3/detInputExpRow.3 docs/man/man3/detProcessedImfileRow.3 docs/man/man3/detProcessedExpRow.3 docs/man/man3/detStackedImfileRow.3 docs/man/man3/detNormalizedStatImfileRow.3 docs/man/man3/detNormalizedImfileRow.3 docs/man/man3/detNormalizedExpRow.3 docs/man/man3/detResidImfileRow.3 docs/man/man3/detResidExpRow.3 docs/man/man3/detRunSummaryRow.3: +docs/man/man3/ippdb.3 docs/man/man3/summitExpRow.3 docs/man/man3/summitImfileRow.3 docs/man/man3/pzPendingExpRow.3 docs/man/man3/pzPendingImfileRow.3 docs/man/man3/pzDoneExpRow.3 docs/man/man3/pzDoneImfileRow.3 docs/man/man3/newExpRow.3 docs/man/man3/newImfileRow.3 docs/man/man3/rawExpRow.3 docs/man/man3/rawImfileRow.3 docs/man/man3/guidePendingExpRow.3 docs/man/man3/chipRunRow.3 docs/man/man3/chipProcessedImfileRow.3 docs/man/man3/chipMaskRow.3 docs/man/man3/camRunRow.3 docs/man/man3/camProcessedExpRow.3 docs/man/man3/camMaskRow.3 docs/man/man3/warpRunRow.3 docs/man/man3/warpInputExpRow.3 docs/man/man3/warpSkyCellMapRow.3 docs/man/man3/warpSkyfileRow.3 docs/man/man3/diffRunRow.3 docs/man/man3/diffInputSkyfileRow.3 docs/man/man3/diffSkyfileRow.3 docs/man/man3/stackRunRow.3 docs/man/man3/stackInputSkyfileRow.3 docs/man/man3/stackSumSkyfileRow.3 docs/man/man3/detRunRow.3 docs/man/man3/detInputExpRow.3 docs/man/man3/detProcessedImfileRow.3 docs/man/man3/detProcessedExpRow.3 docs/man/man3/detStackedImfileRow.3 docs/man/man3/detNormalizedStatImfileRow.3 docs/man/man3/detNormalizedImfileRow.3 docs/man/man3/detNormalizedExpRow.3 docs/man/man3/detResidImfileRow.3 docs/man/man3/detResidExpRow.3 docs/man/man3/detRunSummaryRow.3: $(DOXYGEN) Index: /trunk/ippdb/src/ippdb.c =================================================================== --- /trunk/ippdb/src/ippdb.c (revision 14168) +++ /trunk/ippdb/src/ippdb.c (revision 14169) @@ -43,5 +43,4 @@ #define GUIDEPENDINGEXP_TABLE_NAME "guidePendingExp" #define CHIPRUN_TABLE_NAME "chipRun" -#define CHIPINPUTIMFILE_TABLE_NAME "chipInputImfile" #define CHIPPROCESSEDIMFILE_TABLE_NAME "chipProcessedImfile" #define CHIPMASK_TABLE_NAME "chipMask" @@ -2526,5 +2525,5 @@ static void newExpRowFree(newExpRow *object); -newExpRow *newExpRowAlloc(psS64 exp_id, const char *tmp_exp_name, const char *tmp_camera, const char *tmp_telescope, const char *state, const char *workdir, const char *workdir_state) +newExpRow *newExpRowAlloc(psS64 exp_id, const char *tmp_exp_name, const char *tmp_camera, const char *tmp_telescope, const char *state, const char *workdir, const char *workdir_state, const char *reduction) { newExpRow *_object; @@ -2540,4 +2539,5 @@ _object->workdir = psStringCopy(workdir); _object->workdir_state = psStringCopy(workdir_state); + _object->reduction = psStringCopy(reduction); return _object; @@ -2552,4 +2552,5 @@ psFree(object->workdir); psFree(object->workdir_state); + psFree(object->reduction); } @@ -2592,4 +2593,9 @@ return false; } + if (!psMetadataAdd(md, PS_LIST_TAIL, "reduction", PS_DATA_STRING, "Reduction class", "64")) { + psError(PS_ERR_UNKNOWN, false, "failed to add item reduction"); + psFree(md); + return false; + } bool status = psDBCreateTable(dbh, NEWEXP_TABLE_NAME, md); @@ -2605,5 +2611,5 @@ } -bool newExpInsert(psDB * dbh, psS64 exp_id, const char *tmp_exp_name, const char *tmp_camera, const char *tmp_telescope, const char *state, const char *workdir, const char *workdir_state) +bool newExpInsert(psDB * dbh, psS64 exp_id, const char *tmp_exp_name, const char *tmp_camera, const char *tmp_telescope, const char *state, const char *workdir, const char *workdir_state, const char *reduction) { psMetadata *md = psMetadataAlloc(); @@ -2640,4 +2646,9 @@ if (!psMetadataAdd(md, PS_LIST_TAIL, "workdir_state", PS_DATA_STRING, NULL, workdir_state)) { psError(PS_ERR_UNKNOWN, false, "failed to add item workdir_state"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "reduction", PS_DATA_STRING, NULL, reduction)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item reduction"); psFree(md); return false; @@ -2666,5 +2677,5 @@ bool newExpInsertObject(psDB *dbh, newExpRow *object) { - return newExpInsert(dbh, object->exp_id, object->tmp_exp_name, object->tmp_camera, object->tmp_telescope, object->state, object->workdir, object->workdir_state); + return newExpInsert(dbh, object->exp_id, object->tmp_exp_name, object->tmp_camera, object->tmp_telescope, object->state, object->workdir, object->workdir_state, object->reduction); } @@ -2774,4 +2785,9 @@ return false; } + if (!psMetadataAdd(md, PS_LIST_TAIL, "reduction", PS_DATA_STRING, NULL, object->reduction)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item reduction"); + psFree(md); + return false; + } @@ -2818,6 +2834,11 @@ return false; } - - return newExpRowAlloc(exp_id, tmp_exp_name, tmp_camera, tmp_telescope, state, workdir, workdir_state); + char* reduction = psMetadataLookupPtr(&status, md, "reduction"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item reduction"); + return false; + } + + return newExpRowAlloc(exp_id, tmp_exp_name, tmp_camera, tmp_telescope, state, workdir, workdir_state, reduction); } psArray *newExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) @@ -3248,5 +3269,5 @@ static void rawExpRowFree(rawExpRow *object); -rawExpRow *rawExpRowAlloc(psS64 exp_id, const char *exp_name, const char *camera, const char *telescope, psTime* dateobs, const char *exp_tag, const char *exp_type, const char *filelevel, const char *workdir, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF32 sat_pixel_frac, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, psF64 user_1, psF64 user_2, psF64 user_3, psF64 user_4, psF64 user_5, const char *object, psF32 solang, psS16 fault) +rawExpRow *rawExpRowAlloc(psS64 exp_id, const char *exp_name, const char *camera, const char *telescope, psTime* dateobs, const char *exp_tag, const char *exp_type, const char *filelevel, const char *workdir, const char *reduction, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF32 sat_pixel_frac, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, psF64 user_1, psF64 user_2, psF64 user_3, psF64 user_4, psF64 user_5, const char *object, psF32 solang, psS16 fault) { rawExpRow *_object; @@ -3264,4 +3285,5 @@ _object->filelevel = psStringCopy(filelevel); _object->workdir = psStringCopy(workdir); + _object->reduction = psStringCopy(reduction); _object->filter = psStringCopy(filter); _object->airmass = airmass; @@ -3299,4 +3321,5 @@ psFree(object->filelevel); psFree(object->workdir); + psFree(object->reduction); psFree(object->filter); psFree(object->object); @@ -3351,4 +3374,9 @@ return false; } + if (!psMetadataAdd(md, PS_LIST_TAIL, "reduction", PS_DATA_STRING, "Reduction class", "64")) { + psError(PS_ERR_UNKNOWN, false, "failed to add item reduction"); + psFree(md); + return false; + } if (!psMetadataAdd(md, PS_LIST_TAIL, "filter", PS_DATA_STRING, NULL, "64")) { psError(PS_ERR_UNKNOWN, false, "failed to add item filter"); @@ -3469,5 +3497,5 @@ } -bool rawExpInsert(psDB * dbh, psS64 exp_id, const char *exp_name, const char *camera, const char *telescope, psTime* dateobs, const char *exp_tag, const char *exp_type, const char *filelevel, const char *workdir, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF32 sat_pixel_frac, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, psF64 user_1, psF64 user_2, psF64 user_3, psF64 user_4, psF64 user_5, const char *object, psF32 solang, psS16 fault) +bool rawExpInsert(psDB * dbh, psS64 exp_id, const char *exp_name, const char *camera, const char *telescope, psTime* dateobs, const char *exp_tag, const char *exp_type, const char *filelevel, const char *workdir, const char *reduction, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF32 sat_pixel_frac, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, psF64 user_1, psF64 user_2, psF64 user_3, psF64 user_4, psF64 user_5, const char *object, psF32 solang, psS16 fault) { psMetadata *md = psMetadataAlloc(); @@ -3514,4 +3542,9 @@ if (!psMetadataAdd(md, PS_LIST_TAIL, "workdir", PS_DATA_STRING, NULL, workdir)) { psError(PS_ERR_UNKNOWN, false, "failed to add item workdir"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "reduction", PS_DATA_STRING, NULL, reduction)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item reduction"); psFree(md); return false; @@ -3645,5 +3678,5 @@ bool rawExpInsertObject(psDB *dbh, rawExpRow *object) { - return rawExpInsert(dbh, object->exp_id, object->exp_name, object->camera, object->telescope, object->dateobs, object->exp_tag, object->exp_type, object->filelevel, object->workdir, object->filter, object->airmass, object->ra, object->decl, object->exp_time, object->sat_pixel_frac, object->bg, object->bg_stdev, object->bg_mean_stdev, object->alt, object->az, object->ccd_temp, object->posang, object->user_1, object->user_2, object->user_3, object->user_4, object->user_5, object->object, object->solang, object->fault); + return rawExpInsert(dbh, object->exp_id, object->exp_name, object->camera, object->telescope, object->dateobs, object->exp_tag, object->exp_type, object->filelevel, object->workdir, object->reduction, object->filter, object->airmass, object->ra, object->decl, object->exp_time, object->sat_pixel_frac, object->bg, object->bg_stdev, object->bg_mean_stdev, object->alt, object->az, object->ccd_temp, object->posang, object->user_1, object->user_2, object->user_3, object->user_4, object->user_5, object->object, object->solang, object->fault); } @@ -3763,4 +3796,9 @@ return false; } + if (!psMetadataAdd(md, PS_LIST_TAIL, "reduction", PS_DATA_STRING, NULL, object->reduction)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item reduction"); + psFree(md); + return false; + } if (!psMetadataAdd(md, PS_LIST_TAIL, "filter", PS_DATA_STRING, NULL, object->filter)) { psError(PS_ERR_UNKNOWN, false, "failed to add item filter"); @@ -3922,4 +3960,9 @@ return false; } + char* reduction = psMetadataLookupPtr(&status, md, "reduction"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item reduction"); + return false; + } char* filter = psMetadataLookupPtr(&status, md, "filter"); if (!status) { @@ -4028,5 +4071,5 @@ } - return rawExpRowAlloc(exp_id, exp_name, camera, telescope, dateobs, exp_tag, exp_type, filelevel, workdir, filter, airmass, ra, decl, exp_time, sat_pixel_frac, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang, user_1, user_2, user_3, user_4, user_5, object, solang, fault); + return rawExpRowAlloc(exp_id, exp_name, camera, telescope, dateobs, exp_tag, exp_type, filelevel, workdir, reduction, filter, airmass, ra, decl, exp_time, sat_pixel_frac, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang, user_1, user_2, user_3, user_4, user_5, object, solang, fault); } psArray *rawExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) @@ -5349,5 +5392,5 @@ static void chipRunRowFree(chipRunRow *object); -chipRunRow *chipRunRowAlloc(psS64 chip_id, const char *state, const char *workdir, const char *workdir_state, const char *label, const char *reduction, const char *expgroup, const char *dvodb) +chipRunRow *chipRunRowAlloc(psS64 chip_id, psS64 exp_id, const char *state, const char *workdir, const char *workdir_state, const char *label, const char *reduction, const char *expgroup, const char *dvodb) { chipRunRow *_object; @@ -5357,4 +5400,5 @@ _object->chip_id = chip_id; + _object->exp_id = exp_id; _object->state = psStringCopy(state); _object->workdir = psStringCopy(workdir); @@ -5387,5 +5431,10 @@ return false; } - if (!psMetadataAdd(md, PS_LIST_TAIL, "state", PS_DATA_STRING, "key", "64")) { + if (!psMetadataAdd(md, PS_LIST_TAIL, "exp_id", PS_DATA_S64, "Key INDEX(chip_id, exp_id) fkey (exp_id) ref rawExp(exp_id)", 64)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item exp_id"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "state", PS_DATA_STRING, "Key", "64")) { psError(PS_ERR_UNKNOWN, false, "failed to add item state"); psFree(md); @@ -5397,10 +5446,10 @@ return false; } - if (!psMetadataAdd(md, PS_LIST_TAIL, "workdir_state", PS_DATA_STRING, "key", "64")) { + if (!psMetadataAdd(md, PS_LIST_TAIL, "workdir_state", PS_DATA_STRING, "Key", "64")) { psError(PS_ERR_UNKNOWN, false, "failed to add item workdir_state"); psFree(md); return false; } - if (!psMetadataAdd(md, PS_LIST_TAIL, "label", PS_DATA_STRING, "key", "64")) { + if (!psMetadataAdd(md, PS_LIST_TAIL, "label", PS_DATA_STRING, "Key", "64")) { psError(PS_ERR_UNKNOWN, false, "failed to add item label"); psFree(md); @@ -5412,5 +5461,5 @@ return false; } - if (!psMetadataAdd(md, PS_LIST_TAIL, "expgroup", PS_DATA_STRING, "key", "64")) { + if (!psMetadataAdd(md, PS_LIST_TAIL, "expgroup", PS_DATA_STRING, "Key", "64")) { psError(PS_ERR_UNKNOWN, false, "failed to add item expgroup"); psFree(md); @@ -5435,9 +5484,14 @@ } -bool chipRunInsert(psDB * dbh, psS64 chip_id, const char *state, const char *workdir, const char *workdir_state, const char *label, const char *reduction, const char *expgroup, const char *dvodb) +bool chipRunInsert(psDB * dbh, psS64 chip_id, psS64 exp_id, const char *state, const char *workdir, const char *workdir_state, const char *label, const char *reduction, const char *expgroup, const char *dvodb) { psMetadata *md = psMetadataAlloc(); if (!psMetadataAdd(md, PS_LIST_TAIL, "chip_id", PS_DATA_S64, NULL, chip_id)) { psError(PS_ERR_UNKNOWN, false, "failed to add item chip_id"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "exp_id", PS_DATA_S64, NULL, exp_id)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item exp_id"); psFree(md); return false; @@ -5501,5 +5555,5 @@ bool chipRunInsertObject(psDB *dbh, chipRunRow *object) { - return chipRunInsert(dbh, object->chip_id, object->state, object->workdir, object->workdir_state, object->label, object->reduction, object->expgroup, object->dvodb); + return chipRunInsert(dbh, object->chip_id, object->exp_id, object->state, object->workdir, object->workdir_state, object->label, object->reduction, object->expgroup, object->dvodb); } @@ -5579,4 +5633,9 @@ return false; } + if (!psMetadataAdd(md, PS_LIST_TAIL, "exp_id", PS_DATA_S64, NULL, object->exp_id)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item exp_id"); + psFree(md); + return false; + } if (!psMetadataAdd(md, PS_LIST_TAIL, "state", PS_DATA_STRING, NULL, object->state)) { psError(PS_ERR_UNKNOWN, false, "failed to add item state"); @@ -5628,4 +5687,9 @@ return false; } + psS64 exp_id = psMetadataLookupS64(&status, md, "exp_id"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item exp_id"); + return false; + } char* state = psMetadataLookupPtr(&status, md, "state"); if (!status) { @@ -5664,5 +5728,5 @@ } - return chipRunRowAlloc(chip_id, state, workdir, workdir_state, label, reduction, expgroup, dvodb); + return chipRunRowAlloc(chip_id, exp_id, state, workdir, workdir_state, label, reduction, expgroup, dvodb); } psArray *chipRunSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) @@ -5764,320 +5828,4 @@ psMetadata *md = chipRunMetadataFromObject(object); - - if (!ippdbPrintMetadataRaw(stream, md, mdcf)) { - psError(PS_ERR_UNKNOWN, false, "failed to print metadata"); - psFree(md); - } - - psFree(md); - - return true; -} -static void chipInputImfileRowFree(chipInputImfileRow *object); - -chipInputImfileRow *chipInputImfileRowAlloc(psS64 chip_id, psS64 exp_id, const char *class_id) -{ - chipInputImfileRow *_object; - - _object = psAlloc(sizeof(chipInputImfileRow)); - psMemSetDeallocator(_object, (psFreeFunc)chipInputImfileRowFree); - - _object->chip_id = chip_id; - _object->exp_id = exp_id; - _object->class_id = psStringCopy(class_id); - - return _object; -} - -static void chipInputImfileRowFree(chipInputImfileRow *object) -{ - psFree(object->class_id); -} - -bool chipInputImfileCreateTable(psDB *dbh) -{ - psMetadata *md = psMetadataAlloc(); - if (!psMetadataAdd(md, PS_LIST_TAIL, "chip_id", PS_DATA_S64, "Primary Key fkey (chip_id) ref chipRun(chip_id)", 0)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item chip_id"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "exp_id", PS_DATA_S64, "Primary Key fkey (exp_id, class_id) ref rawImfile (exp_id, class_id)", 64)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item exp_id"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "class_id", PS_DATA_STRING, "Primary Key", "64")) { - psError(PS_ERR_UNKNOWN, false, "failed to add item class_id"); - psFree(md); - return false; - } - - bool status = psDBCreateTable(dbh, CHIPINPUTIMFILE_TABLE_NAME, md); - - psFree(md); - - return status; -} - -bool chipInputImfileDropTable(psDB *dbh) -{ - return psDBDropTable(dbh, CHIPINPUTIMFILE_TABLE_NAME); -} - -bool chipInputImfileInsert(psDB * dbh, psS64 chip_id, psS64 exp_id, const char *class_id) -{ - psMetadata *md = psMetadataAlloc(); - if (!psMetadataAdd(md, PS_LIST_TAIL, "chip_id", PS_DATA_S64, NULL, chip_id)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item chip_id"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "exp_id", PS_DATA_S64, NULL, exp_id)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item exp_id"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "class_id", PS_DATA_STRING, NULL, class_id)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item class_id"); - psFree(md); - return false; - } - - bool status = psDBInsertOneRow(dbh, CHIPINPUTIMFILE_TABLE_NAME, md); - psFree(md); - - return status; -} - -long long chipInputImfileDelete(psDB *dbh, const psMetadata *where, unsigned long long limit) -{ - long long deleted = 0; - - long long count = psDBDeleteRows(dbh, CHIPINPUTIMFILE_TABLE_NAME, where, limit); - if (count < 0) { - psError(PS_ERR_UNKNOWN, true, "failed to delete row from chipInputImfile"); - return count; - - deleted += count; - } - - return deleted; -} -bool chipInputImfileInsertObject(psDB *dbh, chipInputImfileRow *object) -{ - return chipInputImfileInsert(dbh, object->chip_id, object->exp_id, object->class_id); -} - -bool chipInputImfileInsertObjects(psDB *dbh, psArray *objects) -{ - for (long i = 0; i < psArrayLength(objects); i++) { - if (!chipInputImfileInsertObject(dbh, objects->data[i])) { - return false; - } - } - - return true; -} - -bool chipInputImfileInsertFits(psDB *dbh, const psFits *fits) -{ - psArray *rowSet; - - // move to (the first?) extension named CHIPINPUTIMFILE_TABLE_NAME - if (!psFitsMoveExtName(fits, CHIPINPUTIMFILE_TABLE_NAME)) { - psError(PS_ERR_UNKNOWN, true, "failed to find FITS extension %s", CHIPINPUTIMFILE_TABLE_NAME); - return false; - } - - // check HDU type - if (psFitsGetExtType(fits) != PS_FITS_TYPE_BINARY_TABLE) { - psError(PS_ERR_UNKNOWN, true, "FITS HDU type is not PS_FITS_TYPE_BINARY_TABLE"); - return false; - } - - // read fits table - rowSet = psFitsReadTable(fits); - if (!rowSet) { - psError(PS_ERR_UNKNOWN, true, "FITS read error or FITS table is empty"); - psFree(rowSet); - return false; - } - - if (!psDBInsertRows(dbh, CHIPINPUTIMFILE_TABLE_NAME, rowSet)) { - psError(PS_ERR_UNKNOWN, false, "databse insert failed"); - psFree(rowSet); - return false; - } - - psFree(rowSet); - - return true; -} - -bool chipInputImfileSelectRowsFits(psDB *dbh, psFits *fits, const psMetadata *where, unsigned long long limit) -{ - psArray *rowSet; - - rowSet = psDBSelectRows(dbh, CHIPINPUTIMFILE_TABLE_NAME, where, limit); - if (!rowSet) { - return false; - } - - // output to fits - if (!psFitsWriteTable(fits, NULL, rowSet, CHIPINPUTIMFILE_TABLE_NAME)) { - psError(PS_ERR_UNKNOWN, false, "FITS table write failed"); - psFree(rowSet); - return false; - } - - psFree(rowSet); - - return true; -} - -psMetadata *chipInputImfileMetadataFromObject(const chipInputImfileRow *object) -{ - psMetadata *md = psMetadataAlloc(); - if (!psMetadataAdd(md, PS_LIST_TAIL, "chip_id", PS_DATA_S64, NULL, object->chip_id)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item chip_id"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "exp_id", PS_DATA_S64, NULL, object->exp_id)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item exp_id"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "class_id", PS_DATA_STRING, NULL, object->class_id)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item class_id"); - psFree(md); - return false; - } - - - return md; -} - -chipInputImfileRow *chipInputImfileObjectFromMetadata(psMetadata *md) -{ - -bool status = false; - psS64 chip_id = psMetadataLookupS64(&status, md, "chip_id"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item chip_id"); - return false; - } - psS64 exp_id = psMetadataLookupS64(&status, md, "exp_id"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item exp_id"); - return false; - } - char* class_id = psMetadataLookupPtr(&status, md, "class_id"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item class_id"); - return false; - } - - return chipInputImfileRowAlloc(chip_id, exp_id, class_id); -} -psArray *chipInputImfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) -{ - psArray *rowSet; - psArray *returnSet; - psU64 i; - - rowSet = psDBSelectRows(dbh, CHIPINPUTIMFILE_TABLE_NAME, where, limit); - if (!rowSet) { - return NULL; - } - - // convert psMetadata rows to row objects - - returnSet = psArrayAllocEmpty(rowSet->n); - - for (i = 0; i < rowSet->n; i++) { - chipInputImfileRow *object = chipInputImfileObjectFromMetadata(rowSet->data[i]); - psArrayAdd(returnSet, 0, object); - psFree(object); - } - - psFree(rowSet); - - return returnSet; -} -bool chipInputImfileDeleteObject(psDB *dbh, const chipInputImfileRow *object) -{ - psMetadata *where = chipInputImfileMetadataFromObject(object); - long long count = psDBDeleteRows(dbh, CHIPINPUTIMFILE_TABLE_NAME, where, 0); - psFree(where); - if (count < 0) { - psError(PS_ERR_UNKNOWN, true, "failed to delete row from chipInputImfile"); - return false; - } - if (count > 1) { - // XXX should this be a psAbort() instead? It is possible that - // having an object match multiple rows was by design. - psError(PS_ERR_UNKNOWN, true, "chipInputImfileRow object matched more then one row. Check your database schema"); - return false; - } - - return true; -} -long long chipInputImfileDeleteRowObjects(psDB *dbh, const psArray *objects, unsigned long long limit) -{ - long long deleted = 0; - - for (long long i = 0; i < objects->n; i++) { - chipInputImfileRow *object = objects->data[i]; - psMetadata *where = chipInputImfileMetadataFromObject(object); - long long count = psDBDeleteRows(dbh, CHIPINPUTIMFILE_TABLE_NAME, where, limit); - psFree(where); - if (count < 0) { - psError(PS_ERR_UNKNOWN, true, "failed to delete row from chipInputImfile"); - return count; - } - - deleted += count; - } - - return deleted; -} -bool chipInputImfilePrintObjects(FILE *stream, psArray *objects, bool mdcf) -{ - PS_ASSERT_PTR_NON_NULL(objects, false); - - psMetadata *output = psMetadataAlloc(); - for (long i = 0; i < psArrayLength(objects); i++) { - psMetadata *md = chipInputImfileMetadataFromObject(objects->data[i]); - if (!psMetadataAddMetadata( - output, - PS_LIST_TAIL, - CHIPINPUTIMFILE_TABLE_NAME, - PS_META_DUPLICATE_OK, - NULL, - md - )) { - psError(PS_ERR_UNKNOWN, false, "failed to add metadata"); - psFree(md); - psFree(output); - return false; - } - psFree(md); - } - - if (!ippdbPrintMetadataRaw(stream, output, mdcf)) { - psError(PS_ERR_UNKNOWN, false, "failed to print metadata"); - psFree(output); - } - psFree(output); - - return true; -} -bool chipInputImfilePrintObject(FILE *stream, chipInputImfileRow *object, bool mdcf) -{ - PS_ASSERT_PTR_NON_NULL(object, false); - - psMetadata *md = chipInputImfileMetadataFromObject(object); if (!ippdbPrintMetadataRaw(stream, md, mdcf)) { @@ -6137,10 +5885,10 @@ { psMetadata *md = psMetadataAlloc(); - if (!psMetadataAdd(md, PS_LIST_TAIL, "chip_id", PS_DATA_S64, "Primary Key fkey (chip_id, exp_id, class_id) ref chipInputImfile(chip_id, exp_id, class_id)", 0)) { + if (!psMetadataAdd(md, PS_LIST_TAIL, "chip_id", PS_DATA_S64, "Primary Key fkey (chip_id, exp_id) ref chipRun(chip_id, exp_id)", 0)) { psError(PS_ERR_UNKNOWN, false, "failed to add item chip_id"); psFree(md); return false; } - if (!psMetadataAdd(md, PS_LIST_TAIL, "exp_id", PS_DATA_S64, "Primary Key", 64)) { + if (!psMetadataAdd(md, PS_LIST_TAIL, "exp_id", PS_DATA_S64, "Primary Key fkey (exp_id, class_id) ref rawImfile(exp_id, class_id)", 64)) { psError(PS_ERR_UNKNOWN, false, "failed to add item exp_id"); psFree(md); @@ -7164,5 +6912,5 @@ return false; } - if (!psMetadataAdd(md, PS_LIST_TAIL, "chip_id", PS_DATA_S64, "Primary Key fkey(chip_id) ref chipRun(chip_id)", 0)) { + if (!psMetadataAdd(md, PS_LIST_TAIL, "chip_id", PS_DATA_S64, "Key INDEX(cam_id, chip_id) fkey(chip_id) ref chipRun(chip_id)", 0)) { psError(PS_ERR_UNKNOWN, false, "failed to add item chip_id"); psFree(md); @@ -9558,5 +9306,5 @@ static void warpSkyfileRowFree(warpSkyfileRow *object); -warpSkyfileRow *warpSkyfileRowAlloc(psS64 warp_id, const char *skycell_id, const char *tess_id, const char *uri, const char *path_base, psF64 bg, psF64 bg_stdev) +warpSkyfileRow *warpSkyfileRowAlloc(psS64 warp_id, const char *skycell_id, const char *tess_id, const char *uri, const char *path_base, psF64 bg, psF64 bg_stdev, psS16 fault) { warpSkyfileRow *_object; @@ -9572,4 +9320,5 @@ _object->bg = bg; _object->bg_stdev = bg_stdev; + _object->fault = fault; return _object; @@ -9622,4 +9371,9 @@ return false; } + if (!psMetadataAdd(md, PS_LIST_TAIL, "fault", PS_DATA_S16, "Key", 0)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item fault"); + psFree(md); + return false; + } bool status = psDBCreateTable(dbh, WARPSKYFILE_TABLE_NAME, md); @@ -9635,5 +9389,5 @@ } -bool warpSkyfileInsert(psDB * dbh, psS64 warp_id, const char *skycell_id, const char *tess_id, const char *uri, const char *path_base, psF64 bg, psF64 bg_stdev) +bool warpSkyfileInsert(psDB * dbh, psS64 warp_id, const char *skycell_id, const char *tess_id, const char *uri, const char *path_base, psF64 bg, psF64 bg_stdev, psS16 fault) { psMetadata *md = psMetadataAlloc(); @@ -9670,4 +9424,9 @@ if (!psMetadataAdd(md, PS_LIST_TAIL, "bg_stdev", PS_DATA_F64, NULL, bg_stdev)) { psError(PS_ERR_UNKNOWN, false, "failed to add item bg_stdev"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "fault", PS_DATA_S16, NULL, fault)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item fault"); psFree(md); return false; @@ -9696,5 +9455,5 @@ bool warpSkyfileInsertObject(psDB *dbh, warpSkyfileRow *object) { - return warpSkyfileInsert(dbh, object->warp_id, object->skycell_id, object->tess_id, object->uri, object->path_base, object->bg, object->bg_stdev); + return warpSkyfileInsert(dbh, object->warp_id, object->skycell_id, object->tess_id, object->uri, object->path_base, object->bg, object->bg_stdev, object->fault); } @@ -9804,4 +9563,9 @@ return false; } + if (!psMetadataAdd(md, PS_LIST_TAIL, "fault", PS_DATA_S16, NULL, object->fault)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item fault"); + psFree(md); + return false; + } @@ -9848,6 +9612,11 @@ return false; } - - return warpSkyfileRowAlloc(warp_id, skycell_id, tess_id, uri, path_base, bg, bg_stdev); + psS16 fault = psMetadataLookupS16(&status, md, "fault"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item fault"); + return false; + } + + return warpSkyfileRowAlloc(warp_id, skycell_id, tess_id, uri, path_base, bg, bg_stdev, fault); } psArray *warpSkyfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) @@ -10747,5 +10516,5 @@ static void diffSkyfileRowFree(diffSkyfileRow *object); -diffSkyfileRow *diffSkyfileRowAlloc(psS64 diff_id, const char *uri, const char *path_base, psF64 bg, psF64 bg_stdev) +diffSkyfileRow *diffSkyfileRowAlloc(psS64 diff_id, const char *uri, const char *path_base, psF64 bg, psF64 bg_stdev, psS16 fault) { diffSkyfileRow *_object; @@ -10759,4 +10528,5 @@ _object->bg = bg; _object->bg_stdev = bg_stdev; + _object->fault = fault; return _object; @@ -10797,4 +10567,9 @@ return false; } + if (!psMetadataAdd(md, PS_LIST_TAIL, "fault", PS_DATA_S16, "Key", 0)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item fault"); + psFree(md); + return false; + } bool status = psDBCreateTable(dbh, DIFFSKYFILE_TABLE_NAME, md); @@ -10810,5 +10585,5 @@ } -bool diffSkyfileInsert(psDB * dbh, psS64 diff_id, const char *uri, const char *path_base, psF64 bg, psF64 bg_stdev) +bool diffSkyfileInsert(psDB * dbh, psS64 diff_id, const char *uri, const char *path_base, psF64 bg, psF64 bg_stdev, psS16 fault) { psMetadata *md = psMetadataAlloc(); @@ -10835,4 +10610,9 @@ if (!psMetadataAdd(md, PS_LIST_TAIL, "bg_stdev", PS_DATA_F64, NULL, bg_stdev)) { psError(PS_ERR_UNKNOWN, false, "failed to add item bg_stdev"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "fault", PS_DATA_S16, NULL, fault)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item fault"); psFree(md); return false; @@ -10861,5 +10641,5 @@ bool diffSkyfileInsertObject(psDB *dbh, diffSkyfileRow *object) { - return diffSkyfileInsert(dbh, object->diff_id, object->uri, object->path_base, object->bg, object->bg_stdev); + return diffSkyfileInsert(dbh, object->diff_id, object->uri, object->path_base, object->bg, object->bg_stdev, object->fault); } @@ -10959,4 +10739,9 @@ return false; } + if (!psMetadataAdd(md, PS_LIST_TAIL, "fault", PS_DATA_S16, NULL, object->fault)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item fault"); + psFree(md); + return false; + } @@ -10993,6 +10778,11 @@ return false; } - - return diffSkyfileRowAlloc(diff_id, uri, path_base, bg, bg_stdev); + psS16 fault = psMetadataLookupS16(&status, md, "fault"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item fault"); + return false; + } + + return diffSkyfileRowAlloc(diff_id, uri, path_base, bg, bg_stdev, fault); } psArray *diffSkyfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) @@ -11805,5 +11595,5 @@ static void stackSumSkyfileRowFree(stackSumSkyfileRow *object); -stackSumSkyfileRow *stackSumSkyfileRowAlloc(psS64 stack_id, const char *uri, const char *path_base, psF64 bg, psF64 bg_stdev) +stackSumSkyfileRow *stackSumSkyfileRowAlloc(psS64 stack_id, const char *uri, const char *path_base, psF64 bg, psF64 bg_stdev, psS16 fault) { stackSumSkyfileRow *_object; @@ -11817,4 +11607,5 @@ _object->bg = bg; _object->bg_stdev = bg_stdev; + _object->fault = fault; return _object; @@ -11855,4 +11646,9 @@ return false; } + if (!psMetadataAdd(md, PS_LIST_TAIL, "fault", PS_DATA_S16, "Key", 0)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item fault"); + psFree(md); + return false; + } bool status = psDBCreateTable(dbh, STACKSUMSKYFILE_TABLE_NAME, md); @@ -11868,5 +11664,5 @@ } -bool stackSumSkyfileInsert(psDB * dbh, psS64 stack_id, const char *uri, const char *path_base, psF64 bg, psF64 bg_stdev) +bool stackSumSkyfileInsert(psDB * dbh, psS64 stack_id, const char *uri, const char *path_base, psF64 bg, psF64 bg_stdev, psS16 fault) { psMetadata *md = psMetadataAlloc(); @@ -11893,4 +11689,9 @@ if (!psMetadataAdd(md, PS_LIST_TAIL, "bg_stdev", PS_DATA_F64, NULL, bg_stdev)) { psError(PS_ERR_UNKNOWN, false, "failed to add item bg_stdev"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "fault", PS_DATA_S16, NULL, fault)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item fault"); psFree(md); return false; @@ -11919,5 +11720,5 @@ bool stackSumSkyfileInsertObject(psDB *dbh, stackSumSkyfileRow *object) { - return stackSumSkyfileInsert(dbh, object->stack_id, object->uri, object->path_base, object->bg, object->bg_stdev); + return stackSumSkyfileInsert(dbh, object->stack_id, object->uri, object->path_base, object->bg, object->bg_stdev, object->fault); } @@ -12017,4 +11818,9 @@ return false; } + if (!psMetadataAdd(md, PS_LIST_TAIL, "fault", PS_DATA_S16, NULL, object->fault)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item fault"); + psFree(md); + return false; + } @@ -12051,6 +11857,11 @@ return false; } - - return stackSumSkyfileRowAlloc(stack_id, uri, path_base, bg, bg_stdev); + psS16 fault = psMetadataLookupS16(&status, md, "fault"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item fault"); + return false; + } + + return stackSumSkyfileRowAlloc(stack_id, uri, path_base, bg, bg_stdev, fault); } psArray *stackSumSkyfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) @@ -13063,15 +12874,15 @@ { psMetadata *md = psMetadataAlloc(); - if (!psMetadataAdd(md, PS_LIST_TAIL, "det_id", PS_DATA_S64, "Primary Key", 0)) { + if (!psMetadataAdd(md, PS_LIST_TAIL, "det_id", PS_DATA_S64, "Primary Key INDEX(det_id, exp_id) fkey (det_id) ref detRun(det_id)", 0)) { psError(PS_ERR_UNKNOWN, false, "failed to add item det_id"); psFree(md); return false; } - if (!psMetadataAdd(md, PS_LIST_TAIL, "iteration", PS_DATA_S32, "Primary Key", 0)) { + if (!psMetadataAdd(md, PS_LIST_TAIL, "iteration", PS_DATA_S32, "Primary Key INDEX(det_id, iteration)", 0)) { psError(PS_ERR_UNKNOWN, false, "failed to add item iteration"); psFree(md); return false; } - if (!psMetadataAdd(md, PS_LIST_TAIL, "exp_id", PS_DATA_S64, "Primary Key", 64)) { + if (!psMetadataAdd(md, PS_LIST_TAIL, "exp_id", PS_DATA_S64, "Primary Key fkey (exp_id) ref rawExp(exp_id)", 64)) { psError(PS_ERR_UNKNOWN, false, "failed to add item exp_id"); psFree(md); @@ -13417,15 +13228,15 @@ { psMetadata *md = psMetadataAlloc(); - if (!psMetadataAdd(md, PS_LIST_TAIL, "det_id", PS_DATA_S64, "Primary Key", 0)) { + if (!psMetadataAdd(md, PS_LIST_TAIL, "det_id", PS_DATA_S64, "Primary Key fkey (det_id, exp_id) ref detInputExp(det_id, exp_id)", 0)) { psError(PS_ERR_UNKNOWN, false, "failed to add item det_id"); psFree(md); return false; } - if (!psMetadataAdd(md, PS_LIST_TAIL, "exp_id", PS_DATA_S64, "Primary Key", 64)) { + if (!psMetadataAdd(md, PS_LIST_TAIL, "exp_id", PS_DATA_S64, "Primary Key fkey (exp_id, class_id) ref rawImfile(exp_id, class_id)", 64)) { psError(PS_ERR_UNKNOWN, false, "failed to add item exp_id"); psFree(md); return false; } - if (!psMetadataAdd(md, PS_LIST_TAIL, "class_id", PS_DATA_STRING, "Primary Key", "64")) { + if (!psMetadataAdd(md, PS_LIST_TAIL, "class_id", PS_DATA_STRING, "Primary Key INDEX(det_id, class_id)", "64")) { psError(PS_ERR_UNKNOWN, false, "failed to add item class_id"); psFree(md); @@ -14047,5 +13858,5 @@ { psMetadata *md = psMetadataAlloc(); - if (!psMetadataAdd(md, PS_LIST_TAIL, "det_id", PS_DATA_S64, "Primary Key", 0)) { + if (!psMetadataAdd(md, PS_LIST_TAIL, "det_id", PS_DATA_S64, "Primary Key fkey(det_id, exp_id) ref detInputExp(det_id, exp_id)", 0)) { psError(PS_ERR_UNKNOWN, false, "failed to add item det_id"); psFree(md); @@ -14636,10 +14447,10 @@ { psMetadata *md = psMetadataAlloc(); - if (!psMetadataAdd(md, PS_LIST_TAIL, "det_id", PS_DATA_S64, "Primary Key", 0)) { + if (!psMetadataAdd(md, PS_LIST_TAIL, "det_id", PS_DATA_S64, "Primary Key fkey(det_id, iteration) ref detInputExp(det_id, iteration)", 0)) { psError(PS_ERR_UNKNOWN, false, "failed to add item det_id"); psFree(md); return false; } - if (!psMetadataAdd(md, PS_LIST_TAIL, "iteration", PS_DATA_S32, "Primary Key", 0)) { + if (!psMetadataAdd(md, PS_LIST_TAIL, "iteration", PS_DATA_S32, "Primary Key fkey(det_id, class_id) ref detProcessedImfile(det_id, class_id)", 0)) { psError(PS_ERR_UNKNOWN, false, "failed to add item iteration"); psFree(md); @@ -15174,5 +14985,5 @@ { psMetadata *md = psMetadataAlloc(); - if (!psMetadataAdd(md, PS_LIST_TAIL, "det_id", PS_DATA_S64, "Primary Key", 0)) { + if (!psMetadataAdd(md, PS_LIST_TAIL, "det_id", PS_DATA_S64, "Primary Key fkey(det_id, iteration, class_id) ref detStackedImfile(det_id, iteration, class_id)", 0)) { psError(PS_ERR_UNKNOWN, false, "failed to add item det_id"); psFree(md); @@ -15543,5 +15354,5 @@ { psMetadata *md = psMetadataAlloc(); - if (!psMetadataAdd(md, PS_LIST_TAIL, "det_id", PS_DATA_S64, "Primary Key", 0)) { + if (!psMetadataAdd(md, PS_LIST_TAIL, "det_id", PS_DATA_S64, "Primary Key INDEX(det_id, iteration) fkey(det_id) ref detInputExp(det_id)", 0)) { psError(PS_ERR_UNKNOWN, false, "failed to add item det_id"); psFree(md); @@ -16090,5 +15901,5 @@ { psMetadata *md = psMetadataAlloc(); - if (!psMetadataAdd(md, PS_LIST_TAIL, "det_id", PS_DATA_S64, "Primary Key", 0)) { + if (!psMetadataAdd(md, PS_LIST_TAIL, "det_id", PS_DATA_S64, "Primary Key fkey(det_id, iteration) ref detNormalizedImfile(det_id, iteration)", 0)) { psError(PS_ERR_UNKNOWN, false, "failed to add item det_id"); psFree(md); @@ -17938,5 +17749,5 @@ { psMetadata *md = psMetadataAlloc(); - if (!psMetadataAdd(md, PS_LIST_TAIL, "det_id", PS_DATA_S64, "Primary Key", 0)) { + if (!psMetadataAdd(md, PS_LIST_TAIL, "det_id", PS_DATA_S64, "Primary Key fkey(det_id, iteration) ref detInputExp(det_id, iteration)", 0)) { psError(PS_ERR_UNKNOWN, false, "failed to add item det_id"); psFree(md); Index: /trunk/ippdb/src/ippdb.h =================================================================== --- /trunk/ippdb/src/ippdb.h (revision 14168) +++ /trunk/ippdb/src/ippdb.h (revision 14169) @@ -1395,4 +1395,5 @@ char *workdir; char *workdir_state; + char *reduction; } newExpRow; @@ -1409,5 +1410,6 @@ const char *state, const char *workdir, - const char *workdir_state + const char *workdir_state, + const char *reduction ); @@ -1445,5 +1447,6 @@ const char *state, const char *workdir, - const char *workdir_state + const char *workdir_state, + const char *reduction ); @@ -1811,4 +1814,5 @@ char *filelevel; char *workdir; + char *reduction; char *filter; psF32 airmass; @@ -1849,4 +1853,5 @@ const char *filelevel, const char *workdir, + const char *reduction, const char *filter, psF32 airmass, @@ -1908,4 +1913,5 @@ const char *filelevel, const char *workdir, + const char *reduction, const char *filter, psF32 airmass, @@ -2568,4 +2574,5 @@ typedef struct { psS64 chip_id; + psS64 exp_id; char *state; char *workdir; @@ -2584,4 +2591,5 @@ chipRunRow *chipRunRowAlloc( psS64 chip_id, + psS64 exp_id, const char *state, const char *workdir, @@ -2621,4 +2629,5 @@ psDB *dbh, ///< Database handle psS64 chip_id, + psS64 exp_id, const char *state, const char *workdir, @@ -2775,205 +2784,4 @@ FILE *stream, ///< a stream chipRunRow *object, ///< an chipRunRow object - bool mdcf ///< format as mdconfig or simple -); -/** chipInputImfileRow data structure - * - * Structure for representing a single row of chipInputImfile table data. - */ - -typedef struct { - psS64 chip_id; - psS64 exp_id; - char *class_id; -} chipInputImfileRow; - -/** Creates a new chipInputImfileRow object - * - * @return A new chipInputImfileRow object or NULL on failure. - */ - -chipInputImfileRow *chipInputImfileRowAlloc( - psS64 chip_id, - psS64 exp_id, - const char *class_id -); - -/** Creates a new chipInputImfile table - * - * @return true on success - */ - -bool chipInputImfileCreateTable( - psDB *dbh ///< Database handle -); - -/** Deletes a chipInputImfile table - * - * @return true on success - */ - -bool chipInputImfileDropTable( - psDB *dbh ///< Database handle -); - -/** Insert a single row into a table - * - * This function constructs and inserts a single row based on it's parameters. - * - * @return true on success - */ - -bool chipInputImfileInsert( - psDB *dbh, ///< Database handle - psS64 chip_id, - psS64 exp_id, - const char *class_id -); - -/** Deletes up to limit rows from the database and returns the number of rows actually deleted. - * - * @return A The number of rows removed or a negative value on error - */ - -long long chipInputImfileDelete( - psDB *dbh, ///< Database handle - const psMetadata *where, ///< Row match criteria - unsigned long long limit ///< Maximum number of elements to delete -); - -/** Insert a single chipInputImfileRow object into a table - * - * This function constructs and inserts a single row based on it's parameters. - * - * @return true on success - */ - -bool chipInputImfileInsertObject( - psDB *dbh, ///< Database handle - chipInputImfileRow *object ///< chipInputImfileRow object -); - -/** Insert an array of chipInputImfileRow object into a table - * - * This function constructs and inserts multiple rows based on it's parameters. - * - * @return true on success - */ - -bool chipInputImfileInsertObjects( - psDB *dbh, ///< Database handle - psArray *objects ///< array of chipInputImfileRow objects -); - -/** Insert data from a binary FITS table chipInputImfileRow into the database - * - * This function expects a psFits object with a FITS table as the first - * extension. The table must have at least one row of data in it, that is of - * the appropriate format (number of columns and their type). All other - * extensions are ignored. - * - * @return true on success - */ - -bool chipInputImfileInsertFits( - psDB *dbh, ///< Database handle - const psFits *fits ///< psFits object -); - -/** Selects up to limit from the database and returns them in a binary FITS table - * - * This function assumes an empty psFits object and will create a FITS table - * as the first extension. - * - * See psDBSelectRows() for documentation on the format of where. - * - * @return true on success - */ - -bool chipInputImfileSelectRowsFits( - psDB *dbh, ///< Database handle - psFits *fits, ///< psFits object - const psMetadata *where, ///< Row match criteria - unsigned long long limit ///< Maximum number of elements to return -); - -/** Convert a chipInputImfileRow into an equivalent psMetadata - * - * @return A psMetadata pointer or NULL on error - */ - -psMetadata *chipInputImfileMetadataFromObject( - const chipInputImfileRow *object ///< fooRow to convert into a psMetadata -); - -/** Convert a psMetadata into an equivalent fooRow - * - * @return A chipInputImfileRow pointer or NULL on error - */ - -chipInputImfileRow *chipInputImfileObjectFromMetadata( - psMetadata *md ///< psMetadata to convert into a fooRow -); -/** Selects up to limit rows from the database and returns as chipInputImfileRow objects in a psArray - * - * See psDBSelectRows() for documentation on the format of where. - * - * @return A psArray pointer or NULL on error - */ - -psArray *chipInputImfileSelectRowObjects( - psDB *dbh, ///< Database handle - const psMetadata *where, ///< Row match criteria - unsigned long long limit ///< Maximum number of elements to return -); -/** Deletes a row from the database coresponding to an chipInputImfile - * - * Note that a 'where' search psMetadata is constructed from each object and - * used to find rows to delete. - * - * @return A The number of rows removed or a negative value on error - */ - -bool chipInputImfileDeleteObject( - psDB *dbh, ///< Database handle - const chipInputImfileRow *object ///< Object to delete -); -/** Deletes up to limit rows from the database and returns the number of rows actually deleted. - * - * Note that a 'where' search psMetadata is constructed from each object and - * used to find rows to delete. - * - * @return A The number of rows removed or a negative value on error - */ - -long long chipInputImfileDeleteRowObjects( - psDB *dbh, ///< Database handle - const psArray *objects, ///< Array of objects to delete - unsigned long long limit ///< Maximum number of elements to delete -); -/** Formats and prints an array of chipInputImfileRow objects - * - * When mdcf is set the formated output is in psMetadataConfig - * format, otherwise it is in a simple tabular format. - * - * @return true on success - */ - -bool chipInputImfilePrintObjects( - FILE *stream, ///< a stream - psArray *objects, ///< An array of chipInputImfileRow objects - bool mdcf ///< format as mdconfig or simple -); -/** Formats and prints an chipInputImfileRow object - * - * When mdcf is set the formated output is in psMetadataConfig - * format, otherwise it is in a simple tabular format. - * - * @return true on success - */ - -bool chipInputImfilePrintObject( - FILE *stream, ///< a stream - chipInputImfileRow *object, ///< an chipInputImfileRow object bool mdcf ///< format as mdconfig or simple ); @@ -4731,4 +4539,5 @@ psF64 bg; psF64 bg_stdev; + psS16 fault; } warpSkyfileRow; @@ -4745,5 +4554,6 @@ const char *path_base, psF64 bg, - psF64 bg_stdev + psF64 bg_stdev, + psS16 fault ); @@ -4781,5 +4591,6 @@ const char *path_base, psF64 bg, - psF64 bg_stdev + psF64 bg_stdev, + psS16 fault ); @@ -5365,4 +5176,5 @@ psF64 bg; psF64 bg_stdev; + psS16 fault; } diffSkyfileRow; @@ -5377,5 +5189,6 @@ const char *path_base, psF64 bg, - psF64 bg_stdev + psF64 bg_stdev, + psS16 fault ); @@ -5411,5 +5224,6 @@ const char *path_base, psF64 bg, - psF64 bg_stdev + psF64 bg_stdev, + psS16 fault ); @@ -5983,4 +5797,5 @@ psF64 bg; psF64 bg_stdev; + psS16 fault; } stackSumSkyfileRow; @@ -5995,5 +5810,6 @@ const char *path_base, psF64 bg, - psF64 bg_stdev + psF64 bg_stdev, + psS16 fault ); @@ -6029,5 +5845,6 @@ const char *path_base, psF64 bg, - psF64 bg_stdev + psF64 bg_stdev, + psS16 fault ); Index: /trunk/ippdb/tests/alloc.c =================================================================== --- /trunk/ippdb/tests/alloc.c (revision 14168) +++ /trunk/ippdb/tests/alloc.c (revision 14169) @@ -228,5 +228,5 @@ newExpRow *object; - object = newExpRowAlloc(-64, "a string", "a string", "a string", "a string", "a string", "a string" ); + object = newExpRowAlloc(-64, "a string", "a string", "a string", "a string", "a string", "a string", "a string" ); if (!object) { @@ -262,4 +262,8 @@ exit(EXIT_FAILURE); } + if (strncmp(object->reduction, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } psFree(object); @@ -294,5 +298,5 @@ rawExpRow *object; - object = rawExpRowAlloc(-64, "a string", "a string", "a string", "0001-01-01T00:00:00Z", "a string", "a string", "a string", "a string", "a string", 32.32, 64.64, 64.64, 32.32, 32.32, 64.64, 64.64, 64.64, 64.64, 64.64, 32.32, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, "a string", 32.32, -16 ); + object = rawExpRowAlloc(-64, "a string", "a string", "a string", "0001-01-01T00:00:00Z", "a string", "a string", "a string", "a string", "a string", "a string", 32.32, 64.64, 64.64, 32.32, 32.32, 64.64, 64.64, 64.64, 64.64, 64.64, 32.32, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, "a string", 32.32, -16 ); if (!object) { @@ -335,4 +339,8 @@ exit(EXIT_FAILURE); } + if (strncmp(object->reduction, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } if (strncmp(object->filter, "a string", MAX_STRING_LENGTH)) { psFree(object); @@ -583,5 +591,5 @@ chipRunRow *object; - object = chipRunRowAlloc(-64, "a string", "a string", "a string", "a string", "a string", "a string", "a string" ); + object = chipRunRowAlloc(-64, -64, "a string", "a string", "a string", "a string", "a string", "a string", "a string" ); if (!object) { @@ -593,4 +601,8 @@ exit(EXIT_FAILURE); } + if (!object->exp_id == -64) { + psFree(object); + exit(EXIT_FAILURE); + } if (strncmp(object->state, "a string", MAX_STRING_LENGTH)) { psFree(object); @@ -626,7 +638,7 @@ { - chipInputImfileRow *object; - - object = chipInputImfileRowAlloc(-64, -64, "a string" ); + chipProcessedImfileRow *object; + + object = chipProcessedImfileRowAlloc(-64, -64, "a string", "a string", 32.32, 32.32, 32.32, 32.32, 32.32, 32.32, 32.32, 32.32, 32.32, 32.32, 32.32, 32.32, 32.32, 32.32, -32, -32, -32, -32, "a string", -16 ); if (!object) { @@ -646,22 +658,343 @@ exit(EXIT_FAILURE); } - - psFree(object); - } - - { - chipProcessedImfileRow *object; - - object = chipProcessedImfileRowAlloc(-64, -64, "a string", "a string", 32.32, 32.32, 32.32, 32.32, 32.32, 32.32, 32.32, 32.32, 32.32, 32.32, 32.32, 32.32, 32.32, 32.32, -32, -32, -32, -32, "a string", -16 ); - - if (!object) { - exit(EXIT_FAILURE); - } - + if (strncmp(object->uri, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->bg == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->bg_stdev == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->bg_mean_stdev == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->bias == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->bias_stdev == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->fringe_0 == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->fringe_1 == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->fringe_2 == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->sigma_ra == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->sigma_dec == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->ap_resid == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->ap_resid_stdev == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->fwhm == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->fwhm_range == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->n_stars == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->n_extended == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->n_cr == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->n_astrom == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->path_base, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->fault == -16) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + chipMaskRow *object; + + object = chipMaskRowAlloc("a string" ); + + if (!object) { + exit(EXIT_FAILURE); + } + + if (strncmp(object->label, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + camRunRow *object; + + object = camRunRowAlloc(-64, -64, "a string", "a string", "a string", "a string", "a string", "a string", "a string" ); + + if (!object) { + exit(EXIT_FAILURE); + } + + if (!object->cam_id == -64) { + psFree(object); + exit(EXIT_FAILURE); + } if (!object->chip_id == -64) { psFree(object); exit(EXIT_FAILURE); } - if (!object->exp_id == -64) { + if (strncmp(object->state, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->workdir, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->workdir_state, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->label, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->reduction, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->expgroup, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->dvodb, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + camProcessedExpRow *object; + + object = camProcessedExpRowAlloc(-64, -64, "a string", 32.32, 32.32, 32.32, 32.32, 32.32, 32.32, 32.32, 32.32, 32.32, -32, -32, -32, -32, "a string", -16 ); + + if (!object) { + exit(EXIT_FAILURE); + } + + if (!object->cam_id == -64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->chip_id == -64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->uri, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->bg == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->bg_stdev == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->bg_mean_stdev == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->sigma_ra == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->sigma_dec == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->zp_mean == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->zp_stdev == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->fwhm == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->fwhm_range == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->n_stars == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->n_extended == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->n_cr == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->n_astrom == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->path_base, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->fault == -16) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + camMaskRow *object; + + object = camMaskRowAlloc("a string" ); + + if (!object) { + exit(EXIT_FAILURE); + } + + if (strncmp(object->label, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + warpRunRow *object; + + object = warpRunRowAlloc(-64, "a string", "a string", "a string", "a string", "0001-01-01T00:00:00Z" ); + + if (!object) { + exit(EXIT_FAILURE); + } + + if (!object->warp_id == -64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->mode, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->state, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->workdir, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->dvodb, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + warpInputExpRow *object; + + object = warpInputExpRowAlloc(-64, -64, true ); + + if (!object) { + exit(EXIT_FAILURE); + } + + if (!object->warp_id == -64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->cam_id == -64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->magiced == true) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + warpSkyCellMapRow *object; + + object = warpSkyCellMapRowAlloc(-64, "a string", "a string", -64, "a string", -16 ); + + if (!object) { + exit(EXIT_FAILURE); + } + + if (!object->warp_id == -64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->skycell_id, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->tess_id, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->cam_id == -64) { psFree(object); exit(EXIT_FAILURE); @@ -671,84 +1004,49 @@ exit(EXIT_FAILURE); } + if (!object->fault == -16) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + warpSkyfileRow *object; + + object = warpSkyfileRowAlloc(-64, "a string", "a string", "a string", "a string", 64.64, 64.64, -16 ); + + if (!object) { + exit(EXIT_FAILURE); + } + + if (!object->warp_id == -64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->skycell_id, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->tess_id, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } if (strncmp(object->uri, "a string", MAX_STRING_LENGTH)) { psFree(object); exit(EXIT_FAILURE); } - if (!object->bg == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->bg_stdev == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->bg_mean_stdev == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->bias == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->bias_stdev == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->fringe_0 == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->fringe_1 == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->fringe_2 == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->sigma_ra == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->sigma_dec == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->ap_resid == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->ap_resid_stdev == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->fwhm == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->fwhm_range == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->n_stars == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->n_extended == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->n_cr == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->n_astrom == -32) { - psFree(object); - exit(EXIT_FAILURE); - } if (strncmp(object->path_base, "a string", MAX_STRING_LENGTH)) { psFree(object); exit(EXIT_FAILURE); } + if (!object->bg == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->bg_stdev == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } if (!object->fault == -16) { psFree(object); @@ -760,34 +1058,13 @@ { - chipMaskRow *object; - - object = chipMaskRowAlloc("a string" ); - - if (!object) { - exit(EXIT_FAILURE); - } - - if (strncmp(object->label, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - camRunRow *object; - - object = camRunRowAlloc(-64, -64, "a string", "a string", "a string", "a string", "a string", "a string", "a string" ); - - if (!object) { - exit(EXIT_FAILURE); - } - - if (!object->cam_id == -64) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->chip_id == -64) { + diffRunRow *object; + + object = diffRunRowAlloc(-64, "a string", "a string", "a string", "0001-01-01T00:00:00Z", "a string", "a string" ); + + if (!object) { + exit(EXIT_FAILURE); + } + + if (!object->diff_id == -64) { psFree(object); exit(EXIT_FAILURE); @@ -801,42 +1078,70 @@ exit(EXIT_FAILURE); } - if (strncmp(object->workdir_state, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->label, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->reduction, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->expgroup, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } if (strncmp(object->dvodb, "a string", MAX_STRING_LENGTH)) { psFree(object); exit(EXIT_FAILURE); } - - psFree(object); - } - - { - camProcessedExpRow *object; - - object = camProcessedExpRowAlloc(-64, -64, "a string", 32.32, 32.32, 32.32, 32.32, 32.32, 32.32, 32.32, 32.32, 32.32, -32, -32, -32, -32, "a string", -16 ); - - if (!object) { - exit(EXIT_FAILURE); - } - - if (!object->cam_id == -64) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->chip_id == -64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->skycell_id, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->tess_id, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + diffInputSkyfileRow *object; + + object = diffInputSkyfileRowAlloc(-64, -64, "a string", "a string", "a string", true ); + + if (!object) { + exit(EXIT_FAILURE); + } + + if (!object->diff_id == -64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->warp_id == -64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->skycell_id, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->tess_id, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->kind, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->template == true) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + diffSkyfileRow *object; + + object = diffSkyfileRowAlloc(-64, "a string", "a string", 64.64, 64.64, -16 ); + + if (!object) { + exit(EXIT_FAILURE); + } + + if (!object->diff_id == -64) { psFree(object); exit(EXIT_FAILURE); @@ -846,60 +1151,16 @@ exit(EXIT_FAILURE); } - if (!object->bg == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->bg_stdev == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->bg_mean_stdev == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->sigma_ra == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->sigma_dec == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->zp_mean == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->zp_stdev == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->fwhm == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->fwhm_range == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->n_stars == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->n_extended == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->n_cr == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->n_astrom == -32) { - psFree(object); - exit(EXIT_FAILURE); - } if (strncmp(object->path_base, "a string", MAX_STRING_LENGTH)) { psFree(object); exit(EXIT_FAILURE); } + if (!object->bg == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->bg_stdev == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } if (!object->fault == -16) { psFree(object); @@ -911,356 +1172,94 @@ { - camMaskRow *object; - - object = camMaskRowAlloc("a string" ); - - if (!object) { - exit(EXIT_FAILURE); - } - - if (strncmp(object->label, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - warpRunRow *object; - - object = warpRunRowAlloc(-64, "a string", "a string", "a string", "a string", "0001-01-01T00:00:00Z" ); - - if (!object) { - exit(EXIT_FAILURE); - } - + stackRunRow *object; + + object = stackRunRowAlloc(-64, "a string", "a string", "a string", "0001-01-01T00:00:00Z", "a string", "a string" ); + + if (!object) { + exit(EXIT_FAILURE); + } + + if (!object->stack_id == -64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->state, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->workdir, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->dvodb, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->skycell_id, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->tess_id, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + stackInputSkyfileRow *object; + + object = stackInputSkyfileRowAlloc(-64, -64 ); + + if (!object) { + exit(EXIT_FAILURE); + } + + if (!object->stack_id == -64) { + psFree(object); + exit(EXIT_FAILURE); + } if (!object->warp_id == -64) { psFree(object); exit(EXIT_FAILURE); } - if (strncmp(object->mode, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->state, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->workdir, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->dvodb, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - warpInputExpRow *object; - - object = warpInputExpRowAlloc(-64, -64, true ); - - if (!object) { - exit(EXIT_FAILURE); - } - - if (!object->warp_id == -64) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->cam_id == -64) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->magiced == true) { - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - warpSkyCellMapRow *object; - - object = warpSkyCellMapRowAlloc(-64, "a string", "a string", -64, "a string", -16 ); - - if (!object) { - exit(EXIT_FAILURE); - } - - if (!object->warp_id == -64) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->skycell_id, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->tess_id, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->cam_id == -64) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->class_id, "a string", MAX_STRING_LENGTH)) { + + psFree(object); + } + + { + stackSumSkyfileRow *object; + + object = stackSumSkyfileRowAlloc(-64, "a string", "a string", 64.64, 64.64, -16 ); + + if (!object) { + exit(EXIT_FAILURE); + } + + if (!object->stack_id == -64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->uri, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->path_base, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->bg == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->bg_stdev == 64.64) { psFree(object); exit(EXIT_FAILURE); } if (!object->fault == -16) { - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - warpSkyfileRow *object; - - object = warpSkyfileRowAlloc(-64, "a string", "a string", "a string", "a string", 64.64, 64.64 ); - - if (!object) { - exit(EXIT_FAILURE); - } - - if (!object->warp_id == -64) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->skycell_id, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->tess_id, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->uri, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->path_base, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->bg == 64.64) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->bg_stdev == 64.64) { - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - diffRunRow *object; - - object = diffRunRowAlloc(-64, "a string", "a string", "a string", "0001-01-01T00:00:00Z", "a string", "a string" ); - - if (!object) { - exit(EXIT_FAILURE); - } - - if (!object->diff_id == -64) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->state, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->workdir, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->dvodb, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->skycell_id, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->tess_id, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - diffInputSkyfileRow *object; - - object = diffInputSkyfileRowAlloc(-64, -64, "a string", "a string", "a string", true ); - - if (!object) { - exit(EXIT_FAILURE); - } - - if (!object->diff_id == -64) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->warp_id == -64) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->skycell_id, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->tess_id, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->kind, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->template == true) { - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - diffSkyfileRow *object; - - object = diffSkyfileRowAlloc(-64, "a string", "a string", 64.64, 64.64 ); - - if (!object) { - exit(EXIT_FAILURE); - } - - if (!object->diff_id == -64) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->uri, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->path_base, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->bg == 64.64) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->bg_stdev == 64.64) { - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - stackRunRow *object; - - object = stackRunRowAlloc(-64, "a string", "a string", "a string", "0001-01-01T00:00:00Z", "a string", "a string" ); - - if (!object) { - exit(EXIT_FAILURE); - } - - if (!object->stack_id == -64) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->state, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->workdir, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->dvodb, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->skycell_id, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->tess_id, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - stackInputSkyfileRow *object; - - object = stackInputSkyfileRowAlloc(-64, -64 ); - - if (!object) { - exit(EXIT_FAILURE); - } - - if (!object->stack_id == -64) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->warp_id == -64) { - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - stackSumSkyfileRow *object; - - object = stackSumSkyfileRowAlloc(-64, "a string", "a string", 64.64, 64.64 ); - - if (!object) { - exit(EXIT_FAILURE); - } - - if (!object->stack_id == -64) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->uri, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->path_base, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->bg == 64.64) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->bg_stdev == 64.64) { psFree(object); exit(EXIT_FAILURE); Index: /trunk/ippdb/tests/createtable.c =================================================================== --- /trunk/ippdb/tests/createtable.c (revision 14168) +++ /trunk/ippdb/tests/createtable.c (revision 14169) @@ -193,19 +193,4 @@ } - if(!chipInputImfileCreateTable(dbh)) { - exit(EXIT_FAILURE); - } - - psDBCleanup(dbh); - } - - { - psDB *dbh; - - dbh = psDBInit("localhost", "test", NULL, "test"); - if (!dbh) { - exit(EXIT_FAILURE); - } - if(!chipProcessedImfileCreateTable(dbh)) { exit(EXIT_FAILURE); Index: /trunk/ippdb/tests/dbcleanup.c =================================================================== --- /trunk/ippdb/tests/dbcleanup.c (revision 14168) +++ /trunk/ippdb/tests/dbcleanup.c (revision 14169) @@ -23,5 +23,4 @@ p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS guidePendingExp"); p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS chipRun"); - p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS chipInputImfile"); p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS chipProcessedImfile"); p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS chipMask"); Index: /trunk/ippdb/tests/dbsetup.c =================================================================== --- /trunk/ippdb/tests/dbsetup.c (revision 14168) +++ /trunk/ippdb/tests/dbsetup.c (revision 14169) @@ -48,7 +48,4 @@ p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS chipRun"); chipRunCreateTable(dbh); - - p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS chipInputImfile"); - chipInputImfileCreateTable(dbh); p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS chipProcessedImfile"); Index: /trunk/ippdb/tests/droptable.c =================================================================== --- /trunk/ippdb/tests/droptable.c (revision 14168) +++ /trunk/ippdb/tests/droptable.c (revision 14169) @@ -193,19 +193,4 @@ } - if (!chipInputImfileDropTable(dbh)) { - exit(EXIT_FAILURE); - } - - psDBCleanup(dbh); - } - - { - psDB *dbh; - - dbh = psDBInit("localhost", "test", NULL, "test"); - if (!dbh) { - exit(EXIT_FAILURE); - } - if (!chipProcessedImfileDropTable(dbh)) { exit(EXIT_FAILURE); Index: /trunk/ippdb/tests/insert.c =================================================================== --- /trunk/ippdb/tests/insert.c (revision 14168) +++ /trunk/ippdb/tests/insert.c (revision 14169) @@ -103,5 +103,5 @@ } - if (!newExpInsert(dbh, -64, "a string", "a string", "a string", "a string", "a string", "a string")) { + if (!newExpInsert(dbh, -64, "a string", "a string", "a string", "a string", "a string", "a string", "a string")) { exit(EXIT_FAILURE); } @@ -133,5 +133,5 @@ } - if (!rawExpInsert(dbh, -64, "a string", "a string", "a string", "0001-01-01T00:00:00Z", "a string", "a string", "a string", "a string", "a string", 32.32, 64.64, 64.64, 32.32, 32.32, 64.64, 64.64, 64.64, 64.64, 64.64, 32.32, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, "a string", 32.32, -16)) { + if (!rawExpInsert(dbh, -64, "a string", "a string", "a string", "0001-01-01T00:00:00Z", "a string", "a string", "a string", "a string", "a string", "a string", 32.32, 64.64, 64.64, 32.32, 32.32, 64.64, 64.64, 64.64, 64.64, 64.64, 32.32, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, "a string", 32.32, -16)) { exit(EXIT_FAILURE); } @@ -178,20 +178,5 @@ } - if (!chipRunInsert(dbh, -64, "a string", "a string", "a string", "a string", "a string", "a string", "a string")) { - exit(EXIT_FAILURE); - } - - psDBCleanup(dbh); - } - - { - psDB *dbh; - - dbh = psDBInit("localhost", "test", NULL, "test"); - if (!dbh) { - exit(EXIT_FAILURE); - } - - if (!chipInputImfileInsert(dbh, -64, -64, "a string")) { + if (!chipRunInsert(dbh, -64, -64, "a string", "a string", "a string", "a string", "a string", "a string", "a string")) { exit(EXIT_FAILURE); } @@ -328,5 +313,5 @@ } - if (!warpSkyfileInsert(dbh, -64, "a string", "a string", "a string", "a string", 64.64, 64.64)) { + if (!warpSkyfileInsert(dbh, -64, "a string", "a string", "a string", "a string", 64.64, 64.64, -16)) { exit(EXIT_FAILURE); } @@ -373,5 +358,5 @@ } - if (!diffSkyfileInsert(dbh, -64, "a string", "a string", 64.64, 64.64)) { + if (!diffSkyfileInsert(dbh, -64, "a string", "a string", 64.64, 64.64, -16)) { exit(EXIT_FAILURE); } @@ -418,5 +403,5 @@ } - if (!stackSumSkyfileInsert(dbh, -64, "a string", "a string", 64.64, 64.64)) { + if (!stackSumSkyfileInsert(dbh, -64, "a string", "a string", 64.64, 64.64, -16)) { exit(EXIT_FAILURE); } Index: /trunk/ippdb/tests/insertfits.c =================================================================== --- /trunk/ippdb/tests/insertfits.c (revision 14168) +++ /trunk/ippdb/tests/insertfits.c (revision 14169) @@ -336,30 +336,4 @@ } - if (!chipInputImfileInsertFits(dbh, fits)) { - exit(EXIT_FAILURE); - } - - if (!psFitsClose(fits)) { - exit(EXIT_FAILURE); - } - - psDBCleanup(dbh); - } - - { - psDB *dbh; - psFits *fits; - - dbh = psDBInit("localhost", "test", NULL, "test"); - if (!dbh) { - exit(EXIT_FAILURE); - } - - // open a temp - fits = psFitsOpen(TMP_FILENAME, "r"); - if (!fits) { - exit(EXIT_FAILURE); - } - if (!chipProcessedImfileInsertFits(dbh, fits)) { exit(EXIT_FAILURE); Index: /trunk/ippdb/tests/insertobject.c =================================================================== --- /trunk/ippdb/tests/insertobject.c (revision 14168) +++ /trunk/ippdb/tests/insertobject.c (revision 14169) @@ -146,5 +146,5 @@ } - object = newExpRowAlloc(-64, "a string", "a string", "a string", "a string", "a string", "a string"); + object = newExpRowAlloc(-64, "a string", "a string", "a string", "a string", "a string", "a string", "a string"); if (!object) { exit(EXIT_FAILURE); @@ -190,5 +190,5 @@ } - object = rawExpRowAlloc(-64, "a string", "a string", "a string", "0001-01-01T00:00:00Z", "a string", "a string", "a string", "a string", "a string", 32.32, 64.64, 64.64, 32.32, 32.32, 64.64, 64.64, 64.64, 64.64, 64.64, 32.32, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, "a string", 32.32, -16); + object = rawExpRowAlloc(-64, "a string", "a string", "a string", "0001-01-01T00:00:00Z", "a string", "a string", "a string", "a string", "a string", "a string", 32.32, 64.64, 64.64, 32.32, 32.32, 64.64, 64.64, 64.64, 64.64, 64.64, 32.32, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, "a string", 32.32, -16); if (!object) { exit(EXIT_FAILURE); @@ -256,5 +256,5 @@ } - object = chipRunRowAlloc(-64, "a string", "a string", "a string", "a string", "a string", "a string", "a string"); + object = chipRunRowAlloc(-64, -64, "a string", "a string", "a string", "a string", "a string", "a string", "a string"); if (!object) { exit(EXIT_FAILURE); @@ -271,26 +271,4 @@ { psDB *dbh; - chipInputImfileRow *object; - - dbh = psDBInit("localhost", "test", NULL, "test"); - if (!dbh) { - exit(EXIT_FAILURE); - } - - object = chipInputImfileRowAlloc(-64, -64, "a string"); - if (!object) { - exit(EXIT_FAILURE); - } - - if (!chipInputImfileInsertObject(dbh, object)) { - exit(EXIT_FAILURE); - } - - psFree(object); - psDBCleanup(dbh); - } - - { - psDB *dbh; chipProcessedImfileRow *object; @@ -476,5 +454,5 @@ } - object = warpSkyfileRowAlloc(-64, "a string", "a string", "a string", "a string", 64.64, 64.64); + object = warpSkyfileRowAlloc(-64, "a string", "a string", "a string", "a string", 64.64, 64.64, -16); if (!object) { exit(EXIT_FAILURE); @@ -542,5 +520,5 @@ } - object = diffSkyfileRowAlloc(-64, "a string", "a string", 64.64, 64.64); + object = diffSkyfileRowAlloc(-64, "a string", "a string", 64.64, 64.64, -16); if (!object) { exit(EXIT_FAILURE); @@ -608,5 +586,5 @@ } - object = stackSumSkyfileRowAlloc(-64, "a string", "a string", 64.64, 64.64); + object = stackSumSkyfileRowAlloc(-64, "a string", "a string", 64.64, 64.64, -16); if (!object) { exit(EXIT_FAILURE); Index: /trunk/ippdb/tests/metadatafromobject.c =================================================================== --- /trunk/ippdb/tests/metadatafromobject.c (revision 14168) +++ /trunk/ippdb/tests/metadatafromobject.c (revision 14169) @@ -276,5 +276,5 @@ bool status; - object = newExpRowAlloc(-64, "a string", "a string", "a string", "a string", "a string", "a string"); + object = newExpRowAlloc(-64, "a string", "a string", "a string", "a string", "a string", "a string", "a string"); if (!object) { exit(EXIT_FAILURE); @@ -315,4 +315,8 @@ exit(EXIT_FAILURE); } + if (strncmp(psMetadataLookupPtr(&status, md, "reduction"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } psFree(md); @@ -356,5 +360,5 @@ bool status; - object = rawExpRowAlloc(-64, "a string", "a string", "a string", "0001-01-01T00:00:00Z", "a string", "a string", "a string", "a string", "a string", 32.32, 64.64, 64.64, 32.32, 32.32, 64.64, 64.64, 64.64, 64.64, 64.64, 32.32, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, "a string", 32.32, -16); + object = rawExpRowAlloc(-64, "a string", "a string", "a string", "0001-01-01T00:00:00Z", "a string", "a string", "a string", "a string", "a string", "a string", 32.32, 64.64, 64.64, 32.32, 32.32, 64.64, 64.64, 64.64, 64.64, 64.64, 32.32, 64.64, 64.64, 64.64, 64.64, 64.64, 64.64, "a string", 32.32, -16); if (!object) { exit(EXIT_FAILURE); @@ -402,4 +406,8 @@ exit(EXIT_FAILURE); } + if (strncmp(psMetadataLookupPtr(&status, md, "reduction"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } if (strncmp(psMetadataLookupPtr(&status, md, "filter"), "a string", MAX_STRING_LENGTH)) { psFree(md); @@ -663,5 +671,5 @@ bool status; - object = chipRunRowAlloc(-64, "a string", "a string", "a string", "a string", "a string", "a string", "a string"); + object = chipRunRowAlloc(-64, -64, "a string", "a string", "a string", "a string", "a string", "a string", "a string"); if (!object) { exit(EXIT_FAILURE); @@ -678,4 +686,7 @@ exit(EXIT_FAILURE); } + psFree(md); + exit(EXIT_FAILURE); + } if (strncmp(psMetadataLookupPtr(&status, md, "state"), "a string", MAX_STRING_LENGTH)) { psFree(md); @@ -712,13 +723,13 @@ { psMetadata *md; - chipInputImfileRow *object; - bool status; - - object = chipInputImfileRowAlloc(-64, -64, "a string"); - if (!object) { - exit(EXIT_FAILURE); - } - - md = chipInputImfileMetadataFromObject(object); + chipProcessedImfileRow *object; + bool status; + + object = chipProcessedImfileRowAlloc(-64, -64, "a string", "a string", 32.32, 32.32, 32.32, 32.32, 32.32, 32.32, 32.32, 32.32, 32.32, 32.32, 32.32, 32.32, 32.32, 32.32, -32, -32, -32, -32, "a string", -16); + if (!object) { + exit(EXIT_FAILURE); + } + + md = chipProcessedImfileMetadataFromObject(object); if (!md) { exit(EXIT_FAILURE); @@ -737,25 +748,385 @@ exit(EXIT_FAILURE); } - - psFree(md); - } - - { - psMetadata *md; - chipProcessedImfileRow *object; - bool status; - - object = chipProcessedImfileRowAlloc(-64, -64, "a string", "a string", 32.32, 32.32, 32.32, 32.32, 32.32, 32.32, 32.32, 32.32, 32.32, 32.32, 32.32, 32.32, 32.32, 32.32, -32, -32, -32, -32, "a string", -16); - if (!object) { - exit(EXIT_FAILURE); - } - - md = chipProcessedImfileMetadataFromObject(object); - if (!md) { - exit(EXIT_FAILURE); - } - - psFree(object); - + if (strncmp(psMetadataLookupPtr(&status, md, "uri"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF32(&status, md, "bg") == 32.32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF32(&status, md, "bg_stdev") == 32.32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF32(&status, md, "bg_mean_stdev") == 32.32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF32(&status, md, "bias") == 32.32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF32(&status, md, "bias_stdev") == 32.32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF32(&status, md, "fringe_0") == 32.32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF32(&status, md, "fringe_1") == 32.32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF32(&status, md, "fringe_2") == 32.32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF32(&status, md, "sigma_ra") == 32.32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF32(&status, md, "sigma_dec") == 32.32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF32(&status, md, "ap_resid") == 32.32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF32(&status, md, "ap_resid_stdev") == 32.32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF32(&status, md, "fwhm") == 32.32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF32(&status, md, "fwhm_range") == 32.32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupS32(&status, md, "n_stars") == -32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupS32(&status, md, "n_extended") == -32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupS32(&status, md, "n_cr") == -32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupS32(&status, md, "n_astrom") == -32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "path_base"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + } + + { + psMetadata *md; + chipMaskRow *object; + bool status; + + object = chipMaskRowAlloc("a string"); + if (!object) { + exit(EXIT_FAILURE); + } + + md = chipMaskMetadataFromObject(object); + if (!md) { + exit(EXIT_FAILURE); + } + + psFree(object); + + if (strncmp(psMetadataLookupPtr(&status, md, "label"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + } + + { + psMetadata *md; + camRunRow *object; + bool status; + + object = camRunRowAlloc(-64, -64, "a string", "a string", "a string", "a string", "a string", "a string", "a string"); + if (!object) { + exit(EXIT_FAILURE); + } + + md = camRunMetadataFromObject(object); + if (!md) { + exit(EXIT_FAILURE); + } + + psFree(object); + + psFree(md); + exit(EXIT_FAILURE); + } + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "state"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "workdir"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "workdir_state"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "label"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "reduction"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "expgroup"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "dvodb"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + } + + { + psMetadata *md; + camProcessedExpRow *object; + bool status; + + object = camProcessedExpRowAlloc(-64, -64, "a string", 32.32, 32.32, 32.32, 32.32, 32.32, 32.32, 32.32, 32.32, 32.32, -32, -32, -32, -32, "a string", -16); + if (!object) { + exit(EXIT_FAILURE); + } + + md = camProcessedExpMetadataFromObject(object); + if (!md) { + exit(EXIT_FAILURE); + } + + psFree(object); + + psFree(md); + exit(EXIT_FAILURE); + } + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "uri"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF32(&status, md, "bg") == 32.32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF32(&status, md, "bg_stdev") == 32.32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF32(&status, md, "bg_mean_stdev") == 32.32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF32(&status, md, "sigma_ra") == 32.32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF32(&status, md, "sigma_dec") == 32.32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF32(&status, md, "zp_mean") == 32.32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF32(&status, md, "zp_stdev") == 32.32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF32(&status, md, "fwhm") == 32.32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF32(&status, md, "fwhm_range") == 32.32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupS32(&status, md, "n_stars") == -32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupS32(&status, md, "n_extended") == -32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupS32(&status, md, "n_cr") == -32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupS32(&status, md, "n_astrom") == -32) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "path_base"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + } + + { + psMetadata *md; + camMaskRow *object; + bool status; + + object = camMaskRowAlloc("a string"); + if (!object) { + exit(EXIT_FAILURE); + } + + md = camMaskMetadataFromObject(object); + if (!md) { + exit(EXIT_FAILURE); + } + + psFree(object); + + if (strncmp(psMetadataLookupPtr(&status, md, "label"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + } + + { + psMetadata *md; + warpRunRow *object; + bool status; + + object = warpRunRowAlloc(-64, "a string", "a string", "a string", "a string", "0001-01-01T00:00:00Z"); + if (!object) { + exit(EXIT_FAILURE); + } + + md = warpRunMetadataFromObject(object); + if (!md) { + exit(EXIT_FAILURE); + } + + psFree(object); + + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "mode"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "state"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "workdir"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "dvodb"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + } + + { + psMetadata *md; + warpInputExpRow *object; + bool status; + + object = warpInputExpRowAlloc(-64, -64, true); + if (!object) { + exit(EXIT_FAILURE); + } + + md = warpInputExpMetadataFromObject(object); + if (!md) { + exit(EXIT_FAILURE); + } + + psFree(object); + + psFree(md); + exit(EXIT_FAILURE); + } + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupBool(&status, md, "magiced") == true) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + } + + { + psMetadata *md; + warpSkyCellMapRow *object; + bool status; + + object = warpSkyCellMapRowAlloc(-64, "a string", "a string", -64, "a string", -16); + if (!object) { + exit(EXIT_FAILURE); + } + + md = warpSkyCellMapMetadataFromObject(object); + if (!md) { + exit(EXIT_FAILURE); + } + + psFree(object); + + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "skycell_id"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "tess_id"), "a string", MAX_STRING_LENGTH)) { psFree(md); exit(EXIT_FAILURE); @@ -768,136 +1139,79 @@ exit(EXIT_FAILURE); } + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + } + + { + psMetadata *md; + warpSkyfileRow *object; + bool status; + + object = warpSkyfileRowAlloc(-64, "a string", "a string", "a string", "a string", 64.64, 64.64, -16); + if (!object) { + exit(EXIT_FAILURE); + } + + md = warpSkyfileMetadataFromObject(object); + if (!md) { + exit(EXIT_FAILURE); + } + + psFree(object); + + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "skycell_id"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "tess_id"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } if (strncmp(psMetadataLookupPtr(&status, md, "uri"), "a string", MAX_STRING_LENGTH)) { psFree(md); exit(EXIT_FAILURE); } - if (!psMetadataLookupF32(&status, md, "bg") == 32.32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupF32(&status, md, "bg_stdev") == 32.32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupF32(&status, md, "bg_mean_stdev") == 32.32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupF32(&status, md, "bias") == 32.32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupF32(&status, md, "bias_stdev") == 32.32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupF32(&status, md, "fringe_0") == 32.32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupF32(&status, md, "fringe_1") == 32.32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupF32(&status, md, "fringe_2") == 32.32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupF32(&status, md, "sigma_ra") == 32.32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupF32(&status, md, "sigma_dec") == 32.32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupF32(&status, md, "ap_resid") == 32.32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupF32(&status, md, "ap_resid_stdev") == 32.32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupF32(&status, md, "fwhm") == 32.32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupF32(&status, md, "fwhm_range") == 32.32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupS32(&status, md, "n_stars") == -32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupS32(&status, md, "n_extended") == -32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupS32(&status, md, "n_cr") == -32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupS32(&status, md, "n_astrom") == -32) { - psFree(md); - exit(EXIT_FAILURE); - } if (strncmp(psMetadataLookupPtr(&status, md, "path_base"), "a string", MAX_STRING_LENGTH)) { psFree(md); exit(EXIT_FAILURE); } - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - } - - { - psMetadata *md; - chipMaskRow *object; - bool status; - - object = chipMaskRowAlloc("a string"); - if (!object) { - exit(EXIT_FAILURE); - } - - md = chipMaskMetadataFromObject(object); - if (!md) { - exit(EXIT_FAILURE); - } - - psFree(object); - - if (strncmp(psMetadataLookupPtr(&status, md, "label"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - } - - { - psMetadata *md; - camRunRow *object; - bool status; - - object = camRunRowAlloc(-64, -64, "a string", "a string", "a string", "a string", "a string", "a string", "a string"); - if (!object) { - exit(EXIT_FAILURE); - } - - md = camRunMetadataFromObject(object); - if (!md) { - exit(EXIT_FAILURE); - } - - psFree(object); - - psFree(md); - exit(EXIT_FAILURE); - } + if (!psMetadataLookupF64(&status, md, "bg") == 64.64) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF64(&status, md, "bg_stdev") == 64.64) { + psFree(md); + exit(EXIT_FAILURE); + } + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + } + + { + psMetadata *md; + diffRunRow *object; + bool status; + + object = diffRunRowAlloc(-64, "a string", "a string", "a string", "0001-01-01T00:00:00Z", "a string", "a string"); + if (!object) { + exit(EXIT_FAILURE); + } + + md = diffRunMetadataFromObject(object); + if (!md) { + exit(EXIT_FAILURE); + } + + psFree(object); + psFree(md); exit(EXIT_FAILURE); @@ -911,48 +1225,83 @@ exit(EXIT_FAILURE); } - if (strncmp(psMetadataLookupPtr(&status, md, "workdir_state"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "label"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "reduction"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "expgroup"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } if (strncmp(psMetadataLookupPtr(&status, md, "dvodb"), "a string", MAX_STRING_LENGTH)) { psFree(md); exit(EXIT_FAILURE); } - - psFree(md); - } - - { - psMetadata *md; - camProcessedExpRow *object; - bool status; - - object = camProcessedExpRowAlloc(-64, -64, "a string", 32.32, 32.32, 32.32, 32.32, 32.32, 32.32, 32.32, 32.32, 32.32, -32, -32, -32, -32, "a string", -16); - if (!object) { - exit(EXIT_FAILURE); - } - - md = camProcessedExpMetadataFromObject(object); - if (!md) { - exit(EXIT_FAILURE); - } - - psFree(object); - - psFree(md); - exit(EXIT_FAILURE); - } + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "skycell_id"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "tess_id"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + } + + { + psMetadata *md; + diffInputSkyfileRow *object; + bool status; + + object = diffInputSkyfileRowAlloc(-64, -64, "a string", "a string", "a string", true); + if (!object) { + exit(EXIT_FAILURE); + } + + md = diffInputSkyfileMetadataFromObject(object); + if (!md) { + exit(EXIT_FAILURE); + } + + psFree(object); + + psFree(md); + exit(EXIT_FAILURE); + } + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "skycell_id"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "tess_id"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "kind"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupBool(&status, md, "template") == true) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + } + + { + psMetadata *md; + diffSkyfileRow *object; + bool status; + + object = diffSkyfileRowAlloc(-64, "a string", "a string", 64.64, 64.64, -16); + if (!object) { + exit(EXIT_FAILURE); + } + + md = diffSkyfileMetadataFromObject(object); + if (!md) { + exit(EXIT_FAILURE); + } + + psFree(object); + psFree(md); exit(EXIT_FAILURE); @@ -962,113 +1311,40 @@ exit(EXIT_FAILURE); } - if (!psMetadataLookupF32(&status, md, "bg") == 32.32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupF32(&status, md, "bg_stdev") == 32.32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupF32(&status, md, "bg_mean_stdev") == 32.32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupF32(&status, md, "sigma_ra") == 32.32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupF32(&status, md, "sigma_dec") == 32.32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupF32(&status, md, "zp_mean") == 32.32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupF32(&status, md, "zp_stdev") == 32.32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupF32(&status, md, "fwhm") == 32.32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupF32(&status, md, "fwhm_range") == 32.32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupS32(&status, md, "n_stars") == -32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupS32(&status, md, "n_extended") == -32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupS32(&status, md, "n_cr") == -32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupS32(&status, md, "n_astrom") == -32) { - psFree(md); - exit(EXIT_FAILURE); - } if (strncmp(psMetadataLookupPtr(&status, md, "path_base"), "a string", MAX_STRING_LENGTH)) { psFree(md); exit(EXIT_FAILURE); } - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - } - - { - psMetadata *md; - camMaskRow *object; - bool status; - - object = camMaskRowAlloc("a string"); - if (!object) { - exit(EXIT_FAILURE); - } - - md = camMaskMetadataFromObject(object); - if (!md) { - exit(EXIT_FAILURE); - } - - psFree(object); - - if (strncmp(psMetadataLookupPtr(&status, md, "label"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - } - - { - psMetadata *md; - warpRunRow *object; - bool status; - - object = warpRunRowAlloc(-64, "a string", "a string", "a string", "a string", "0001-01-01T00:00:00Z"); - if (!object) { - exit(EXIT_FAILURE); - } - - md = warpRunMetadataFromObject(object); - if (!md) { - exit(EXIT_FAILURE); - } - - psFree(object); - - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "mode"), "a string", MAX_STRING_LENGTH)) { + if (!psMetadataLookupF64(&status, md, "bg") == 64.64) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF64(&status, md, "bg_stdev") == 64.64) { + psFree(md); + exit(EXIT_FAILURE); + } + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + } + + { + psMetadata *md; + stackRunRow *object; + bool status; + + object = stackRunRowAlloc(-64, "a string", "a string", "a string", "0001-01-01T00:00:00Z", "a string", "a string"); + if (!object) { + exit(EXIT_FAILURE); + } + + md = stackRunMetadataFromObject(object); + if (!md) { + exit(EXIT_FAILURE); + } + + psFree(object); + psFree(md); exit(EXIT_FAILURE); @@ -1089,59 +1365,4 @@ exit(EXIT_FAILURE); } - - psFree(md); - } - - { - psMetadata *md; - warpInputExpRow *object; - bool status; - - object = warpInputExpRowAlloc(-64, -64, true); - if (!object) { - exit(EXIT_FAILURE); - } - - md = warpInputExpMetadataFromObject(object); - if (!md) { - exit(EXIT_FAILURE); - } - - psFree(object); - - psFree(md); - exit(EXIT_FAILURE); - } - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupBool(&status, md, "magiced") == true) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - } - - { - psMetadata *md; - warpSkyCellMapRow *object; - bool status; - - object = warpSkyCellMapRowAlloc(-64, "a string", "a string", -64, "a string", -16); - if (!object) { - exit(EXIT_FAILURE); - } - - md = warpSkyCellMapMetadataFromObject(object); - if (!md) { - exit(EXIT_FAILURE); - } - - psFree(object); - - psFree(md); - exit(EXIT_FAILURE); - } if (strncmp(psMetadataLookupPtr(&status, md, "skycell_id"), "a string", MAX_STRING_LENGTH)) { psFree(md); @@ -1152,43 +1373,52 @@ exit(EXIT_FAILURE); } - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "class_id"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - } - - { - psMetadata *md; - warpSkyfileRow *object; - bool status; - - object = warpSkyfileRowAlloc(-64, "a string", "a string", "a string", "a string", 64.64, 64.64); - if (!object) { - exit(EXIT_FAILURE); - } - - md = warpSkyfileMetadataFromObject(object); - if (!md) { - exit(EXIT_FAILURE); - } - - psFree(object); - - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "skycell_id"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "tess_id"), "a string", MAX_STRING_LENGTH)) { + + psFree(md); + } + + { + psMetadata *md; + stackInputSkyfileRow *object; + bool status; + + object = stackInputSkyfileRowAlloc(-64, -64); + if (!object) { + exit(EXIT_FAILURE); + } + + md = stackInputSkyfileMetadataFromObject(object); + if (!md) { + exit(EXIT_FAILURE); + } + + psFree(object); + + psFree(md); + exit(EXIT_FAILURE); + } + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + } + + { + psMetadata *md; + stackSumSkyfileRow *object; + bool status; + + object = stackSumSkyfileRowAlloc(-64, "a string", "a string", 64.64, 64.64, -16); + if (!object) { + exit(EXIT_FAILURE); + } + + md = stackSumSkyfileMetadataFromObject(object); + if (!md) { + exit(EXIT_FAILURE); + } + + psFree(object); + psFree(md); exit(EXIT_FAILURE); @@ -1210,245 +1440,4 @@ exit(EXIT_FAILURE); } - - psFree(md); - } - - { - psMetadata *md; - diffRunRow *object; - bool status; - - object = diffRunRowAlloc(-64, "a string", "a string", "a string", "0001-01-01T00:00:00Z", "a string", "a string"); - if (!object) { - exit(EXIT_FAILURE); - } - - md = diffRunMetadataFromObject(object); - if (!md) { - exit(EXIT_FAILURE); - } - - psFree(object); - - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "state"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "workdir"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "dvodb"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "skycell_id"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "tess_id"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - } - - { - psMetadata *md; - diffInputSkyfileRow *object; - bool status; - - object = diffInputSkyfileRowAlloc(-64, -64, "a string", "a string", "a string", true); - if (!object) { - exit(EXIT_FAILURE); - } - - md = diffInputSkyfileMetadataFromObject(object); - if (!md) { - exit(EXIT_FAILURE); - } - - psFree(object); - - psFree(md); - exit(EXIT_FAILURE); - } - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "skycell_id"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "tess_id"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "kind"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupBool(&status, md, "template") == true) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - } - - { - psMetadata *md; - diffSkyfileRow *object; - bool status; - - object = diffSkyfileRowAlloc(-64, "a string", "a string", 64.64, 64.64); - if (!object) { - exit(EXIT_FAILURE); - } - - md = diffSkyfileMetadataFromObject(object); - if (!md) { - exit(EXIT_FAILURE); - } - - psFree(object); - - 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, "path_base"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupF64(&status, md, "bg") == 64.64) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupF64(&status, md, "bg_stdev") == 64.64) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - } - - { - psMetadata *md; - stackRunRow *object; - bool status; - - object = stackRunRowAlloc(-64, "a string", "a string", "a string", "0001-01-01T00:00:00Z", "a string", "a string"); - if (!object) { - exit(EXIT_FAILURE); - } - - md = stackRunMetadataFromObject(object); - if (!md) { - exit(EXIT_FAILURE); - } - - psFree(object); - - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "state"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "workdir"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "dvodb"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "skycell_id"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "tess_id"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - } - - { - psMetadata *md; - stackInputSkyfileRow *object; - bool status; - - object = stackInputSkyfileRowAlloc(-64, -64); - if (!object) { - exit(EXIT_FAILURE); - } - - md = stackInputSkyfileMetadataFromObject(object); - if (!md) { - exit(EXIT_FAILURE); - } - - psFree(object); - - psFree(md); - exit(EXIT_FAILURE); - } - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - } - - { - psMetadata *md; - stackSumSkyfileRow *object; - bool status; - - object = stackSumSkyfileRowAlloc(-64, "a string", "a string", 64.64, 64.64); - if (!object) { - exit(EXIT_FAILURE); - } - - md = stackSumSkyfileMetadataFromObject(object); - if (!md) { - exit(EXIT_FAILURE); - } - - psFree(object); - - 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, "path_base"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupF64(&status, md, "bg") == 64.64) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataLookupF64(&status, md, "bg_stdev") == 64.64) { psFree(md); exit(EXIT_FAILURE); Index: /trunk/ippdb/tests/objectfrommetadata.c =================================================================== --- /trunk/ippdb/tests/objectfrommetadata.c (revision 14168) +++ /trunk/ippdb/tests/objectfrommetadata.c (revision 14169) @@ -422,4 +422,8 @@ exit(EXIT_FAILURE); } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "reduction", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } object = newExpObjectFromMetadata(md); @@ -458,4 +462,8 @@ exit(EXIT_FAILURE); } + if (strncmp(object->reduction, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } psFree(object); @@ -541,4 +549,8 @@ exit(EXIT_FAILURE); } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "reduction", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } if (!psMetadataAddStr(md, PS_LIST_TAIL, "filter", 0, NULL, "a string")) { psFree(md); @@ -667,4 +679,8 @@ exit(EXIT_FAILURE); } + if (strncmp(object->reduction, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } if (strncmp(object->filter, "a string", MAX_STRING_LENGTH)) { psFree(object); @@ -1052,4 +1068,7 @@ exit(EXIT_FAILURE); } + psFree(md); + exit(EXIT_FAILURE); + } if (!psMetadataAddStr(md, PS_LIST_TAIL, "state", 0, NULL, "a string")) { psFree(md); @@ -1092,4 +1111,7 @@ exit(EXIT_FAILURE); } + psFree(object); + exit(EXIT_FAILURE); + } if (strncmp(object->state, "a string", MAX_STRING_LENGTH)) { psFree(object); @@ -1126,5 +1148,5 @@ { psMetadata *md; - chipInputImfileRow *object; + chipProcessedImfileRow *object; md = psMetadataAlloc(); @@ -1139,6 +1161,89 @@ exit(EXIT_FAILURE); } - - object = chipInputImfileObjectFromMetadata(md); + if (!psMetadataAddStr(md, PS_LIST_TAIL, "uri", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF32(md, PS_LIST_TAIL, "bg", 0, NULL, 32.32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF32(md, PS_LIST_TAIL, "bg_stdev", 0, NULL, 32.32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF32(md, PS_LIST_TAIL, "bg_mean_stdev", 0, NULL, 32.32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF32(md, PS_LIST_TAIL, "bias", 0, NULL, 32.32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF32(md, PS_LIST_TAIL, "bias_stdev", 0, NULL, 32.32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF32(md, PS_LIST_TAIL, "fringe_0", 0, NULL, 32.32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF32(md, PS_LIST_TAIL, "fringe_1", 0, NULL, 32.32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF32(md, PS_LIST_TAIL, "fringe_2", 0, NULL, 32.32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF32(md, PS_LIST_TAIL, "sigma_ra", 0, NULL, 32.32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF32(md, PS_LIST_TAIL, "sigma_dec", 0, NULL, 32.32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF32(md, PS_LIST_TAIL, "ap_resid", 0, NULL, 32.32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF32(md, PS_LIST_TAIL, "ap_resid_stdev", 0, NULL, 32.32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF32(md, PS_LIST_TAIL, "fwhm", 0, NULL, 32.32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF32(md, PS_LIST_TAIL, "fwhm_range", 0, NULL, 32.32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddS32(md, PS_LIST_TAIL, "n_stars", 0, NULL, -32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddS32(md, PS_LIST_TAIL, "n_extended", 0, NULL, -32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddS32(md, PS_LIST_TAIL, "n_cr", 0, NULL, -32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddS32(md, PS_LIST_TAIL, "n_astrom", 0, NULL, -32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "path_base", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + psFree(md); + exit(EXIT_FAILURE); + } + + object = chipProcessedImfileObjectFromMetadata(md); if (!object) { psFree(md); @@ -1158,13 +1263,498 @@ exit(EXIT_FAILURE); } - - psFree(object); - } - - { - psMetadata *md; - chipProcessedImfileRow *object; - - md = psMetadataAlloc(); + if (strncmp(object->uri, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->bg == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->bg_stdev == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->bg_mean_stdev == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->bias == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->bias_stdev == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->fringe_0 == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->fringe_1 == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->fringe_2 == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->sigma_ra == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->sigma_dec == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->ap_resid == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->ap_resid_stdev == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->fwhm == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->fwhm_range == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->n_stars == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->n_extended == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->n_cr == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->n_astrom == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->path_base, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + psMetadata *md; + chipMaskRow *object; + + md = psMetadataAlloc(); + if (!psMetadataAddStr(md, PS_LIST_TAIL, "label", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + + object = chipMaskObjectFromMetadata(md); + if (!object) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + + if (strncmp(object->label, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + psMetadata *md; + camRunRow *object; + + md = psMetadataAlloc(); + psFree(md); + exit(EXIT_FAILURE); + } + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "state", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "workdir", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "workdir_state", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "label", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "reduction", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "expgroup", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "dvodb", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + + object = camRunObjectFromMetadata(md); + if (!object) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + + psFree(object); + exit(EXIT_FAILURE); + } + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->state, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->workdir, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->workdir_state, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->label, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->reduction, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->expgroup, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->dvodb, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + psMetadata *md; + camProcessedExpRow *object; + + md = psMetadataAlloc(); + psFree(md); + exit(EXIT_FAILURE); + } + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "uri", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF32(md, PS_LIST_TAIL, "bg", 0, NULL, 32.32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF32(md, PS_LIST_TAIL, "bg_stdev", 0, NULL, 32.32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF32(md, PS_LIST_TAIL, "bg_mean_stdev", 0, NULL, 32.32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF32(md, PS_LIST_TAIL, "sigma_ra", 0, NULL, 32.32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF32(md, PS_LIST_TAIL, "sigma_dec", 0, NULL, 32.32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF32(md, PS_LIST_TAIL, "zp_mean", 0, NULL, 32.32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF32(md, PS_LIST_TAIL, "zp_stdev", 0, NULL, 32.32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF32(md, PS_LIST_TAIL, "fwhm", 0, NULL, 32.32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF32(md, PS_LIST_TAIL, "fwhm_range", 0, NULL, 32.32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddS32(md, PS_LIST_TAIL, "n_stars", 0, NULL, -32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddS32(md, PS_LIST_TAIL, "n_extended", 0, NULL, -32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddS32(md, PS_LIST_TAIL, "n_cr", 0, NULL, -32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddS32(md, PS_LIST_TAIL, "n_astrom", 0, NULL, -32)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "path_base", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + psFree(md); + exit(EXIT_FAILURE); + } + + object = camProcessedExpObjectFromMetadata(md); + if (!object) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + + psFree(object); + exit(EXIT_FAILURE); + } + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->uri, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->bg == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->bg_stdev == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->bg_mean_stdev == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->sigma_ra == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->sigma_dec == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->zp_mean == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->zp_stdev == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->fwhm == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->fwhm_range == 32.32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->n_stars == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->n_extended == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->n_cr == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->n_astrom == -32) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->path_base, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + psMetadata *md; + camMaskRow *object; + + md = psMetadataAlloc(); + if (!psMetadataAddStr(md, PS_LIST_TAIL, "label", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + + object = camMaskObjectFromMetadata(md); + if (!object) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + + if (strncmp(object->label, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + psMetadata *md; + warpRunRow *object; + + md = psMetadataAlloc(); + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "mode", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "state", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "workdir", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "dvodb", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + psFree(md); + exit(EXIT_FAILURE); + } + + object = warpRunObjectFromMetadata(md); + if (!object) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->mode, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->state, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->workdir, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->dvodb, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + psMetadata *md; + warpInputExpRow *object; + + md = psMetadataAlloc(); + psFree(md); + exit(EXIT_FAILURE); + } + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "magiced", PS_DATA_BOOL, NULL, true)) { + psFree(md); + exit(EXIT_FAILURE); + } + + object = warpInputExpObjectFromMetadata(md); + if (!object) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + + psFree(object); + exit(EXIT_FAILURE); + } + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->magiced == true) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + psMetadata *md; + warpSkyCellMapRow *object; + + md = psMetadataAlloc(); + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "skycell_id", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "tess_id", 0, NULL, "a string")) { psFree(md); exit(EXIT_FAILURE); @@ -1177,103 +1767,93 @@ exit(EXIT_FAILURE); } + psFree(md); + exit(EXIT_FAILURE); + } + + object = warpSkyCellMapObjectFromMetadata(md); + if (!object) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->skycell_id, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->tess_id, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->class_id, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + psMetadata *md; + warpSkyfileRow *object; + + md = psMetadataAlloc(); + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "skycell_id", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "tess_id", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } if (!psMetadataAddStr(md, PS_LIST_TAIL, "uri", 0, NULL, "a string")) { psFree(md); exit(EXIT_FAILURE); } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "bg", 0, NULL, 32.32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "bg_stdev", 0, NULL, 32.32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "bg_mean_stdev", 0, NULL, 32.32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "bias", 0, NULL, 32.32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "bias_stdev", 0, NULL, 32.32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "fringe_0", 0, NULL, 32.32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "fringe_1", 0, NULL, 32.32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "fringe_2", 0, NULL, 32.32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "sigma_ra", 0, NULL, 32.32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "sigma_dec", 0, NULL, 32.32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "ap_resid", 0, NULL, 32.32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "ap_resid_stdev", 0, NULL, 32.32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "fwhm", 0, NULL, 32.32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "fwhm_range", 0, NULL, 32.32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddS32(md, PS_LIST_TAIL, "n_stars", 0, NULL, -32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddS32(md, PS_LIST_TAIL, "n_extended", 0, NULL, -32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddS32(md, PS_LIST_TAIL, "n_cr", 0, NULL, -32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddS32(md, PS_LIST_TAIL, "n_astrom", 0, NULL, -32)) { - psFree(md); - exit(EXIT_FAILURE); - } if (!psMetadataAddStr(md, PS_LIST_TAIL, "path_base", 0, NULL, "a string")) { psFree(md); exit(EXIT_FAILURE); } - psFree(md); - exit(EXIT_FAILURE); - } - - object = chipProcessedImfileObjectFromMetadata(md); - if (!object) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - - psFree(object); - exit(EXIT_FAILURE); - } - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->class_id, "a string", MAX_STRING_LENGTH)) { + if (!psMetadataAddF64(md, PS_LIST_TAIL, "bg", 0, NULL, 64.64)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "bg_stdev", 0, NULL, 64.64)) { + psFree(md); + exit(EXIT_FAILURE); + } + psFree(md); + exit(EXIT_FAILURE); + } + + object = warpSkyfileObjectFromMetadata(md); + if (!object) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->skycell_id, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->tess_id, "a string", MAX_STRING_LENGTH)) { psFree(object); exit(EXIT_FAILURE); @@ -1283,121 +1863,28 @@ exit(EXIT_FAILURE); } - if (!object->bg == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->bg_stdev == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->bg_mean_stdev == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->bias == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->bias_stdev == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->fringe_0 == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->fringe_1 == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->fringe_2 == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->sigma_ra == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->sigma_dec == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->ap_resid == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->ap_resid_stdev == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->fwhm == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->fwhm_range == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->n_stars == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->n_extended == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->n_cr == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->n_astrom == -32) { - psFree(object); - exit(EXIT_FAILURE); - } if (strncmp(object->path_base, "a string", MAX_STRING_LENGTH)) { psFree(object); exit(EXIT_FAILURE); } - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - psMetadata *md; - chipMaskRow *object; - - md = psMetadataAlloc(); - if (!psMetadataAddStr(md, PS_LIST_TAIL, "label", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - - object = chipMaskObjectFromMetadata(md); - if (!object) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - - if (strncmp(object->label, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - psMetadata *md; - camRunRow *object; - - md = psMetadataAlloc(); - psFree(md); - exit(EXIT_FAILURE); - } + if (!object->bg == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->bg_stdev == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + psMetadata *md; + diffRunRow *object; + + md = psMetadataAlloc(); psFree(md); exit(EXIT_FAILURE); @@ -1411,36 +1898,28 @@ exit(EXIT_FAILURE); } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "workdir_state", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "label", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "reduction", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "expgroup", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } if (!psMetadataAddStr(md, PS_LIST_TAIL, "dvodb", 0, NULL, "a string")) { psFree(md); exit(EXIT_FAILURE); } - - object = camRunObjectFromMetadata(md); - if (!object) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - - psFree(object); - exit(EXIT_FAILURE); - } + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "skycell_id", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "tess_id", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + + object = diffRunObjectFromMetadata(md); + if (!object) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + psFree(object); exit(EXIT_FAILURE); @@ -1454,36 +1933,90 @@ exit(EXIT_FAILURE); } - if (strncmp(object->workdir_state, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->label, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->reduction, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->expgroup, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } if (strncmp(object->dvodb, "a string", MAX_STRING_LENGTH)) { psFree(object); exit(EXIT_FAILURE); } - - psFree(object); - } - - { - psMetadata *md; - camProcessedExpRow *object; - - md = psMetadataAlloc(); - psFree(md); - exit(EXIT_FAILURE); - } + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->skycell_id, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->tess_id, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + psMetadata *md; + diffInputSkyfileRow *object; + + md = psMetadataAlloc(); + psFree(md); + exit(EXIT_FAILURE); + } + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "skycell_id", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "tess_id", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "kind", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "template", PS_DATA_BOOL, NULL, true)) { + psFree(md); + exit(EXIT_FAILURE); + } + + object = diffInputSkyfileObjectFromMetadata(md); + if (!object) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + + psFree(object); + exit(EXIT_FAILURE); + } + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->skycell_id, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->tess_id, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->kind, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->template == true) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + psMetadata *md; + diffSkyfileRow *object; + + md = psMetadataAlloc(); psFree(md); exit(EXIT_FAILURE); @@ -1493,75 +2026,28 @@ exit(EXIT_FAILURE); } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "bg", 0, NULL, 32.32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "bg_stdev", 0, NULL, 32.32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "bg_mean_stdev", 0, NULL, 32.32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "sigma_ra", 0, NULL, 32.32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "sigma_dec", 0, NULL, 32.32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "zp_mean", 0, NULL, 32.32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "zp_stdev", 0, NULL, 32.32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "fwhm", 0, NULL, 32.32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddF32(md, PS_LIST_TAIL, "fwhm_range", 0, NULL, 32.32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddS32(md, PS_LIST_TAIL, "n_stars", 0, NULL, -32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddS32(md, PS_LIST_TAIL, "n_extended", 0, NULL, -32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddS32(md, PS_LIST_TAIL, "n_cr", 0, NULL, -32)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddS32(md, PS_LIST_TAIL, "n_astrom", 0, NULL, -32)) { - psFree(md); - exit(EXIT_FAILURE); - } if (!psMetadataAddStr(md, PS_LIST_TAIL, "path_base", 0, NULL, "a string")) { psFree(md); exit(EXIT_FAILURE); } - psFree(md); - exit(EXIT_FAILURE); - } - - object = camProcessedExpObjectFromMetadata(md); - if (!object) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - - psFree(object); - exit(EXIT_FAILURE); - } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "bg", 0, NULL, 64.64)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "bg_stdev", 0, NULL, 64.64)) { + psFree(md); + exit(EXIT_FAILURE); + } + psFree(md); + exit(EXIT_FAILURE); + } + + object = diffSkyfileObjectFromMetadata(md); + if (!object) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + psFree(object); exit(EXIT_FAILURE); @@ -1571,102 +2057,28 @@ exit(EXIT_FAILURE); } - if (!object->bg == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->bg_stdev == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->bg_mean_stdev == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->sigma_ra == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->sigma_dec == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->zp_mean == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->zp_stdev == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->fwhm == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->fwhm_range == 32.32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->n_stars == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->n_extended == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->n_cr == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->n_astrom == -32) { - psFree(object); - exit(EXIT_FAILURE); - } if (strncmp(object->path_base, "a string", MAX_STRING_LENGTH)) { psFree(object); exit(EXIT_FAILURE); } - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - psMetadata *md; - camMaskRow *object; - - md = psMetadataAlloc(); - if (!psMetadataAddStr(md, PS_LIST_TAIL, "label", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - - object = camMaskObjectFromMetadata(md); - if (!object) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - - if (strncmp(object->label, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - psMetadata *md; - warpRunRow *object; - - md = psMetadataAlloc(); - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "mode", 0, NULL, "a string")) { + if (!object->bg == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->bg_stdev == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + psMetadata *md; + stackRunRow *object; + + md = psMetadataAlloc(); psFree(md); exit(EXIT_FAILURE); @@ -1687,17 +2099,21 @@ exit(EXIT_FAILURE); } - - object = warpRunObjectFromMetadata(md); - if (!object) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->mode, "a string", MAX_STRING_LENGTH)) { + if (!psMetadataAddStr(md, PS_LIST_TAIL, "skycell_id", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "tess_id", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + + object = stackRunObjectFromMetadata(md); + if (!object) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + psFree(object); exit(EXIT_FAILURE); @@ -1718,84 +2134,4 @@ exit(EXIT_FAILURE); } - - psFree(object); - } - - { - psMetadata *md; - warpInputExpRow *object; - - md = psMetadataAlloc(); - psFree(md); - exit(EXIT_FAILURE); - } - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "magiced", PS_DATA_BOOL, NULL, true)) { - psFree(md); - exit(EXIT_FAILURE); - } - - object = warpInputExpObjectFromMetadata(md); - if (!object) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - - psFree(object); - exit(EXIT_FAILURE); - } - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->magiced == true) { - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - psMetadata *md; - warpSkyCellMapRow *object; - - md = psMetadataAlloc(); - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "skycell_id", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "tess_id", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "class_id", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - psFree(md); - exit(EXIT_FAILURE); - } - - object = warpSkyCellMapObjectFromMetadata(md); - if (!object) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - - psFree(object); - exit(EXIT_FAILURE); - } if (strncmp(object->skycell_id, "a string", MAX_STRING_LENGTH)) { psFree(object); @@ -1806,31 +2142,43 @@ exit(EXIT_FAILURE); } - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->class_id, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - psMetadata *md; - warpSkyfileRow *object; - - md = psMetadataAlloc(); - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "skycell_id", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "tess_id", 0, NULL, "a string")) { + + psFree(object); + } + + { + psMetadata *md; + stackInputSkyfileRow *object; + + md = psMetadataAlloc(); + psFree(md); + exit(EXIT_FAILURE); + } + psFree(md); + exit(EXIT_FAILURE); + } + + object = stackInputSkyfileObjectFromMetadata(md); + if (!object) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + + psFree(object); + exit(EXIT_FAILURE); + } + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + psMetadata *md; + stackSumSkyfileRow *object; + + md = psMetadataAlloc(); psFree(md); exit(EXIT_FAILURE); @@ -1852,21 +2200,16 @@ exit(EXIT_FAILURE); } - - object = warpSkyfileObjectFromMetadata(md); - if (!object) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->skycell_id, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->tess_id, "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + + object = stackSumSkyfileObjectFromMetadata(md); + if (!object) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + psFree(object); exit(EXIT_FAILURE); @@ -1888,345 +2231,4 @@ exit(EXIT_FAILURE); } - - psFree(object); - } - - { - psMetadata *md; - diffRunRow *object; - - md = psMetadataAlloc(); - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "state", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "workdir", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "dvodb", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "skycell_id", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "tess_id", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - - object = diffRunObjectFromMetadata(md); - if (!object) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->state, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->workdir, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->dvodb, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->skycell_id, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->tess_id, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - psMetadata *md; - diffInputSkyfileRow *object; - - md = psMetadataAlloc(); - psFree(md); - exit(EXIT_FAILURE); - } - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "skycell_id", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "tess_id", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "kind", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "template", PS_DATA_BOOL, NULL, true)) { - psFree(md); - exit(EXIT_FAILURE); - } - - object = diffInputSkyfileObjectFromMetadata(md); - if (!object) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - - psFree(object); - exit(EXIT_FAILURE); - } - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->skycell_id, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->tess_id, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->kind, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->template == true) { - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - psMetadata *md; - diffSkyfileRow *object; - - md = psMetadataAlloc(); - 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, "path_base", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddF64(md, PS_LIST_TAIL, "bg", 0, NULL, 64.64)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddF64(md, PS_LIST_TAIL, "bg_stdev", 0, NULL, 64.64)) { - psFree(md); - exit(EXIT_FAILURE); - } - - object = diffSkyfileObjectFromMetadata(md); - if (!object) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->uri, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->path_base, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->bg == 64.64) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->bg_stdev == 64.64) { - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - psMetadata *md; - stackRunRow *object; - - md = psMetadataAlloc(); - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "state", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "workdir", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "dvodb", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "skycell_id", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "tess_id", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - - object = stackRunObjectFromMetadata(md); - if (!object) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->state, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->workdir, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->dvodb, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->skycell_id, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->tess_id, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - psMetadata *md; - stackInputSkyfileRow *object; - - md = psMetadataAlloc(); - psFree(md); - exit(EXIT_FAILURE); - } - psFree(md); - exit(EXIT_FAILURE); - } - - object = stackInputSkyfileObjectFromMetadata(md); - if (!object) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - - psFree(object); - exit(EXIT_FAILURE); - } - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - psMetadata *md; - stackSumSkyfileRow *object; - - md = psMetadataAlloc(); - 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, "path_base", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddF64(md, PS_LIST_TAIL, "bg", 0, NULL, 64.64)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddF64(md, PS_LIST_TAIL, "bg_stdev", 0, NULL, 64.64)) { - psFree(md); - exit(EXIT_FAILURE); - } - - object = stackSumSkyfileObjectFromMetadata(md); - if (!object) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->uri, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->path_base, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->bg == 64.64) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->bg_stdev == 64.64) { psFree(object); exit(EXIT_FAILURE); Index: /trunk/ippdb/tests/selectrowsfits.c =================================================================== --- /trunk/ippdb/tests/selectrowsfits.c (revision 14168) +++ /trunk/ippdb/tests/selectrowsfits.c (revision 14169) @@ -285,26 +285,4 @@ } - if (!chipInputImfileSelectRowsFits(dbh, fits, NULL, 1)) { - exit(EXIT_FAILURE); - } - - psFree(fits); - psDBCleanup(dbh); - } - - { - psDB *dbh; - psFits *fits; - - dbh = psDBInit("localhost", "test", NULL, "test"); - if (!dbh) { - exit(EXIT_FAILURE); - } - - fits = psFitsOpen(TMP_FILENAME, "w"); - if (!fits) { - exit(EXIT_FAILURE); - } - if (!chipProcessedImfileSelectRowsFits(dbh, fits, NULL, 1)) { exit(EXIT_FAILURE);