Index: /trunk/dbconfig/config.md =================================================================== --- /trunk/dbconfig/config.md (revision 11135) +++ /trunk/dbconfig/config.md (revision 11136) @@ -2,4 +2,4 @@ pkg_name STR ippdb pkg_namespace STR ippdb - pkg_version STR 0.0.75 + pkg_version STR 0.0.76 END Index: /trunk/ippdb/configure.ac =================================================================== --- /trunk/ippdb/configure.ac (revision 11135) +++ /trunk/ippdb/configure.ac (revision 11136) @@ -7,5 +7,5 @@ AC_PREREQ(2.59) -AC_INIT([ippdb], [0.0.75], [pan-starrs.ifa.hawaii.edu]) +AC_INIT([ippdb], [0.0.76], [pan-starrs.ifa.hawaii.edu]) AC_CONFIG_SRCDIR([ippdb.pc.in]) Index: /trunk/ippdb/src/ippdb.c =================================================================== --- /trunk/ippdb/src/ippdb.c (revision 11135) +++ /trunk/ippdb/src/ippdb.c (revision 11136) @@ -2799,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) +newExpRow *newExpRowAlloc(const char *exp_tag, const char *exp_id, const char *camera, const char *telescope, psTime* dateobs, const char *exp_type, psS32 imfiles, const char *workdir) { newExpRow *_object; @@ -2813,4 +2813,5 @@ _object->exp_type = psStringCopy(exp_type); _object->imfiles = imfiles; + _object->workdir = psStringCopy(workdir); return _object; @@ -2825,4 +2826,5 @@ psFree(object->dateobs); psFree(object->exp_type); + psFree(object->workdir); } @@ -2865,4 +2867,9 @@ return false; } + if (!psMetadataAdd(md, PS_LIST_TAIL, "workdir", PS_DATA_STRING, "destination for output files", "255")) { + psError(PS_ERR_UNKNOWN, false, "failed to add item workdir"); + psFree(md); + return false; + } bool status = psDBCreateTable(dbh, NEWEXP_TABLE_NAME, md); @@ -2878,5 +2885,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) +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, const char *workdir) { psMetadata *md = psMetadataAlloc(); @@ -2913,4 +2920,9 @@ 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, "workdir", PS_DATA_STRING, NULL, workdir)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item workdir"); psFree(md); return false; @@ -2939,5 +2951,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); + return newExpInsert(dbh, object->exp_tag, object->exp_id, object->camera, object->telescope, object->dateobs, object->exp_type, object->imfiles, object->workdir); } @@ -3047,4 +3059,9 @@ return false; } + if (!psMetadataAdd(md, PS_LIST_TAIL, "workdir", PS_DATA_STRING, NULL, object->workdir)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item workdir"); + psFree(md); + return false; + } @@ -3091,6 +3108,11 @@ return false; } - - return newExpRowAlloc(exp_tag, exp_id, camera, telescope, dateobs, exp_type, imfiles); + char* workdir = psMetadataLookupPtr(&status, md, "workdir"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item workdir"); + return false; + } + + return newExpRowAlloc(exp_tag, exp_id, camera, telescope, dateobs, exp_type, imfiles, workdir); } psArray *newExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) @@ -3544,5 +3566,5 @@ 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 *rawExpRowAlloc(const char *exp_tag, const char *exp_id, const char *camera, const char *telescope, psTime* dateobs, const char *exp_type, psS32 imfiles, const char *workdir, 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, psS16 fault) { rawExpRow *_object; @@ -3552,8 +3574,11 @@ _object->exp_tag = psStringCopy(exp_tag); + _object->exp_id = psStringCopy(exp_id); _object->camera = psStringCopy(camera); _object->telescope = psStringCopy(telescope); + _object->dateobs = psTimeCopy(dateobs); _object->exp_type = psStringCopy(exp_type); _object->imfiles = imfiles; + _object->workdir = psStringCopy(workdir); _object->filter = psStringCopy(filter); _object->airmass = airmass; @@ -3569,5 +3594,4 @@ _object->posang = posang; _object->object = psStringCopy(object); - _object->dateobs = psTimeCopy(dateobs); _object->fault = fault; @@ -3578,10 +3602,12 @@ { psFree(object->exp_tag); + psFree(object->exp_id); psFree(object->camera); psFree(object->telescope); + psFree(object->dateobs); psFree(object->exp_type); + psFree(object->workdir); psFree(object->filter); psFree(object->object); - psFree(object->dateobs); } @@ -3594,4 +3620,9 @@ return false; } + if (!psMetadataAdd(md, PS_LIST_TAIL, "exp_id", PS_DATA_STRING, "Key", "64")) { + psError(PS_ERR_UNKNOWN, false, "failed to add item exp_id"); + 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"); @@ -3604,4 +3635,9 @@ 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; + } if (!psMetadataAdd(md, PS_LIST_TAIL, "exp_type", PS_DATA_STRING, NULL, "64")) { psError(PS_ERR_UNKNOWN, false, "failed to add item exp_type"); @@ -3614,4 +3650,9 @@ return false; } + if (!psMetadataAdd(md, PS_LIST_TAIL, "workdir", PS_DATA_STRING, "destination for output files", "255")) { + psError(PS_ERR_UNKNOWN, false, "failed to add item workdir"); + 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"); @@ -3679,9 +3720,4 @@ 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; - } if (!psMetadataAdd(md, PS_LIST_TAIL, "fault", PS_DATA_S16, "NOT NULL", 0)) { psError(PS_ERR_UNKNOWN, false, "failed to add item fault"); @@ -3702,5 +3738,5 @@ } -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) +bool rawExpInsert(psDB * dbh, const char *exp_tag, const char *exp_id, const char *camera, const char *telescope, psTime* dateobs, const char *exp_type, psS32 imfiles, const char *workdir, 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, psS16 fault) { psMetadata *md = psMetadataAlloc(); @@ -3710,4 +3746,9 @@ return false; } + if (!psMetadataAdd(md, PS_LIST_TAIL, "exp_id", PS_DATA_STRING, NULL, exp_id)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item exp_id"); + 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"); @@ -3720,4 +3761,9 @@ 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; + } 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"); @@ -3730,4 +3776,9 @@ return false; } + 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, "filter", PS_DATA_STRING, NULL, filter)) { psError(PS_ERR_UNKNOWN, false, "failed to add item filter"); @@ -3792,9 +3843,4 @@ 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; @@ -3828,5 +3874,5 @@ 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); + return rawExpInsert(dbh, object->exp_tag, object->exp_id, object->camera, object->telescope, object->dateobs, object->exp_type, object->imfiles, object->workdir, 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->fault); } @@ -3906,4 +3952,9 @@ return false; } + if (!psMetadataAdd(md, PS_LIST_TAIL, "exp_id", PS_DATA_STRING, 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, "camera", PS_DATA_STRING, NULL, object->camera)) { psError(PS_ERR_UNKNOWN, false, "failed to add item camera"); @@ -3916,4 +3967,9 @@ 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; + } 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"); @@ -3926,4 +3982,9 @@ return false; } + if (!psMetadataAdd(md, PS_LIST_TAIL, "workdir", PS_DATA_STRING, NULL, object->workdir)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item workdir"); + 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"); @@ -3991,9 +4052,4 @@ 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; - } if (!psMetadataAdd(md, PS_LIST_TAIL, "fault", PS_DATA_S16, NULL, object->fault)) { psError(PS_ERR_UNKNOWN, false, "failed to add item fault"); @@ -4015,4 +4071,9 @@ return false; } + char* exp_id = psMetadataLookupPtr(&status, md, "exp_id"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item exp_id"); + return false; + } char* camera = psMetadataLookupPtr(&status, md, "camera"); if (!status) { @@ -4025,4 +4086,9 @@ return false; } + psTime* dateobs = psMetadataLookupPtr(&status, md, "dateobs"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item dateobs"); + return false; + } char* exp_type = psMetadataLookupPtr(&status, md, "exp_type"); if (!status) { @@ -4035,4 +4101,9 @@ return false; } + char* workdir = psMetadataLookupPtr(&status, md, "workdir"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item workdir"); + return false; + } char* filter = psMetadataLookupPtr(&status, md, "filter"); if (!status) { @@ -4100,9 +4171,4 @@ return false; } - psTime* dateobs = psMetadataLookupPtr(&status, md, "dateobs"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item dateobs"); - return false; - } psS16 fault = psMetadataLookupS16(&status, md, "fault"); if (!status) { @@ -4111,5 +4177,5 @@ } - 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); + return rawExpRowAlloc(exp_tag, exp_id, camera, telescope, dateobs, exp_type, imfiles, workdir, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang, object, fault); } psArray *rawExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) @@ -8311,5 +8377,5 @@ static void detRunRowFree(detRunRow *object); -detRunRow *detRunRowAlloc(psS32 det_id, psS32 iteration, const char *det_type, const char *mode, const char *state, const char *exp_type, const char *filter, psF32 airmass, psF32 exp_time, psF32 ccd_temp, psF64 posang, const char *object, psTime* registered, psTime* use_begin, psTime* use_end) +detRunRow *detRunRowAlloc(psS32 det_id, psS32 iteration, const char *det_type, const char *mode, const char *state, const char *exp_type, const char *workdir, const char *filter, psF32 airmass, psF32 exp_time, psF32 ccd_temp, psF64 posang, const char *object, psTime* registered, psTime* use_begin, psTime* use_end) { detRunRow *_object; @@ -8324,4 +8390,5 @@ _object->state = psStringCopy(state); _object->exp_type = psStringCopy(exp_type); + _object->workdir = psStringCopy(workdir); _object->filter = psStringCopy(filter); _object->airmass = airmass; @@ -8343,4 +8410,5 @@ psFree(object->state); psFree(object->exp_type); + psFree(object->workdir); psFree(object->filter); psFree(object->object); @@ -8383,4 +8451,9 @@ return false; } + if (!psMetadataAdd(md, PS_LIST_TAIL, "workdir", PS_DATA_STRING, "destination for output files", "255")) { + psError(PS_ERR_UNKNOWN, false, "failed to add item workdir"); + 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"); @@ -8441,5 +8514,5 @@ } -bool detRunInsert(psDB * dbh, psS32 det_id, psS32 iteration, const char *det_type, const char *mode, const char *state, const char *exp_type, const char *filter, psF32 airmass, psF32 exp_time, psF32 ccd_temp, psF64 posang, const char *object, psTime* registered, psTime* use_begin, psTime* use_end) +bool detRunInsert(psDB * dbh, psS32 det_id, psS32 iteration, const char *det_type, const char *mode, const char *state, const char *exp_type, const char *workdir, const char *filter, psF32 airmass, psF32 exp_time, psF32 ccd_temp, psF64 posang, const char *object, psTime* registered, psTime* use_begin, psTime* use_end) { psMetadata *md = psMetadataAlloc(); @@ -8471,4 +8544,9 @@ 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, "workdir", PS_DATA_STRING, NULL, workdir)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item workdir"); psFree(md); return false; @@ -8542,5 +8620,5 @@ bool detRunInsertObject(psDB *dbh, detRunRow *object) { - return detRunInsert(dbh, object->det_id, object->iteration, object->det_type, object->mode, object->state, object->exp_type, object->filter, object->airmass, object->exp_time, object->ccd_temp, object->posang, object->object, object->registered, object->use_begin, object->use_end); + return detRunInsert(dbh, object->det_id, object->iteration, object->det_type, object->mode, object->state, object->exp_type, object->workdir, object->filter, object->airmass, object->exp_time, object->ccd_temp, object->posang, object->object, object->registered, object->use_begin, object->use_end); } @@ -8645,4 +8723,9 @@ return false; } + if (!psMetadataAdd(md, PS_LIST_TAIL, "workdir", PS_DATA_STRING, NULL, object->workdir)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item workdir"); + 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"); @@ -8729,4 +8812,9 @@ return false; } + char* workdir = psMetadataLookupPtr(&status, md, "workdir"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item workdir"); + return false; + } char* filter = psMetadataLookupPtr(&status, md, "filter"); if (!status) { @@ -8775,5 +8863,5 @@ } - return detRunRowAlloc(det_id, iteration, det_type, mode, state, exp_type, filter, airmass, exp_time, ccd_temp, posang, object, registered, use_begin, use_end); + return detRunRowAlloc(det_id, iteration, det_type, mode, state, exp_type, workdir, filter, airmass, exp_time, ccd_temp, posang, object, registered, use_begin, use_end); } psArray *detRunSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) @@ -13266,5 +13354,5 @@ static void p4RunRowFree(p4RunRow *object); -p4RunRow *p4RunRowAlloc(psS32 p4_id, const char *survey_mode, const char *state, const char *filter, const char *skycell_id, const char *tess_id, psF64 ra, psF64 decl, const char *input_ss, const char *output_ss) +p4RunRow *p4RunRowAlloc(psS32 p4_id, const char *survey_mode, const char *state, const char *workdir, const char *filter, const char *skycell_id, const char *tess_id, psF64 ra, psF64 decl, const char *input_ss, const char *output_ss) { p4RunRow *_object; @@ -13276,4 +13364,5 @@ _object->survey_mode = psStringCopy(survey_mode); _object->state = psStringCopy(state); + _object->workdir = psStringCopy(workdir); _object->filter = psStringCopy(filter); _object->skycell_id = psStringCopy(skycell_id); @@ -13291,4 +13380,5 @@ psFree(object->survey_mode); psFree(object->state); + psFree(object->workdir); psFree(object->filter); psFree(object->skycell_id); @@ -13316,4 +13406,9 @@ return false; } + if (!psMetadataAdd(md, PS_LIST_TAIL, "workdir", PS_DATA_STRING, NULL, "255")) { + psError(PS_ERR_UNKNOWN, false, "failed to add item workdir"); + 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"); @@ -13364,5 +13459,5 @@ } -bool p4RunInsert(psDB * dbh, psS32 p4_id, const char *survey_mode, const char *state, const char *filter, const char *skycell_id, const char *tess_id, psF64 ra, psF64 decl, const char *input_ss, const char *output_ss) +bool p4RunInsert(psDB * dbh, psS32 p4_id, const char *survey_mode, const char *state, const char *workdir, const char *filter, const char *skycell_id, const char *tess_id, psF64 ra, psF64 decl, const char *input_ss, const char *output_ss) { psMetadata *md = psMetadataAlloc(); @@ -13379,4 +13474,9 @@ if (!psMetadataAdd(md, PS_LIST_TAIL, "state", PS_DATA_STRING, NULL, state)) { psError(PS_ERR_UNKNOWN, false, "failed to add item state"); + psFree(md); + return false; + } + 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; @@ -13440,5 +13540,5 @@ bool p4RunInsertObject(psDB *dbh, p4RunRow *object) { - return p4RunInsert(dbh, object->p4_id, object->survey_mode, object->state, object->filter, object->skycell_id, object->tess_id, object->ra, object->decl, object->input_ss, object->output_ss); + return p4RunInsert(dbh, object->p4_id, object->survey_mode, object->state, object->workdir, object->filter, object->skycell_id, object->tess_id, object->ra, object->decl, object->input_ss, object->output_ss); } @@ -13528,4 +13628,9 @@ return false; } + if (!psMetadataAdd(md, PS_LIST_TAIL, "workdir", PS_DATA_STRING, NULL, object->workdir)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item workdir"); + 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"); @@ -13587,4 +13692,9 @@ return false; } + char* workdir = psMetadataLookupPtr(&status, md, "workdir"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item workdir"); + return false; + } char* filter = psMetadataLookupPtr(&status, md, "filter"); if (!status) { @@ -13623,5 +13733,5 @@ } - return p4RunRowAlloc(p4_id, survey_mode, state, filter, skycell_id, tess_id, ra, decl, input_ss, output_ss); + return p4RunRowAlloc(p4_id, survey_mode, state, workdir, filter, skycell_id, tess_id, ra, decl, input_ss, output_ss); } psArray *p4RunSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) Index: /trunk/ippdb/src/ippdb.h =================================================================== --- /trunk/ippdb/src/ippdb.h (revision 11135) +++ /trunk/ippdb/src/ippdb.h (revision 11136) @@ -1590,4 +1590,5 @@ char *exp_type; psS32 imfiles; + char *workdir; } newExpRow; @@ -1604,5 +1605,6 @@ psTime* dateobs, const char *exp_type, - psS32 imfiles + psS32 imfiles, + const char *workdir ); @@ -1640,5 +1642,6 @@ psTime* dateobs, const char *exp_type, - psS32 imfiles + psS32 imfiles, + const char *workdir ); @@ -2001,8 +2004,11 @@ typedef struct { char *exp_tag; + char *exp_id; char *camera; char *telescope; + psTime* dateobs; char *exp_type; psS32 imfiles; + char *workdir; char *filter; psF32 airmass; @@ -2018,5 +2024,4 @@ psF64 posang; char *object; - psTime* dateobs; psS16 fault; } rawExpRow; @@ -2029,8 +2034,11 @@ rawExpRow *rawExpRowAlloc( const char *exp_tag, + const char *exp_id, const char *camera, const char *telescope, + psTime* dateobs, const char *exp_type, psS32 imfiles, + const char *workdir, const char *filter, psF32 airmass, @@ -2046,5 +2054,4 @@ psF64 posang, const char *object, - psTime* dateobs, psS16 fault ); @@ -2078,8 +2085,11 @@ psDB *dbh, ///< Database handle const char *exp_tag, + const char *exp_id, const char *camera, const char *telescope, + psTime* dateobs, const char *exp_type, psS32 imfiles, + const char *workdir, const char *filter, psF32 airmass, @@ -2095,5 +2105,4 @@ psF64 posang, const char *object, - psTime* dateobs, psS16 fault ); @@ -4397,4 +4406,5 @@ char *state; char *exp_type; + char *workdir; char *filter; psF32 airmass; @@ -4420,4 +4430,5 @@ const char *state, const char *exp_type, + const char *workdir, const char *filter, psF32 airmass, @@ -4464,4 +4475,5 @@ const char *state, const char *exp_type, + const char *workdir, const char *filter, psF32 airmass, @@ -6812,4 +6824,5 @@ char *survey_mode; char *state; + char *workdir; char *filter; char *skycell_id; @@ -6830,4 +6843,5 @@ const char *survey_mode, const char *state, + const char *workdir, const char *filter, const char *skycell_id, @@ -6869,4 +6883,5 @@ const char *survey_mode, const char *state, + const char *workdir, const char *filter, const char *skycell_id, Index: /trunk/ippdb/tests/alloc.c =================================================================== --- /trunk/ippdb/tests/alloc.c (revision 11135) +++ /trunk/ippdb/tests/alloc.c (revision 11136) @@ -244,5 +244,5 @@ newExpRow *object; - object = newExpRowAlloc("a string", "a string", "a string", "a string", "0001-01-01T00:00:00Z", "a string", -32 ); + object = newExpRowAlloc("a string", "a string", "a string", "a string", "0001-01-01T00:00:00Z", "a string", -32, "a string" ); if (!object) { @@ -277,4 +277,8 @@ exit(EXIT_FAILURE); } + if (strncmp(object->workdir, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } psFree(object); @@ -313,11 +317,15 @@ rawExpRow *object; - object = rawExpRowAlloc("a string", "a string", "a string", "a string", -32, "a string", 32.32, 64.64, 64.64, 32.32, 64.64, 64.64, 64.64, 64.64, 64.64, 32.32, 64.64, "a string", "0001-01-01T00:00:00Z", -16 ); - - if (!object) { - exit(EXIT_FAILURE); - } - - if (strncmp(object->exp_tag, "a string", MAX_STRING_LENGTH)) { + object = rawExpRowAlloc("a string", "a string", "a string", "a string", "0001-01-01T00:00:00Z", "a string", -32, "a string", "a string", 32.32, 64.64, 64.64, 32.32, 64.64, 64.64, 64.64, 64.64, 64.64, 32.32, 64.64, "a string", -16 ); + + if (!object) { + exit(EXIT_FAILURE); + } + + if (strncmp(object->exp_tag, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->exp_id, "a string", MAX_STRING_LENGTH)) { psFree(object); exit(EXIT_FAILURE); @@ -331,4 +339,7 @@ exit(EXIT_FAILURE); } + psFree(object); + exit(EXIT_FAILURE); + } if (strncmp(object->exp_type, "a string", MAX_STRING_LENGTH)) { psFree(object); @@ -339,4 +350,8 @@ exit(EXIT_FAILURE); } + if (strncmp(object->workdir, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } if (strncmp(object->filter, "a string", MAX_STRING_LENGTH)) { psFree(object); @@ -394,7 +409,4 @@ exit(EXIT_FAILURE); } - psFree(object); - exit(EXIT_FAILURE); - } psFree(object); @@ -822,5 +834,5 @@ detRunRow *object; - object = detRunRowAlloc(-32, -32, "a string", "a string", "a string", "a string", "a string", 32.32, 32.32, 32.32, 64.64, "a string", "0001-01-01T00:00:00Z", "0001-01-01T00:00:00Z", "0001-01-01T00:00:00Z" ); + object = detRunRowAlloc(-32, -32, "a string", "a string", "a string", "a string", "a string", "a string", 32.32, 32.32, 32.32, 64.64, "a string", "0001-01-01T00:00:00Z", "0001-01-01T00:00:00Z", "0001-01-01T00:00:00Z" ); if (!object) { @@ -852,4 +864,8 @@ exit(EXIT_FAILURE); } + if (strncmp(object->workdir, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } if (strncmp(object->filter, "a string", MAX_STRING_LENGTH)) { psFree(object); @@ -1361,5 +1377,5 @@ p4RunRow *object; - object = p4RunRowAlloc(-32, "a string", "a string", "a string", "a string", "a string", 64.64, 64.64, "a string", "a string" ); + object = p4RunRowAlloc(-32, "a string", "a string", "a string", "a string", "a string", "a string", 64.64, 64.64, "a string", "a string" ); if (!object) { @@ -1376,4 +1392,8 @@ } 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); Index: /trunk/ippdb/tests/insert.c =================================================================== --- /trunk/ippdb/tests/insert.c (revision 11135) +++ /trunk/ippdb/tests/insert.c (revision 11136) @@ -118,5 +118,5 @@ } - if (!newExpInsert(dbh, "a string", "a string", "a string", "a string", "0001-01-01T00:00:00Z", "a string", -32)) { + if (!newExpInsert(dbh, "a string", "a string", "a string", "a string", "0001-01-01T00:00:00Z", "a string", -32, "a string")) { exit(EXIT_FAILURE); } @@ -148,5 +148,5 @@ } - if (!rawExpInsert(dbh, "a string", "a string", "a string", "a string", -32, "a string", 32.32, 64.64, 64.64, 32.32, 64.64, 64.64, 64.64, 64.64, 64.64, 32.32, 64.64, "a string", "0001-01-01T00:00:00Z", -16)) { + if (!rawExpInsert(dbh, "a string", "a string", "a string", "a string", "0001-01-01T00:00:00Z", "a string", -32, "a string", "a string", 32.32, 64.64, 64.64, 32.32, 64.64, 64.64, 64.64, 64.64, 64.64, 32.32, 64.64, "a string", -16)) { exit(EXIT_FAILURE); } @@ -313,5 +313,5 @@ } - if (!detRunInsert(dbh, -32, -32, "a string", "a string", "a string", "a string", "a string", 32.32, 32.32, 32.32, 64.64, "a string", "0001-01-01T00:00:00Z", "0001-01-01T00:00:00Z", "0001-01-01T00:00:00Z")) { + if (!detRunInsert(dbh, -32, -32, "a string", "a string", "a string", "a string", "a string", "a string", 32.32, 32.32, 32.32, 64.64, "a string", "0001-01-01T00:00:00Z", "0001-01-01T00:00:00Z", "0001-01-01T00:00:00Z")) { exit(EXIT_FAILURE); } @@ -478,5 +478,5 @@ } - if (!p4RunInsert(dbh, -32, "a string", "a string", "a string", "a string", "a string", 64.64, 64.64, "a string", "a string")) { + if (!p4RunInsert(dbh, -32, "a string", "a string", "a string", "a string", "a string", "a string", 64.64, 64.64, "a string", "a string")) { exit(EXIT_FAILURE); } Index: /trunk/ippdb/tests/insertobject.c =================================================================== --- /trunk/ippdb/tests/insertobject.c (revision 11135) +++ /trunk/ippdb/tests/insertobject.c (revision 11136) @@ -168,5 +168,5 @@ } - object = newExpRowAlloc("a string", "a string", "a string", "a string", "0001-01-01T00:00:00Z", "a string", -32); + object = newExpRowAlloc("a string", "a string", "a string", "a string", "0001-01-01T00:00:00Z", "a string", -32, "a string"); if (!object) { exit(EXIT_FAILURE); @@ -212,5 +212,5 @@ } - object = rawExpRowAlloc("a string", "a string", "a string", "a string", -32, "a string", 32.32, 64.64, 64.64, 32.32, 64.64, 64.64, 64.64, 64.64, 64.64, 32.32, 64.64, "a string", "0001-01-01T00:00:00Z", -16); + object = rawExpRowAlloc("a string", "a string", "a string", "a string", "0001-01-01T00:00:00Z", "a string", -32, "a string", "a string", 32.32, 64.64, 64.64, 32.32, 64.64, 64.64, 64.64, 64.64, 64.64, 32.32, 64.64, "a string", -16); if (!object) { exit(EXIT_FAILURE); @@ -454,5 +454,5 @@ } - object = detRunRowAlloc(-32, -32, "a string", "a string", "a string", "a string", "a string", 32.32, 32.32, 32.32, 64.64, "a string", "0001-01-01T00:00:00Z", "0001-01-01T00:00:00Z", "0001-01-01T00:00:00Z"); + object = detRunRowAlloc(-32, -32, "a string", "a string", "a string", "a string", "a string", "a string", 32.32, 32.32, 32.32, 64.64, "a string", "0001-01-01T00:00:00Z", "0001-01-01T00:00:00Z", "0001-01-01T00:00:00Z"); if (!object) { exit(EXIT_FAILURE); @@ -696,5 +696,5 @@ } - object = p4RunRowAlloc(-32, "a string", "a string", "a string", "a string", "a string", 64.64, 64.64, "a string", "a string"); + object = p4RunRowAlloc(-32, "a string", "a string", "a string", "a string", "a string", "a string", 64.64, 64.64, "a string", "a string"); if (!object) { exit(EXIT_FAILURE); Index: /trunk/ippdb/tests/metadatafromobject.c =================================================================== --- /trunk/ippdb/tests/metadatafromobject.c (revision 11135) +++ /trunk/ippdb/tests/metadatafromobject.c (revision 11136) @@ -302,5 +302,5 @@ bool status; - object = newExpRowAlloc("a string", "a string", "a string", "a string", "0001-01-01T00:00:00Z", "a string", -32); + object = newExpRowAlloc("a string", "a string", "a string", "a string", "0001-01-01T00:00:00Z", "a string", -32, "a string"); if (!object) { exit(EXIT_FAILURE); @@ -341,4 +341,8 @@ exit(EXIT_FAILURE); } + if (strncmp(psMetadataLookupPtr(&status, md, "workdir"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } psFree(md); @@ -387,5 +391,5 @@ bool status; - object = rawExpRowAlloc("a string", "a string", "a string", "a string", -32, "a string", 32.32, 64.64, 64.64, 32.32, 64.64, 64.64, 64.64, 64.64, 64.64, 32.32, 64.64, "a string", "0001-01-01T00:00:00Z", -16); + object = rawExpRowAlloc("a string", "a string", "a string", "a string", "0001-01-01T00:00:00Z", "a string", -32, "a string", "a string", 32.32, 64.64, 64.64, 32.32, 64.64, 64.64, 64.64, 64.64, 64.64, 32.32, 64.64, "a string", -16); if (!object) { exit(EXIT_FAILURE); @@ -403,4 +407,8 @@ exit(EXIT_FAILURE); } + if (strncmp(psMetadataLookupPtr(&status, md, "exp_id"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } if (strncmp(psMetadataLookupPtr(&status, md, "camera"), "a string", MAX_STRING_LENGTH)) { psFree(md); @@ -411,4 +419,7 @@ exit(EXIT_FAILURE); } + psFree(md); + exit(EXIT_FAILURE); + } if (strncmp(psMetadataLookupPtr(&status, md, "exp_type"), "a string", MAX_STRING_LENGTH)) { psFree(md); @@ -419,4 +430,8 @@ exit(EXIT_FAILURE); } + if (strncmp(psMetadataLookupPtr(&status, md, "workdir"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } if (strncmp(psMetadataLookupPtr(&status, md, "filter"), "a string", MAX_STRING_LENGTH)) { psFree(md); @@ -474,7 +489,4 @@ exit(EXIT_FAILURE); } - psFree(md); - exit(EXIT_FAILURE); - } psFree(md); @@ -984,5 +996,5 @@ bool status; - object = detRunRowAlloc(-32, -32, "a string", "a string", "a string", "a string", "a string", 32.32, 32.32, 32.32, 64.64, "a string", "0001-01-01T00:00:00Z", "0001-01-01T00:00:00Z", "0001-01-01T00:00:00Z"); + object = detRunRowAlloc(-32, -32, "a string", "a string", "a string", "a string", "a string", "a string", 32.32, 32.32, 32.32, 64.64, "a string", "0001-01-01T00:00:00Z", "0001-01-01T00:00:00Z", "0001-01-01T00:00:00Z"); if (!object) { exit(EXIT_FAILURE); @@ -1020,4 +1032,8 @@ exit(EXIT_FAILURE); } + if (strncmp(psMetadataLookupPtr(&status, md, "workdir"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } if (strncmp(psMetadataLookupPtr(&status, md, "filter"), "a string", MAX_STRING_LENGTH)) { psFree(md); @@ -1611,5 +1627,5 @@ bool status; - object = p4RunRowAlloc(-32, "a string", "a string", "a string", "a string", "a string", 64.64, 64.64, "a string", "a string"); + object = p4RunRowAlloc(-32, "a string", "a string", "a string", "a string", "a string", "a string", 64.64, 64.64, "a string", "a string"); if (!object) { exit(EXIT_FAILURE); @@ -1632,4 +1648,8 @@ } 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); Index: /trunk/ippdb/tests/objectfrommetadata.c =================================================================== --- /trunk/ippdb/tests/objectfrommetadata.c (revision 11135) +++ /trunk/ippdb/tests/objectfrommetadata.c (revision 11136) @@ -450,4 +450,8 @@ exit(EXIT_FAILURE); } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "workdir", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } object = newExpObjectFromMetadata(md); @@ -486,4 +490,8 @@ exit(EXIT_FAILURE); } + if (strncmp(object->workdir, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } psFree(object); @@ -549,4 +557,8 @@ exit(EXIT_FAILURE); } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "exp_id", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } if (!psMetadataAddStr(md, PS_LIST_TAIL, "camera", 0, NULL, "a string")) { psFree(md); @@ -557,4 +569,7 @@ exit(EXIT_FAILURE); } + psFree(md); + exit(EXIT_FAILURE); + } if (!psMetadataAddStr(md, PS_LIST_TAIL, "exp_type", 0, NULL, "a string")) { psFree(md); @@ -565,4 +580,8 @@ 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, "filter", 0, NULL, "a string")) { psFree(md); @@ -620,7 +639,4 @@ exit(EXIT_FAILURE); } - psFree(md); - exit(EXIT_FAILURE); - } object = rawExpObjectFromMetadata(md); @@ -636,4 +652,8 @@ exit(EXIT_FAILURE); } + if (strncmp(object->exp_id, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } if (strncmp(object->camera, "a string", MAX_STRING_LENGTH)) { psFree(object); @@ -644,4 +664,7 @@ exit(EXIT_FAILURE); } + psFree(object); + exit(EXIT_FAILURE); + } if (strncmp(object->exp_type, "a string", MAX_STRING_LENGTH)) { psFree(object); @@ -652,4 +675,8 @@ exit(EXIT_FAILURE); } + if (strncmp(object->workdir, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } if (strncmp(object->filter, "a string", MAX_STRING_LENGTH)) { psFree(object); @@ -707,7 +734,4 @@ exit(EXIT_FAILURE); } - psFree(object); - exit(EXIT_FAILURE); - } psFree(object); @@ -1499,4 +1523,8 @@ 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, "filter", 0, NULL, "a string")) { psFree(md); @@ -1565,4 +1593,8 @@ exit(EXIT_FAILURE); } + if (strncmp(object->workdir, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } if (strncmp(object->filter, "a string", MAX_STRING_LENGTH)) { psFree(object); @@ -2477,4 +2509,8 @@ 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, "filter", 0, NULL, "a string")) { psFree(md); @@ -2523,4 +2559,8 @@ } 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);