Index: trunk/ippdb/src/ippdb.c =================================================================== --- trunk/ippdb/src/ippdb.c (revision 11030) +++ trunk/ippdb/src/ippdb.c (revision 11045) @@ -40,6 +40,5 @@ #define NEWEXP_TABLE_NAME "newExp" #define NEWIMFILE_TABLE_NAME "newImfile" -#define RAWDETRENDEXP_TABLE_NAME "rawDetrendExp" -#define RAWSCIENCEEXP_TABLE_NAME "rawScienceExp" +#define RAWEXP_TABLE_NAME "rawExp" #define RAWIMFILE_TABLE_NAME "rawImfile" #define P1PENDINGEXP_TABLE_NAME "p1PendingExp" @@ -2800,5 +2799,5 @@ static void newExpRowFree(newExpRow *object); -newExpRow *newExpRowAlloc(const char *exp_tag, const char *exp_id, const char *camera, const char *telescope, psTime* dateobs, const char *exp_type, psS32 imfiles, psS16 fault) +newExpRow *newExpRowAlloc(const char *exp_tag, const char *exp_id, const char *camera, const char *telescope, psTime* dateobs, const char *exp_type, psS32 imfiles) { newExpRow *_object; @@ -2814,5 +2813,4 @@ _object->exp_type = psStringCopy(exp_type); _object->imfiles = imfiles; - _object->fault = fault; return _object; @@ -2867,9 +2865,4 @@ return false; } - if (!psMetadataAdd(md, PS_LIST_TAIL, "fault", PS_DATA_S16, "NOT NULL", 0)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item fault"); - psFree(md); - return false; - } bool status = psDBCreateTable(dbh, NEWEXP_TABLE_NAME, md); @@ -2885,5 +2878,5 @@ } -bool newExpInsert(psDB * dbh, const char *exp_tag, const char *exp_id, const char *camera, const char *telescope, psTime* dateobs, const char *exp_type, psS32 imfiles, psS16 fault) +bool newExpInsert(psDB * dbh, const char *exp_tag, const char *exp_id, const char *camera, const char *telescope, psTime* dateobs, const char *exp_type, psS32 imfiles) { psMetadata *md = psMetadataAlloc(); @@ -2920,9 +2913,4 @@ if (!psMetadataAdd(md, PS_LIST_TAIL, "imfiles", PS_DATA_S32, NULL, imfiles)) { psError(PS_ERR_UNKNOWN, false, "failed to add item imfiles"); - 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; @@ -2951,5 +2939,5 @@ bool newExpInsertObject(psDB *dbh, newExpRow *object) { - return newExpInsert(dbh, object->exp_tag, object->exp_id, object->camera, object->telescope, object->dateobs, object->exp_type, object->imfiles, object->fault); + return newExpInsert(dbh, object->exp_tag, object->exp_id, object->camera, object->telescope, object->dateobs, object->exp_type, object->imfiles); } @@ -3059,9 +3047,4 @@ 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; - } @@ -3108,11 +3091,6 @@ return false; } - psS16 fault = psMetadataLookupS16(&status, md, "fault"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item fault"); - return false; - } - - return newExpRowAlloc(exp_tag, exp_id, camera, telescope, dateobs, exp_type, imfiles, fault); + + return newExpRowAlloc(exp_tag, exp_id, camera, telescope, dateobs, exp_type, imfiles); } psArray *newExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) @@ -3226,5 +3204,5 @@ static void newImfileRowFree(newImfileRow *object); -newImfileRow *newImfileRowAlloc(const char *exp_tag, const char *class, const char *class_id, const char *uri, psS16 fault) +newImfileRow *newImfileRowAlloc(const char *exp_tag, const char *class, const char *class_id, const char *uri) { newImfileRow *_object; @@ -3237,5 +3215,4 @@ _object->class_id = psStringCopy(class_id); _object->uri = psStringCopy(uri); - _object->fault = fault; return _object; @@ -3273,9 +3250,4 @@ return false; } - if (!psMetadataAdd(md, PS_LIST_TAIL, "fault", PS_DATA_S16, "NOT NULL", 0)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item fault"); - psFree(md); - return false; - } bool status = psDBCreateTable(dbh, NEWIMFILE_TABLE_NAME, md); @@ -3291,5 +3263,5 @@ } -bool newImfileInsert(psDB * dbh, const char *exp_tag, const char *class, const char *class_id, const char *uri, psS16 fault) +bool newImfileInsert(psDB * dbh, const char *exp_tag, const char *class, const char *class_id, const char *uri) { psMetadata *md = psMetadataAlloc(); @@ -3311,9 +3283,4 @@ if (!psMetadataAdd(md, PS_LIST_TAIL, "uri", PS_DATA_STRING, NULL, uri)) { psError(PS_ERR_UNKNOWN, false, "failed to add item uri"); - 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; @@ -3342,5 +3309,5 @@ bool newImfileInsertObject(psDB *dbh, newImfileRow *object) { - return newImfileInsert(dbh, object->exp_tag, object->class, object->class_id, object->uri, object->fault); + return newImfileInsert(dbh, object->exp_tag, object->class, object->class_id, object->uri); } @@ -3435,9 +3402,4 @@ 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; - } @@ -3469,11 +3431,6 @@ return false; } - psS16 fault = psMetadataLookupS16(&status, md, "fault"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item fault"); - return false; - } - - return newImfileRowAlloc(exp_tag, class, class_id, uri, fault); + + return newImfileRowAlloc(exp_tag, class, class_id, uri); } psArray *newImfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) @@ -3585,12 +3542,12 @@ return true; } -static void rawDetrendExpRowFree(rawDetrendExpRow *object); - -rawDetrendExpRow *rawDetrendExpRowAlloc(const char *exp_tag, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, const char *object, psTime* dateobs) -{ - rawDetrendExpRow *_object; - - _object = psAlloc(sizeof(rawDetrendExpRow)); - psMemSetDeallocator(_object, (psFreeFunc)rawDetrendExpRowFree); +static void rawExpRowFree(rawExpRow *object); + +rawExpRow *rawExpRowAlloc(const char *exp_tag, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, const char *object, psTime* dateobs, psS16 fault) +{ + rawExpRow *_object; + + _object = psAlloc(sizeof(rawExpRow)); + psMemSetDeallocator(_object, (psFreeFunc)rawExpRowFree); _object->exp_tag = psStringCopy(exp_tag); @@ -3613,9 +3570,10 @@ _object->object = psStringCopy(object); _object->dateobs = psTimeCopy(dateobs); + _object->fault = fault; return _object; } -static void rawDetrendExpRowFree(rawDetrendExpRow *object) +static void rawExpRowFree(rawExpRow *object) { psFree(object->exp_tag); @@ -3628,5 +3586,5 @@ } -bool rawDetrendExpCreateTable(psDB *dbh) +bool rawExpCreateTable(psDB *dbh) { psMetadata *md = psMetadataAlloc(); @@ -3726,6 +3684,11 @@ return false; } - - bool status = psDBCreateTable(dbh, RAWDETRENDEXP_TABLE_NAME, md); + if (!psMetadataAdd(md, PS_LIST_TAIL, "fault", PS_DATA_S16, "NOT NULL", 0)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item fault"); + psFree(md); + return false; + } + + bool status = psDBCreateTable(dbh, RAWEXP_TABLE_NAME, md); psFree(md); @@ -3734,10 +3697,10 @@ } -bool rawDetrendExpDropTable(psDB *dbh) -{ - return psDBDropTable(dbh, RAWDETRENDEXP_TABLE_NAME); -} - -bool rawDetrendExpInsert(psDB * dbh, const char *exp_tag, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, const char *object, psTime* dateobs) +bool rawExpDropTable(psDB *dbh) +{ + return psDBDropTable(dbh, RAWEXP_TABLE_NAME); +} + +bool rawExpInsert(psDB * dbh, const char *exp_tag, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, const char *object, psTime* dateobs, psS16 fault) { psMetadata *md = psMetadataAlloc(); @@ -3837,6 +3800,11 @@ return false; } - - bool status = psDBInsertOneRow(dbh, RAWDETRENDEXP_TABLE_NAME, md); + 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; + } + + bool status = psDBInsertOneRow(dbh, RAWEXP_TABLE_NAME, md); psFree(md); @@ -3844,11 +3812,11 @@ } -long long rawDetrendExpDelete(psDB *dbh, const psMetadata *where, unsigned long long limit) +long long rawExpDelete(psDB *dbh, const psMetadata *where, unsigned long long limit) { long long deleted = 0; - long long count = psDBDeleteRows(dbh, RAWDETRENDEXP_TABLE_NAME, where, limit); + long long count = psDBDeleteRows(dbh, RAWEXP_TABLE_NAME, where, limit); if (count < 0) { - psError(PS_ERR_UNKNOWN, true, "failed to delete row from rawDetrendExp"); + psError(PS_ERR_UNKNOWN, true, "failed to delete row from rawExp"); return count; @@ -3858,13 +3826,13 @@ return deleted; } -bool rawDetrendExpInsertObject(psDB *dbh, rawDetrendExpRow *object) -{ - return rawDetrendExpInsert(dbh, object->exp_tag, object->camera, object->telescope, object->exp_type, object->imfiles, object->filter, object->airmass, object->ra, object->decl, object->exp_time, object->bg, object->bg_stdev, object->bg_mean_stdev, object->alt, object->az, object->ccd_temp, object->posang, object->object, object->dateobs); -} - -bool rawDetrendExpInsertObjects(psDB *dbh, psArray *objects) +bool rawExpInsertObject(psDB *dbh, rawExpRow *object) +{ + return rawExpInsert(dbh, object->exp_tag, object->camera, object->telescope, object->exp_type, object->imfiles, object->filter, object->airmass, object->ra, object->decl, object->exp_time, object->bg, object->bg_stdev, object->bg_mean_stdev, object->alt, object->az, object->ccd_temp, object->posang, object->object, object->dateobs, object->fault); +} + +bool rawExpInsertObjects(psDB *dbh, psArray *objects) { for (long i = 0; i < psArrayLength(objects); i++) { - if (!rawDetrendExpInsertObject(dbh, objects->data[i])) { + if (!rawExpInsertObject(dbh, objects->data[i])) { return false; } @@ -3874,11 +3842,11 @@ } -bool rawDetrendExpInsertFits(psDB *dbh, const psFits *fits) +bool rawExpInsertFits(psDB *dbh, const psFits *fits) { psArray *rowSet; - // move to (the first?) extension named RAWDETRENDEXP_TABLE_NAME - if (!psFitsMoveExtName(fits, RAWDETRENDEXP_TABLE_NAME)) { - psError(PS_ERR_UNKNOWN, true, "failed to find FITS extension %s", RAWDETRENDEXP_TABLE_NAME); + // move to (the first?) extension named RAWEXP_TABLE_NAME + if (!psFitsMoveExtName(fits, RAWEXP_TABLE_NAME)) { + psError(PS_ERR_UNKNOWN, true, "failed to find FITS extension %s", RAWEXP_TABLE_NAME); return false; } @@ -3898,5 +3866,5 @@ } - if (!psDBInsertRows(dbh, RAWDETRENDEXP_TABLE_NAME, rowSet)) { + if (!psDBInsertRows(dbh, RAWEXP_TABLE_NAME, rowSet)) { psError(PS_ERR_UNKNOWN, false, "databse insert failed"); psFree(rowSet); @@ -3909,9 +3877,9 @@ } -bool rawDetrendExpSelectRowsFits(psDB *dbh, psFits *fits, const psMetadata *where, unsigned long long limit) +bool rawExpSelectRowsFits(psDB *dbh, psFits *fits, const psMetadata *where, unsigned long long limit) { psArray *rowSet; - rowSet = psDBSelectRows(dbh, RAWDETRENDEXP_TABLE_NAME, where, limit); + rowSet = psDBSelectRows(dbh, RAWEXP_TABLE_NAME, where, limit); if (!rowSet) { return false; @@ -3919,5 +3887,5 @@ // output to fits - if (!psFitsWriteTable(fits, NULL, rowSet, RAWDETRENDEXP_TABLE_NAME)) { + if (!psFitsWriteTable(fits, NULL, rowSet, RAWEXP_TABLE_NAME)) { psError(PS_ERR_UNKNOWN, false, "FITS table write failed"); psFree(rowSet); @@ -3930,5 +3898,5 @@ } -psMetadata *rawDetrendExpMetadataFromObject(const rawDetrendExpRow *object) +psMetadata *rawExpMetadataFromObject(const rawExpRow *object) { psMetadata *md = psMetadataAlloc(); @@ -4028,4 +3996,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; + } @@ -4033,5 +4006,5 @@ } -rawDetrendExpRow *rawDetrendExpObjectFromMetadata(psMetadata *md) +rawExpRow *rawExpObjectFromMetadata(psMetadata *md) { @@ -4132,8 +4105,13 @@ return false; } - - return rawDetrendExpRowAlloc(exp_tag, camera, telescope, exp_type, imfiles, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang, object, dateobs); -} -psArray *rawDetrendExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) + psS16 fault = psMetadataLookupS16(&status, md, "fault"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item fault"); + return false; + } + + return rawExpRowAlloc(exp_tag, camera, telescope, exp_type, imfiles, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang, object, dateobs, fault); +} +psArray *rawExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) { psArray *rowSet; @@ -4141,5 +4119,5 @@ psU64 i; - rowSet = psDBSelectRows(dbh, RAWDETRENDEXP_TABLE_NAME, where, limit); + rowSet = psDBSelectRows(dbh, RAWEXP_TABLE_NAME, where, limit); if (!rowSet) { return NULL; @@ -4151,5 +4129,5 @@ for (i = 0; i < rowSet->n; i++) { - rawDetrendExpRow *object = rawDetrendExpObjectFromMetadata(rowSet->data[i]); + rawExpRow *object = rawExpObjectFromMetadata(rowSet->data[i]); psArrayAdd(returnSet, 0, object); psFree(object); @@ -4160,11 +4138,11 @@ return returnSet; } -bool rawDetrendExpDeleteObject(psDB *dbh, const rawDetrendExpRow *object) -{ - psMetadata *where = rawDetrendExpMetadataFromObject(object); - long long count = psDBDeleteRows(dbh, RAWDETRENDEXP_TABLE_NAME, where, 0); +bool rawExpDeleteObject(psDB *dbh, const rawExpRow *object) +{ + psMetadata *where = rawExpMetadataFromObject(object); + long long count = psDBDeleteRows(dbh, RAWEXP_TABLE_NAME, where, 0); psFree(where) if (count < 0) { - psError(PS_ERR_UNKNOWN, true, "failed to delete row from rawDetrendExp"); + psError(PS_ERR_UNKNOWN, true, "failed to delete row from rawExp"); return false; } @@ -4172,21 +4150,21 @@ // 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, "rawDetrendExpRow object matched more then one row. Check your database schema"); - return false; - } - - return true; -} -long long rawDetrendExpDeleteRowObjects(psDB *dbh, const psArray *objects, unsigned long long limit) + psError(PS_ERR_UNKNOWN, true, "rawExpRow object matched more then one row. Check your database schema"); + return false; + } + + return true; +} +long long rawExpDeleteRowObjects(psDB *dbh, const psArray *objects, unsigned long long limit) { long long deleted = 0; for (long long i = 0; i < objects->n; i++) { - rawDetrendExpRow *object = objects->data[i]; - psMetadata *where = rawDetrendExpMetadataFromObject(object); - long long count = psDBDeleteRows(dbh, RAWDETRENDEXP_TABLE_NAME, where, limit); + rawExpRow *object = objects->data[i]; + psMetadata *where = rawExpMetadataFromObject(object); + long long count = psDBDeleteRows(dbh, RAWEXP_TABLE_NAME, where, limit); psFree(where) if (count < 0) { - psError(PS_ERR_UNKNOWN, true, "failed to delete row from rawDetrendExp"); + psError(PS_ERR_UNKNOWN, true, "failed to delete row from rawExp"); return count; } @@ -4197,5 +4175,5 @@ return deleted; } -bool rawDetrendExpPrintObjects(FILE *stream, psArray *objects, bool mdcf) +bool rawExpPrintObjects(FILE *stream, psArray *objects, bool mdcf) { PS_ASSERT_PTR_NON_NULL(objects, false); @@ -4203,9 +4181,9 @@ psMetadata *output = psMetadataAlloc(); for (long i = 0; i < psArrayLength(objects); i++) { - psMetadata *md = rawDetrendExpMetadataFromObject(objects->data[i]); + psMetadata *md = rawExpMetadataFromObject(objects->data[i]); if (!psMetadataAddMetadata( output, PS_LIST_TAIL, - RAWDETRENDEXP_TABLE_NAME, + RAWEXP_TABLE_NAME, PS_META_DUPLICATE_OK, NULL, @@ -4228,9 +4206,9 @@ return true; } -bool rawDetrendExpPrintObject(FILE *stream, rawDetrendExpRow *object, bool mdcf) +bool rawExpPrintObject(FILE *stream, rawExpRow *object, bool mdcf) { PS_ASSERT_PTR_NON_NULL(object, false); - psMetadata *md = rawDetrendExpMetadataFromObject(object); + psMetadata *md = rawExpMetadataFromObject(object); if (!ippdbPrintMetadataRaw(stream, md, mdcf)) { @@ -4243,665 +4221,7 @@ return true; } -static void rawScienceExpRowFree(rawScienceExpRow *object); - -rawScienceExpRow *rawScienceExpRowAlloc(const char *exp_tag, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, const char *object, psTime* dateobs) -{ - rawScienceExpRow *_object; - - _object = psAlloc(sizeof(rawScienceExpRow)); - psMemSetDeallocator(_object, (psFreeFunc)rawScienceExpRowFree); - - _object->exp_tag = psStringCopy(exp_tag); - _object->camera = psStringCopy(camera); - _object->telescope = psStringCopy(telescope); - _object->exp_type = psStringCopy(exp_type); - _object->imfiles = imfiles; - _object->filter = psStringCopy(filter); - _object->airmass = airmass; - _object->ra = ra; - _object->decl = decl; - _object->exp_time = exp_time; - _object->bg = bg; - _object->bg_stdev = bg_stdev; - _object->bg_mean_stdev = bg_mean_stdev; - _object->alt = alt; - _object->az = az; - _object->ccd_temp = ccd_temp; - _object->posang = posang; - _object->object = psStringCopy(object); - _object->dateobs = psTimeCopy(dateobs); - - return _object; -} - -static void rawScienceExpRowFree(rawScienceExpRow *object) -{ - psFree(object->exp_tag); - psFree(object->camera); - psFree(object->telescope); - psFree(object->exp_type); - psFree(object->filter); - psFree(object->object); - psFree(object->dateobs); -} - -bool rawScienceExpCreateTable(psDB *dbh) -{ - psMetadata *md = psMetadataAlloc(); - if (!psMetadataAdd(md, PS_LIST_TAIL, "exp_tag", PS_DATA_STRING, "Primary Key", "64")) { - psError(PS_ERR_UNKNOWN, false, "failed to add item exp_tag"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "camera", PS_DATA_STRING, NULL, "64")) { - psError(PS_ERR_UNKNOWN, false, "failed to add item camera"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "telescope", PS_DATA_STRING, NULL, "64")) { - psError(PS_ERR_UNKNOWN, false, "failed to add item telescope"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "exp_type", PS_DATA_STRING, NULL, "64")) { - psError(PS_ERR_UNKNOWN, false, "failed to add item exp_type"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "imfiles", PS_DATA_S32, NULL, 0)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item imfiles"); - 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"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "airmass", PS_DATA_F32, NULL, 0.0)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item airmass"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "ra", PS_DATA_F64, NULL, 0.0)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item ra"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "decl", PS_DATA_F64, NULL, 0.0)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item decl"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "exp_time", PS_DATA_F32, NULL, 0.0)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item exp_time"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "bg", PS_DATA_F64, NULL, 0.0)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item bg"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "bg_stdev", PS_DATA_F64, NULL, 0.0)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item bg_stdev"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "bg_mean_stdev", PS_DATA_F64, NULL, 0.0)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item bg_mean_stdev"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "alt", PS_DATA_F64, NULL, 0.0)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item alt"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "az", PS_DATA_F64, NULL, 0.0)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item az"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "ccd_temp", PS_DATA_F32, NULL, 0.0)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item ccd_temp"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "posang", PS_DATA_F64, NULL, 0.0)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item posang"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "object", PS_DATA_STRING, NULL, "64")) { - psError(PS_ERR_UNKNOWN, false, "failed to add item object"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "dateobs", PS_DATA_TIME, NULL, NULL)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item dateobs"); - psFree(md); - return false; - } - - bool status = psDBCreateTable(dbh, RAWSCIENCEEXP_TABLE_NAME, md); - - psFree(md); - - return status; -} - -bool rawScienceExpDropTable(psDB *dbh) -{ - return psDBDropTable(dbh, RAWSCIENCEEXP_TABLE_NAME); -} - -bool rawScienceExpInsert(psDB * dbh, const char *exp_tag, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, const char *object, psTime* dateobs) -{ - psMetadata *md = psMetadataAlloc(); - if (!psMetadataAdd(md, PS_LIST_TAIL, "exp_tag", PS_DATA_STRING, NULL, exp_tag)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item exp_tag"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "camera", PS_DATA_STRING, NULL, camera)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item camera"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "telescope", PS_DATA_STRING, NULL, telescope)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item telescope"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "exp_type", PS_DATA_STRING, NULL, exp_type)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item exp_type"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "imfiles", PS_DATA_S32, NULL, imfiles)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item imfiles"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "filter", PS_DATA_STRING, NULL, filter)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item filter"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "airmass", PS_DATA_F32, NULL, airmass)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item airmass"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "ra", PS_DATA_F64, NULL, ra)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item ra"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "decl", PS_DATA_F64, NULL, decl)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item decl"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "exp_time", PS_DATA_F32, NULL, exp_time)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item exp_time"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "bg", PS_DATA_F64, NULL, bg)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item bg"); - psFree(md); - return false; - } - 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, "bg_mean_stdev", PS_DATA_F64, NULL, bg_mean_stdev)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item bg_mean_stdev"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "alt", PS_DATA_F64, NULL, alt)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item alt"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "az", PS_DATA_F64, NULL, az)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item az"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "ccd_temp", PS_DATA_F32, NULL, ccd_temp)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item ccd_temp"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "posang", PS_DATA_F64, NULL, posang)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item posang"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "object", PS_DATA_STRING, NULL, object)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item object"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "dateobs", PS_DATA_TIME, NULL, dateobs)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item dateobs"); - psFree(md); - return false; - } - - bool status = psDBInsertOneRow(dbh, RAWSCIENCEEXP_TABLE_NAME, md); - psFree(md); - - return status; -} - -long long rawScienceExpDelete(psDB *dbh, const psMetadata *where, unsigned long long limit) -{ - long long deleted = 0; - - long long count = psDBDeleteRows(dbh, RAWSCIENCEEXP_TABLE_NAME, where, limit); - if (count < 0) { - psError(PS_ERR_UNKNOWN, true, "failed to delete row from rawScienceExp"); - return count; - - deleted += count; - } - - return deleted; -} -bool rawScienceExpInsertObject(psDB *dbh, rawScienceExpRow *object) -{ - return rawScienceExpInsert(dbh, object->exp_tag, object->camera, object->telescope, object->exp_type, object->imfiles, object->filter, object->airmass, object->ra, object->decl, object->exp_time, object->bg, object->bg_stdev, object->bg_mean_stdev, object->alt, object->az, object->ccd_temp, object->posang, object->object, object->dateobs); -} - -bool rawScienceExpInsertObjects(psDB *dbh, psArray *objects) -{ - for (long i = 0; i < psArrayLength(objects); i++) { - if (!rawScienceExpInsertObject(dbh, objects->data[i])) { - return false; - } - } - - return true; -} - -bool rawScienceExpInsertFits(psDB *dbh, const psFits *fits) -{ - psArray *rowSet; - - // move to (the first?) extension named RAWSCIENCEEXP_TABLE_NAME - if (!psFitsMoveExtName(fits, RAWSCIENCEEXP_TABLE_NAME)) { - psError(PS_ERR_UNKNOWN, true, "failed to find FITS extension %s", RAWSCIENCEEXP_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, RAWSCIENCEEXP_TABLE_NAME, rowSet)) { - psError(PS_ERR_UNKNOWN, false, "databse insert failed"); - psFree(rowSet); - return false; - } - - psFree(rowSet); - - return true; -} - -bool rawScienceExpSelectRowsFits(psDB *dbh, psFits *fits, const psMetadata *where, unsigned long long limit) -{ - psArray *rowSet; - - rowSet = psDBSelectRows(dbh, RAWSCIENCEEXP_TABLE_NAME, where, limit); - if (!rowSet) { - return false; - } - - // output to fits - if (!psFitsWriteTable(fits, NULL, rowSet, RAWSCIENCEEXP_TABLE_NAME)) { - psError(PS_ERR_UNKNOWN, false, "FITS table write failed"); - psFree(rowSet); - return false; - } - - psFree(rowSet); - - return true; -} - -psMetadata *rawScienceExpMetadataFromObject(const rawScienceExpRow *object) -{ - psMetadata *md = psMetadataAlloc(); - if (!psMetadataAdd(md, PS_LIST_TAIL, "exp_tag", PS_DATA_STRING, NULL, object->exp_tag)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item exp_tag"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "camera", PS_DATA_STRING, NULL, object->camera)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item camera"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "telescope", PS_DATA_STRING, NULL, object->telescope)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item telescope"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "exp_type", PS_DATA_STRING, NULL, object->exp_type)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item exp_type"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "imfiles", PS_DATA_S32, NULL, object->imfiles)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item imfiles"); - 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"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "airmass", PS_DATA_F32, NULL, object->airmass)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item airmass"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "ra", PS_DATA_F64, NULL, object->ra)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item ra"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "decl", PS_DATA_F64, NULL, object->decl)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item decl"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "exp_time", PS_DATA_F32, NULL, object->exp_time)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item exp_time"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "bg", PS_DATA_F64, NULL, object->bg)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item bg"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "bg_stdev", PS_DATA_F64, NULL, object->bg_stdev)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item bg_stdev"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "bg_mean_stdev", PS_DATA_F64, NULL, object->bg_mean_stdev)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item bg_mean_stdev"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "alt", PS_DATA_F64, NULL, object->alt)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item alt"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "az", PS_DATA_F64, NULL, object->az)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item az"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "ccd_temp", PS_DATA_F32, NULL, object->ccd_temp)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item ccd_temp"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "posang", PS_DATA_F64, NULL, object->posang)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item posang"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "object", PS_DATA_STRING, NULL, object->object)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item object"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "dateobs", PS_DATA_TIME, NULL, object->dateobs)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item dateobs"); - psFree(md); - return false; - } - - - return md; -} - -rawScienceExpRow *rawScienceExpObjectFromMetadata(psMetadata *md) -{ - -bool status = false; - char* exp_tag = psMetadataLookupPtr(&status, md, "exp_tag"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item exp_tag"); - return false; - } - char* camera = psMetadataLookupPtr(&status, md, "camera"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item camera"); - return false; - } - char* telescope = psMetadataLookupPtr(&status, md, "telescope"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item telescope"); - return false; - } - char* exp_type = psMetadataLookupPtr(&status, md, "exp_type"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item exp_type"); - return false; - } - psS32 imfiles = psMetadataLookupS32(&status, md, "imfiles"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item imfiles"); - return false; - } - char* filter = psMetadataLookupPtr(&status, md, "filter"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item filter"); - return false; - } - psF32 airmass = psMetadataLookupF32(&status, md, "airmass"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item airmass"); - return false; - } - psF64 ra = psMetadataLookupF64(&status, md, "ra"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item ra"); - return false; - } - psF64 decl = psMetadataLookupF64(&status, md, "decl"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item decl"); - return false; - } - psF32 exp_time = psMetadataLookupF32(&status, md, "exp_time"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item exp_time"); - return false; - } - psF64 bg = psMetadataLookupF64(&status, md, "bg"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item bg"); - return false; - } - psF64 bg_stdev = psMetadataLookupF64(&status, md, "bg_stdev"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item bg_stdev"); - return false; - } - psF64 bg_mean_stdev = psMetadataLookupF64(&status, md, "bg_mean_stdev"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item bg_mean_stdev"); - return false; - } - psF64 alt = psMetadataLookupF64(&status, md, "alt"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item alt"); - return false; - } - psF64 az = psMetadataLookupF64(&status, md, "az"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item az"); - return false; - } - psF32 ccd_temp = psMetadataLookupF32(&status, md, "ccd_temp"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item ccd_temp"); - return false; - } - psF64 posang = psMetadataLookupF64(&status, md, "posang"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item posang"); - return false; - } - char* object = psMetadataLookupPtr(&status, md, "object"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item object"); - return false; - } - psTime* dateobs = psMetadataLookupPtr(&status, md, "dateobs"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item dateobs"); - return false; - } - - return rawScienceExpRowAlloc(exp_tag, camera, telescope, exp_type, imfiles, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang, object, dateobs); -} -psArray *rawScienceExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) -{ - psArray *rowSet; - psArray *returnSet; - psU64 i; - - rowSet = psDBSelectRows(dbh, RAWSCIENCEEXP_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++) { - rawScienceExpRow *object = rawScienceExpObjectFromMetadata(rowSet->data[i]); - psArrayAdd(returnSet, 0, object); - psFree(object); - } - - psFree(rowSet); - - return returnSet; -} -bool rawScienceExpDeleteObject(psDB *dbh, const rawScienceExpRow *object) -{ - psMetadata *where = rawScienceExpMetadataFromObject(object); - long long count = psDBDeleteRows(dbh, RAWSCIENCEEXP_TABLE_NAME, where, 0); - psFree(where) - if (count < 0) { - psError(PS_ERR_UNKNOWN, true, "failed to delete row from rawScienceExp"); - 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, "rawScienceExpRow object matched more then one row. Check your database schema"); - return false; - } - - return true; -} -long long rawScienceExpDeleteRowObjects(psDB *dbh, const psArray *objects, unsigned long long limit) -{ - long long deleted = 0; - - for (long long i = 0; i < objects->n; i++) { - rawScienceExpRow *object = objects->data[i]; - psMetadata *where = rawScienceExpMetadataFromObject(object); - long long count = psDBDeleteRows(dbh, RAWSCIENCEEXP_TABLE_NAME, where, limit); - psFree(where) - if (count < 0) { - psError(PS_ERR_UNKNOWN, true, "failed to delete row from rawScienceExp"); - return count; - } - - deleted += count; - } - - return deleted; -} -bool rawScienceExpPrintObjects(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 = rawScienceExpMetadataFromObject(objects->data[i]); - if (!psMetadataAddMetadata( - output, - PS_LIST_TAIL, - RAWSCIENCEEXP_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 rawScienceExpPrintObject(FILE *stream, rawScienceExpRow *object, bool mdcf) -{ - PS_ASSERT_PTR_NON_NULL(object, false); - - psMetadata *md = rawScienceExpMetadataFromObject(object); - - if (!ippdbPrintMetadataRaw(stream, md, mdcf)) { - psError(PS_ERR_UNKNOWN, false, "failed to print metadata"); - psFree(md); - } - - psFree(md); - - return true; -} static void rawImfileRowFree(rawImfileRow *object); -rawImfileRow *rawImfileRowAlloc(const char *exp_tag, const char *class, const char *class_id, const char *uri, const char *exp_type, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, const char *object, psTime* dateobs) +rawImfileRow *rawImfileRowAlloc(const char *exp_tag, const char *class, const char *class_id, const char *uri, const char *exp_type, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, const char *object, psTime* dateobs, psS16 fault) { rawImfileRow *_object; @@ -4929,4 +4249,5 @@ _object->object = psStringCopy(object); _object->dateobs = psTimeCopy(dateobs); + _object->fault = fault; return _object; @@ -5043,4 +4364,9 @@ return false; } + if (!psMetadataAdd(md, PS_LIST_TAIL, "fault", PS_DATA_S16, "NOT NULL", 0)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item fault"); + psFree(md); + return false; + } bool status = psDBCreateTable(dbh, RAWIMFILE_TABLE_NAME, md); @@ -5056,5 +4382,5 @@ } -bool rawImfileInsert(psDB * dbh, const char *exp_tag, const char *class, const char *class_id, const char *uri, const char *exp_type, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, const char *object, psTime* dateobs) +bool rawImfileInsert(psDB * dbh, const char *exp_tag, const char *class, const char *class_id, const char *uri, const char *exp_type, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, const char *object, psTime* dateobs, psS16 fault) { psMetadata *md = psMetadataAlloc(); @@ -5151,4 +4477,9 @@ if (!psMetadataAdd(md, PS_LIST_TAIL, "dateobs", PS_DATA_TIME, NULL, dateobs)) { psError(PS_ERR_UNKNOWN, false, "failed to add item dateobs"); + 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; @@ -5177,5 +4508,5 @@ bool rawImfileInsertObject(psDB *dbh, rawImfileRow *object) { - return rawImfileInsert(dbh, object->exp_tag, object->class, object->class_id, object->uri, object->exp_type, object->filter, object->airmass, object->ra, object->decl, object->exp_time, object->bg, object->bg_stdev, object->bg_mean_stdev, object->alt, object->az, object->ccd_temp, object->posang, object->object, object->dateobs); + return rawImfileInsert(dbh, object->exp_tag, object->class, object->class_id, object->uri, object->exp_type, object->filter, object->airmass, object->ra, object->decl, object->exp_time, object->bg, object->bg_stdev, object->bg_mean_stdev, object->alt, object->az, object->ccd_temp, object->posang, object->object, object->dateobs, object->fault); } @@ -5345,4 +4676,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; + } @@ -5449,6 +4785,11 @@ return false; } - - return rawImfileRowAlloc(exp_tag, class, class_id, uri, exp_type, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang, object, dateobs); + psS16 fault = psMetadataLookupS16(&status, md, "fault"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item fault"); + return false; + } + + return rawImfileRowAlloc(exp_tag, class, class_id, uri, exp_type, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang, object, dateobs, fault); } psArray *rawImfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)