Index: /trunk/ippdb/configure.ac =================================================================== --- /trunk/ippdb/configure.ac (revision 12201) +++ /trunk/ippdb/configure.ac (revision 12202) @@ -7,5 +7,5 @@ AC_PREREQ(2.59) -AC_INIT([ippdb], [1.1.14], [pan-starrs.ifa.hawaii.edu]) +AC_INIT([ippdb], [1.1.15], [pan-starrs.ifa.hawaii.edu]) AC_CONFIG_SRCDIR([ippdb.pc.in]) Index: /trunk/ippdb/src/ippdb.c =================================================================== --- /trunk/ippdb/src/ippdb.c (revision 12201) +++ /trunk/ippdb/src/ippdb.c (revision 12202) @@ -5671,5 +5671,5 @@ static void chipPendingImfileRowFree(chipPendingImfileRow *object); -chipPendingImfileRow *chipPendingImfileRowAlloc(psS64 chip_id, const char *exp_tag, psS64 guide_id, const char *class_id, const char *recipe, const char *uri) +chipPendingImfileRow *chipPendingImfileRowAlloc(psS64 chip_id, const char *class_id, const char *uri) { chipPendingImfileRow *_object; @@ -5679,8 +5679,5 @@ _object->chip_id = chip_id; - _object->exp_tag = psStringCopy(exp_tag); - _object->guide_id = guide_id; _object->class_id = psStringCopy(class_id); - _object->recipe = psStringCopy(recipe); _object->uri = psStringCopy(uri); @@ -5690,7 +5687,5 @@ static void chipPendingImfileRowFree(chipPendingImfileRow *object) { - psFree(object->exp_tag); psFree(object->class_id); - psFree(object->recipe); psFree(object->uri); } @@ -5704,14 +5699,4 @@ return false; } - 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, "guide_id", PS_DATA_S64, "Not NULL", 0)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item guide_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"); @@ -5719,9 +5704,4 @@ return false; } - if (!psMetadataAdd(md, PS_LIST_TAIL, "recipe", PS_DATA_STRING, NULL, "64")) { - psError(PS_ERR_UNKNOWN, false, "failed to add item recipe"); - psFree(md); - return false; - } if (!psMetadataAdd(md, PS_LIST_TAIL, "uri", PS_DATA_STRING, NULL, "255")) { psError(PS_ERR_UNKNOWN, false, "failed to add item uri"); @@ -5742,5 +5722,5 @@ } -bool chipPendingImfileInsert(psDB * dbh, psS64 chip_id, const char *exp_tag, psS64 guide_id, const char *class_id, const char *recipe, const char *uri) +bool chipPendingImfileInsert(psDB * dbh, psS64 chip_id, const char *class_id, const char *uri) { psMetadata *md = psMetadataAlloc(); @@ -5750,21 +5730,6 @@ return false; } - 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, "guide_id", PS_DATA_S64, NULL, guide_id)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item guide_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; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "recipe", PS_DATA_STRING, NULL, recipe)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item recipe"); psFree(md); return false; @@ -5798,5 +5763,5 @@ bool chipPendingImfileInsertObject(psDB *dbh, chipPendingImfileRow *object) { - return chipPendingImfileInsert(dbh, object->chip_id, object->exp_tag, object->guide_id, object->class_id, object->recipe, object->uri); + return chipPendingImfileInsert(dbh, object->chip_id, object->class_id, object->uri); } @@ -5876,14 +5841,4 @@ return false; } - 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, "guide_id", PS_DATA_S64, NULL, object->guide_id)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item guide_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"); @@ -5891,9 +5846,4 @@ return false; } - if (!psMetadataAdd(md, PS_LIST_TAIL, "recipe", PS_DATA_STRING, NULL, object->recipe)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item recipe"); - psFree(md); - return false; - } if (!psMetadataAdd(md, PS_LIST_TAIL, "uri", PS_DATA_STRING, NULL, object->uri)) { psError(PS_ERR_UNKNOWN, false, "failed to add item uri"); @@ -5915,14 +5865,4 @@ return 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; - } - psS64 guide_id = psMetadataLookupS64(&status, md, "guide_id"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item guide_id"); - return false; - } char* class_id = psMetadataLookupPtr(&status, md, "class_id"); if (!status) { @@ -5930,9 +5870,4 @@ return false; } - char* recipe = psMetadataLookupPtr(&status, md, "recipe"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item recipe"); - return false; - } char* uri = psMetadataLookupPtr(&status, md, "uri"); if (!status) { @@ -5941,5 +5876,5 @@ } - return chipPendingImfileRowAlloc(chip_id, exp_tag, guide_id, class_id, recipe, uri); + return chipPendingImfileRowAlloc(chip_id, class_id, uri); } psArray *chipPendingImfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) @@ -6053,5 +5988,5 @@ static void chipProcessedExpRowFree(chipProcessedExpRow *object); -chipProcessedExpRow *chipProcessedExpRowAlloc(psS64 chip_id, const char *exp_tag, psS64 guide_id, const char *label, const char *expgroup, const char *dvodb) +chipProcessedExpRow *chipProcessedExpRowAlloc(psS64 chip_id, const char *exp_tag, psS64 guide_id, const char *label, const char *recipe, const char *expgroup, const char *dvodb) { chipProcessedExpRow *_object; @@ -6064,4 +5999,5 @@ _object->guide_id = guide_id; _object->label = psStringCopy(label); + _object->recipe = psStringCopy(recipe); _object->expgroup = psStringCopy(expgroup); _object->dvodb = psStringCopy(dvodb); @@ -6074,4 +6010,5 @@ psFree(object->exp_tag); psFree(object->label); + psFree(object->recipe); psFree(object->expgroup); psFree(object->dvodb); @@ -6101,4 +6038,9 @@ return false; } + if (!psMetadataAdd(md, PS_LIST_TAIL, "recipe", PS_DATA_STRING, NULL, "64")) { + psError(PS_ERR_UNKNOWN, false, "failed to add item recipe"); + psFree(md); + return false; + } if (!psMetadataAdd(md, PS_LIST_TAIL, "expgroup", PS_DATA_STRING, "key", "64")) { psError(PS_ERR_UNKNOWN, false, "failed to add item expgroup"); @@ -6124,5 +6066,5 @@ } -bool chipProcessedExpInsert(psDB * dbh, psS64 chip_id, const char *exp_tag, psS64 guide_id, const char *label, const char *expgroup, const char *dvodb) +bool chipProcessedExpInsert(psDB * dbh, psS64 chip_id, const char *exp_tag, psS64 guide_id, const char *label, const char *recipe, const char *expgroup, const char *dvodb) { psMetadata *md = psMetadataAlloc(); @@ -6144,4 +6086,9 @@ if (!psMetadataAdd(md, PS_LIST_TAIL, "label", PS_DATA_STRING, NULL, label)) { psError(PS_ERR_UNKNOWN, false, "failed to add item label"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "recipe", PS_DATA_STRING, NULL, recipe)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item recipe"); psFree(md); return false; @@ -6180,5 +6127,5 @@ bool chipProcessedExpInsertObject(psDB *dbh, chipProcessedExpRow *object) { - return chipProcessedExpInsert(dbh, object->chip_id, object->exp_tag, object->guide_id, object->label, object->expgroup, object->dvodb); + return chipProcessedExpInsert(dbh, object->chip_id, object->exp_tag, object->guide_id, object->label, object->recipe, object->expgroup, object->dvodb); } @@ -6273,4 +6220,9 @@ return false; } + if (!psMetadataAdd(md, PS_LIST_TAIL, "recipe", PS_DATA_STRING, NULL, object->recipe)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item recipe"); + psFree(md); + return false; + } if (!psMetadataAdd(md, PS_LIST_TAIL, "expgroup", PS_DATA_STRING, NULL, object->expgroup)) { psError(PS_ERR_UNKNOWN, false, "failed to add item expgroup"); @@ -6312,4 +6264,9 @@ return false; } + char* recipe = psMetadataLookupPtr(&status, md, "recipe"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item recipe"); + return false; + } char* expgroup = psMetadataLookupPtr(&status, md, "expgroup"); if (!status) { @@ -6323,5 +6280,5 @@ } - return chipProcessedExpRowAlloc(chip_id, exp_tag, guide_id, label, expgroup, dvodb); + return chipProcessedExpRowAlloc(chip_id, exp_tag, guide_id, label, recipe, expgroup, dvodb); } psArray *chipProcessedExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) @@ -6709,5 +6666,5 @@ static void chipProcessedImfileRowFree(chipProcessedImfileRow *object); -chipProcessedImfileRow *chipProcessedImfileRowAlloc(psS64 chip_id, const char *exp_tag, psS64 guide_id, const char *class_id, const char *recipe, const char *uri, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, const char *path_base, psS16 fault) +chipProcessedImfileRow *chipProcessedImfileRowAlloc(psS64 chip_id, const char *class_id, const char *uri, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, const char *path_base, psS16 fault) { chipProcessedImfileRow *_object; @@ -6717,8 +6674,5 @@ _object->chip_id = chip_id; - _object->exp_tag = psStringCopy(exp_tag); - _object->guide_id = guide_id; _object->class_id = psStringCopy(class_id); - _object->recipe = psStringCopy(recipe); _object->uri = psStringCopy(uri); _object->bg = bg; @@ -6733,7 +6687,5 @@ static void chipProcessedImfileRowFree(chipProcessedImfileRow *object) { - psFree(object->exp_tag); psFree(object->class_id); - psFree(object->recipe); psFree(object->uri); psFree(object->path_base); @@ -6748,14 +6700,4 @@ return false; } - 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, "guide_id", PS_DATA_S64, "Not NULL", 0)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item guide_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"); @@ -6763,9 +6705,4 @@ return false; } - if (!psMetadataAdd(md, PS_LIST_TAIL, "recipe", PS_DATA_STRING, NULL, "64")) { - psError(PS_ERR_UNKNOWN, false, "failed to add item recipe"); - psFree(md); - return false; - } if (!psMetadataAdd(md, PS_LIST_TAIL, "uri", PS_DATA_STRING, NULL, "255")) { psError(PS_ERR_UNKNOWN, false, "failed to add item uri"); @@ -6811,5 +6748,5 @@ } -bool chipProcessedImfileInsert(psDB * dbh, psS64 chip_id, const char *exp_tag, psS64 guide_id, const char *class_id, const char *recipe, const char *uri, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, const char *path_base, psS16 fault) +bool chipProcessedImfileInsert(psDB * dbh, psS64 chip_id, const char *class_id, const char *uri, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, const char *path_base, psS16 fault) { psMetadata *md = psMetadataAlloc(); @@ -6819,21 +6756,6 @@ return false; } - 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, "guide_id", PS_DATA_S64, NULL, guide_id)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item guide_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; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "recipe", PS_DATA_STRING, NULL, recipe)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item recipe"); psFree(md); return false; @@ -6892,5 +6814,5 @@ bool chipProcessedImfileInsertObject(psDB *dbh, chipProcessedImfileRow *object) { - return chipProcessedImfileInsert(dbh, object->chip_id, object->exp_tag, object->guide_id, object->class_id, object->recipe, object->uri, object->bg, object->bg_stdev, object->bg_mean_stdev, object->path_base, object->fault); + return chipProcessedImfileInsert(dbh, object->chip_id, object->class_id, object->uri, object->bg, object->bg_stdev, object->bg_mean_stdev, object->path_base, object->fault); } @@ -6970,14 +6892,4 @@ return false; } - 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, "guide_id", PS_DATA_S64, NULL, object->guide_id)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item guide_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"); @@ -6985,9 +6897,4 @@ return false; } - if (!psMetadataAdd(md, PS_LIST_TAIL, "recipe", PS_DATA_STRING, NULL, object->recipe)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item recipe"); - psFree(md); - return false; - } if (!psMetadataAdd(md, PS_LIST_TAIL, "uri", PS_DATA_STRING, NULL, object->uri)) { psError(PS_ERR_UNKNOWN, false, "failed to add item uri"); @@ -7034,14 +6941,4 @@ return 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; - } - psS64 guide_id = psMetadataLookupS64(&status, md, "guide_id"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item guide_id"); - return false; - } char* class_id = psMetadataLookupPtr(&status, md, "class_id"); if (!status) { @@ -7049,9 +6946,4 @@ return false; } - char* recipe = psMetadataLookupPtr(&status, md, "recipe"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item recipe"); - return false; - } char* uri = psMetadataLookupPtr(&status, md, "uri"); if (!status) { @@ -7085,5 +6977,5 @@ } - return chipProcessedImfileRowAlloc(chip_id, exp_tag, guide_id, class_id, recipe, uri, bg, bg_stdev, bg_mean_stdev, path_base, fault); + return chipProcessedImfileRowAlloc(chip_id, class_id, uri, bg, bg_stdev, bg_mean_stdev, path_base, fault); } psArray *chipProcessedImfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) @@ -7197,5 +7089,5 @@ static void camPendingExpRowFree(camPendingExpRow *object); -camPendingExpRow *camPendingExpRowAlloc(psS64 cam_id, psS64 chip_id, const char *label, const char *expgroup, const char *dvodb) +camPendingExpRow *camPendingExpRowAlloc(psS64 cam_id, psS64 chip_id, const char *label, const char *recipe, const char *expgroup, const char *dvodb) { camPendingExpRow *_object; @@ -7207,4 +7099,5 @@ _object->chip_id = chip_id; _object->label = psStringCopy(label); + _object->recipe = psStringCopy(recipe); _object->expgroup = psStringCopy(expgroup); _object->dvodb = psStringCopy(dvodb); @@ -7216,4 +7109,5 @@ { psFree(object->label); + psFree(object->recipe); psFree(object->expgroup); psFree(object->dvodb); @@ -7238,4 +7132,9 @@ return false; } + if (!psMetadataAdd(md, PS_LIST_TAIL, "recipe", PS_DATA_STRING, NULL, "64")) { + psError(PS_ERR_UNKNOWN, false, "failed to add item recipe"); + psFree(md); + return false; + } if (!psMetadataAdd(md, PS_LIST_TAIL, "expgroup", PS_DATA_STRING, "key", "64")) { psError(PS_ERR_UNKNOWN, false, "failed to add item expgroup"); @@ -7261,5 +7160,5 @@ } -bool camPendingExpInsert(psDB * dbh, psS64 cam_id, psS64 chip_id, const char *label, const char *expgroup, const char *dvodb) +bool camPendingExpInsert(psDB * dbh, psS64 cam_id, psS64 chip_id, const char *label, const char *recipe, const char *expgroup, const char *dvodb) { psMetadata *md = psMetadataAlloc(); @@ -7276,4 +7175,9 @@ if (!psMetadataAdd(md, PS_LIST_TAIL, "label", PS_DATA_STRING, NULL, label)) { psError(PS_ERR_UNKNOWN, false, "failed to add item label"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "recipe", PS_DATA_STRING, NULL, recipe)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item recipe"); psFree(md); return false; @@ -7312,5 +7216,5 @@ bool camPendingExpInsertObject(psDB *dbh, camPendingExpRow *object) { - return camPendingExpInsert(dbh, object->cam_id, object->chip_id, object->label, object->expgroup, object->dvodb); + return camPendingExpInsert(dbh, object->cam_id, object->chip_id, object->label, object->recipe, object->expgroup, object->dvodb); } @@ -7400,4 +7304,9 @@ return false; } + if (!psMetadataAdd(md, PS_LIST_TAIL, "recipe", PS_DATA_STRING, NULL, object->recipe)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item recipe"); + psFree(md); + return false; + } if (!psMetadataAdd(md, PS_LIST_TAIL, "expgroup", PS_DATA_STRING, NULL, object->expgroup)) { psError(PS_ERR_UNKNOWN, false, "failed to add item expgroup"); @@ -7434,4 +7343,9 @@ return false; } + char* recipe = psMetadataLookupPtr(&status, md, "recipe"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item recipe"); + return false; + } char* expgroup = psMetadataLookupPtr(&status, md, "expgroup"); if (!status) { @@ -7445,5 +7359,5 @@ } - return camPendingExpRowAlloc(cam_id, chip_id, label, expgroup, dvodb); + return camPendingExpRowAlloc(cam_id, chip_id, label, recipe, expgroup, dvodb); } psArray *camPendingExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) @@ -7557,5 +7471,5 @@ static void camProcessedExpRowFree(camProcessedExpRow *object); -camProcessedExpRow *camProcessedExpRowAlloc(psS64 cam_id, psS64 chip_id, const char *label, const char *uri, const char *recipe, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF32 sigma_ra, psF32 sigma_dec, psS32 nastro, const char *path_base, psF32 zp_mean, psF32 zp_stdev, psS16 fault, const char *expgroup, const char *dvodb) +camProcessedExpRow *camProcessedExpRowAlloc(psS64 cam_id, psS64 chip_id, const char *label, const char *recipe, const char *expgroup, const char *dvodb, const char *uri, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF32 sigma_ra, psF32 sigma_dec, psS32 nastro, const char *path_base, psF32 zp_mean, psF32 zp_stdev, psS16 fault) { camProcessedExpRow *_object; @@ -7567,6 +7481,8 @@ _object->chip_id = chip_id; _object->label = psStringCopy(label); + _object->recipe = psStringCopy(recipe); + _object->expgroup = psStringCopy(expgroup); + _object->dvodb = psStringCopy(dvodb); _object->uri = psStringCopy(uri); - _object->recipe = psStringCopy(recipe); _object->bg = bg; _object->bg_stdev = bg_stdev; @@ -7579,6 +7495,4 @@ _object->zp_stdev = zp_stdev; _object->fault = fault; - _object->expgroup = psStringCopy(expgroup); - _object->dvodb = psStringCopy(dvodb); return _object; @@ -7588,9 +7502,9 @@ { psFree(object->label); - psFree(object->uri); psFree(object->recipe); - psFree(object->path_base); psFree(object->expgroup); psFree(object->dvodb); + psFree(object->uri); + psFree(object->path_base); } @@ -7613,4 +7527,19 @@ return false; } + if (!psMetadataAdd(md, PS_LIST_TAIL, "recipe", PS_DATA_STRING, NULL, "64")) { + psError(PS_ERR_UNKNOWN, false, "failed to add item recipe"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "expgroup", PS_DATA_STRING, "key", "64")) { + psError(PS_ERR_UNKNOWN, false, "failed to add item expgroup"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "dvodb", PS_DATA_STRING, NULL, "255")) { + psError(PS_ERR_UNKNOWN, false, "failed to add item dvodb"); + psFree(md); + return false; + } if (!psMetadataAdd(md, PS_LIST_TAIL, "uri", PS_DATA_STRING, NULL, "255")) { psError(PS_ERR_UNKNOWN, false, "failed to add item uri"); @@ -7618,9 +7547,4 @@ return false; } - if (!psMetadataAdd(md, PS_LIST_TAIL, "recipe", PS_DATA_STRING, NULL, "64")) { - psError(PS_ERR_UNKNOWN, false, "failed to add item recipe"); - 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"); @@ -7673,14 +7597,4 @@ return false; } - if (!psMetadataAdd(md, PS_LIST_TAIL, "expgroup", PS_DATA_STRING, "key", "64")) { - psError(PS_ERR_UNKNOWN, false, "failed to add item expgroup"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "dvodb", PS_DATA_STRING, NULL, "255")) { - psError(PS_ERR_UNKNOWN, false, "failed to add item dvodb"); - psFree(md); - return false; - } bool status = psDBCreateTable(dbh, CAMPROCESSEDEXP_TABLE_NAME, md); @@ -7696,5 +7610,5 @@ } -bool camProcessedExpInsert(psDB * dbh, psS64 cam_id, psS64 chip_id, const char *label, const char *uri, const char *recipe, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF32 sigma_ra, psF32 sigma_dec, psS32 nastro, const char *path_base, psF32 zp_mean, psF32 zp_stdev, psS16 fault, const char *expgroup, const char *dvodb) +bool camProcessedExpInsert(psDB * dbh, psS64 cam_id, psS64 chip_id, const char *label, const char *recipe, const char *expgroup, const char *dvodb, const char *uri, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF32 sigma_ra, psF32 sigma_dec, psS32 nastro, const char *path_base, psF32 zp_mean, psF32 zp_stdev, psS16 fault) { psMetadata *md = psMetadataAlloc(); @@ -7714,4 +7628,19 @@ return false; } + if (!psMetadataAdd(md, PS_LIST_TAIL, "recipe", PS_DATA_STRING, NULL, recipe)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item recipe"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "expgroup", PS_DATA_STRING, NULL, expgroup)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item expgroup"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "dvodb", PS_DATA_STRING, NULL, dvodb)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item dvodb"); + psFree(md); + return false; + } if (!psMetadataAdd(md, PS_LIST_TAIL, "uri", PS_DATA_STRING, NULL, uri)) { psError(PS_ERR_UNKNOWN, false, "failed to add item uri"); @@ -7719,9 +7648,4 @@ return false; } - if (!psMetadataAdd(md, PS_LIST_TAIL, "recipe", PS_DATA_STRING, NULL, recipe)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item recipe"); - 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"); @@ -7771,14 +7695,4 @@ 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; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "expgroup", PS_DATA_STRING, NULL, expgroup)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item expgroup"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "dvodb", PS_DATA_STRING, NULL, dvodb)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item dvodb"); psFree(md); return false; @@ -7807,5 +7721,5 @@ bool camProcessedExpInsertObject(psDB *dbh, camProcessedExpRow *object) { - return camProcessedExpInsert(dbh, object->cam_id, object->chip_id, object->label, object->uri, object->recipe, object->bg, object->bg_stdev, object->bg_mean_stdev, object->sigma_ra, object->sigma_dec, object->nastro, object->path_base, object->zp_mean, object->zp_stdev, object->fault, object->expgroup, object->dvodb); + return camProcessedExpInsert(dbh, object->cam_id, object->chip_id, object->label, object->recipe, object->expgroup, object->dvodb, object->uri, object->bg, object->bg_stdev, object->bg_mean_stdev, object->sigma_ra, object->sigma_dec, object->nastro, object->path_base, object->zp_mean, object->zp_stdev, object->fault); } @@ -7895,4 +7809,19 @@ return false; } + if (!psMetadataAdd(md, PS_LIST_TAIL, "recipe", PS_DATA_STRING, NULL, object->recipe)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item recipe"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "expgroup", PS_DATA_STRING, NULL, object->expgroup)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item expgroup"); + psFree(md); + return false; + } + if (!psMetadataAdd(md, PS_LIST_TAIL, "dvodb", PS_DATA_STRING, NULL, object->dvodb)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item dvodb"); + psFree(md); + return false; + } if (!psMetadataAdd(md, PS_LIST_TAIL, "uri", PS_DATA_STRING, NULL, object->uri)) { psError(PS_ERR_UNKNOWN, false, "failed to add item uri"); @@ -7900,9 +7829,4 @@ return false; } - if (!psMetadataAdd(md, PS_LIST_TAIL, "recipe", PS_DATA_STRING, NULL, object->recipe)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item recipe"); - 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"); @@ -7955,14 +7879,4 @@ return false; } - if (!psMetadataAdd(md, PS_LIST_TAIL, "expgroup", PS_DATA_STRING, NULL, object->expgroup)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item expgroup"); - psFree(md); - return false; - } - if (!psMetadataAdd(md, PS_LIST_TAIL, "dvodb", PS_DATA_STRING, NULL, object->dvodb)) { - psError(PS_ERR_UNKNOWN, false, "failed to add item dvodb"); - psFree(md); - return false; - } @@ -7989,4 +7903,19 @@ return false; } + char* recipe = psMetadataLookupPtr(&status, md, "recipe"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item recipe"); + return false; + } + char* expgroup = psMetadataLookupPtr(&status, md, "expgroup"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item expgroup"); + return false; + } + char* dvodb = psMetadataLookupPtr(&status, md, "dvodb"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item dvodb"); + return false; + } char* uri = psMetadataLookupPtr(&status, md, "uri"); if (!status) { @@ -7994,9 +7923,4 @@ return false; } - char* recipe = psMetadataLookupPtr(&status, md, "recipe"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item recipe"); - return false; - } psF64 bg = psMetadataLookupF64(&status, md, "bg"); if (!status) { @@ -8049,16 +7973,6 @@ return false; } - char* expgroup = psMetadataLookupPtr(&status, md, "expgroup"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item expgroup"); - return false; - } - char* dvodb = psMetadataLookupPtr(&status, md, "dvodb"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item dvodb"); - return false; - } - - return camProcessedExpRowAlloc(cam_id, chip_id, label, uri, recipe, bg, bg_stdev, bg_mean_stdev, sigma_ra, sigma_dec, nastro, path_base, zp_mean, zp_stdev, fault, expgroup, dvodb); + + return camProcessedExpRowAlloc(cam_id, chip_id, label, recipe, expgroup, dvodb, uri, bg, bg_stdev, bg_mean_stdev, sigma_ra, sigma_dec, nastro, path_base, zp_mean, zp_stdev, fault); } psArray *camProcessedExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) Index: /trunk/ippdb/src/ippdb.h =================================================================== --- /trunk/ippdb/src/ippdb.h (revision 12201) +++ /trunk/ippdb/src/ippdb.h (revision 12202) @@ -2925,8 +2925,5 @@ typedef struct { psS64 chip_id; - char *exp_tag; - psS64 guide_id; char *class_id; - char *recipe; char *uri; } chipPendingImfileRow; @@ -2939,8 +2936,5 @@ chipPendingImfileRow *chipPendingImfileRowAlloc( psS64 chip_id, - const char *exp_tag, - psS64 guide_id, const char *class_id, - const char *recipe, const char *uri ); @@ -2974,8 +2968,5 @@ psDB *dbh, ///< Database handle psS64 chip_id, - const char *exp_tag, - psS64 guide_id, const char *class_id, - const char *recipe, const char *uri ); @@ -3138,4 +3129,5 @@ psS64 guide_id; char *label; + char *recipe; char *expgroup; char *dvodb; @@ -3152,4 +3144,5 @@ psS64 guide_id, const char *label, + const char *recipe, const char *expgroup, const char *dvodb @@ -3187,4 +3180,5 @@ psS64 guide_id, const char *label, + const char *recipe, const char *expgroup, const char *dvodb @@ -3540,8 +3534,5 @@ typedef struct { psS64 chip_id; - char *exp_tag; - psS64 guide_id; char *class_id; - char *recipe; char *uri; psF64 bg; @@ -3559,8 +3550,5 @@ chipProcessedImfileRow *chipProcessedImfileRowAlloc( psS64 chip_id, - const char *exp_tag, - psS64 guide_id, const char *class_id, - const char *recipe, const char *uri, psF64 bg, @@ -3599,8 +3587,5 @@ psDB *dbh, ///< Database handle psS64 chip_id, - const char *exp_tag, - psS64 guide_id, const char *class_id, - const char *recipe, const char *uri, psF64 bg, @@ -3767,4 +3752,5 @@ psS64 chip_id; char *label; + char *recipe; char *expgroup; char *dvodb; @@ -3780,4 +3766,5 @@ psS64 chip_id, const char *label, + const char *recipe, const char *expgroup, const char *dvodb @@ -3814,4 +3801,5 @@ psS64 chip_id, const char *label, + const char *recipe, const char *expgroup, const char *dvodb @@ -3974,6 +3962,8 @@ psS64 chip_id; char *label; + char *recipe; + char *expgroup; + char *dvodb; char *uri; - char *recipe; psF64 bg; psF64 bg_stdev; @@ -3986,6 +3976,4 @@ psF32 zp_stdev; psS16 fault; - char *expgroup; - char *dvodb; } camProcessedExpRow; @@ -3999,6 +3987,8 @@ psS64 chip_id, const char *label, + const char *recipe, + const char *expgroup, + const char *dvodb, const char *uri, - const char *recipe, psF64 bg, psF64 bg_stdev, @@ -4010,7 +4000,5 @@ psF32 zp_mean, psF32 zp_stdev, - psS16 fault, - const char *expgroup, - const char *dvodb + psS16 fault ); @@ -4045,6 +4033,8 @@ psS64 chip_id, const char *label, + const char *recipe, + const char *expgroup, + const char *dvodb, const char *uri, - const char *recipe, psF64 bg, psF64 bg_stdev, @@ -4056,7 +4046,5 @@ psF32 zp_mean, psF32 zp_stdev, - psS16 fault, - const char *expgroup, - const char *dvodb + psS16 fault ); Index: /trunk/ippdb/tests/alloc.c =================================================================== --- /trunk/ippdb/tests/alloc.c (revision 12201) +++ /trunk/ippdb/tests/alloc.c (revision 12202) @@ -573,5 +573,5 @@ chipPendingImfileRow *object; - object = chipPendingImfileRowAlloc(-64, "a string", -64, "a string", "a string", "a string" ); + object = chipPendingImfileRowAlloc(-64, "a string", "a string" ); if (!object) { @@ -583,4 +583,29 @@ exit(EXIT_FAILURE); } + if (strncmp(object->class_id, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->uri, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + chipProcessedExpRow *object; + + object = chipProcessedExpRowAlloc(-64, "a string", -64, "a string", "a string", "a string", "a string" ); + + if (!object) { + exit(EXIT_FAILURE); + } + + if (!object->chip_id == -64) { + psFree(object); + exit(EXIT_FAILURE); + } if (strncmp(object->exp_tag, "a string", MAX_STRING_LENGTH)) { psFree(object); @@ -591,107 +616,160 @@ exit(EXIT_FAILURE); } + if (strncmp(object->label, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->recipe, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (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); + } + + { + 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); + } + + { + chipProcessedImfileRow *object; + + object = chipProcessedImfileRowAlloc(-64, "a string", "a string", 64.64, 64.64, 64.64, "a string", -16 ); + + if (!object) { + exit(EXIT_FAILURE); + } + + if (!object->chip_id == -64) { + psFree(object); + exit(EXIT_FAILURE); + } if (strncmp(object->class_id, "a string", MAX_STRING_LENGTH)) { psFree(object); exit(EXIT_FAILURE); } + if (strncmp(object->uri, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->bg == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->bg_stdev == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->bg_mean_stdev == 64.64) { + 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); + } + + { + camPendingExpRow *object; + + object = camPendingExpRowAlloc(-64, -64, "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 (strncmp(object->label, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } if (strncmp(object->recipe, "a string", MAX_STRING_LENGTH)) { psFree(object); exit(EXIT_FAILURE); } + if (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", "a string", "a string", "a string", "a string", 64.64, 64.64, 64.64, 32.32, 32.32, -32, "a string", 32.32, 32.32, -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->label, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->recipe, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (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); + } if (strncmp(object->uri, "a string", MAX_STRING_LENGTH)) { psFree(object); exit(EXIT_FAILURE); } - - psFree(object); - } - - { - chipProcessedExpRow *object; - - object = chipProcessedExpRowAlloc(-64, "a string", -64, "a string", "a string", "a string" ); - - if (!object) { - exit(EXIT_FAILURE); - } - - if (!object->chip_id == -64) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->exp_tag, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->guide_id == -64) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->label, "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); - } - - { - 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); - } - - { - chipProcessedImfileRow *object; - - object = chipProcessedImfileRowAlloc(-64, "a string", -64, "a string", "a string", "a string", 64.64, 64.64, 64.64, "a string", -16 ); - - if (!object) { - exit(EXIT_FAILURE); - } - - if (!object->chip_id == -64) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->exp_tag, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (!object->guide_id == -64) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->class_id, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->recipe, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->uri, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } if (!object->bg == 64.64) { psFree(object); @@ -706,123 +784,29 @@ 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->nastro == -32) { + psFree(object); + exit(EXIT_FAILURE); + } if (strncmp(object->path_base, "a string", MAX_STRING_LENGTH)) { 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->fault == -16) { - psFree(object); - exit(EXIT_FAILURE); - } - - psFree(object); - } - - { - camPendingExpRow *object; - - object = camPendingExpRowAlloc(-64, -64, "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 (strncmp(object->label, "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", "a string", "a string", 64.64, 64.64, 64.64, 32.32, 32.32, -32, "a string", 32.32, 32.32, -16, "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 (strncmp(object->label, "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->recipe, "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->bg_mean_stdev == 64.64) { - 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->nastro == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->path_base, "a string", MAX_STRING_LENGTH)) { - 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->fault == -16) { - 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); Index: /trunk/ippdb/tests/insert.c =================================================================== --- /trunk/ippdb/tests/insert.c (revision 12201) +++ /trunk/ippdb/tests/insert.c (revision 12202) @@ -208,20 +208,20 @@ } - if (!chipPendingImfileInsert(dbh, -64, "a string", -64, "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 (!chipProcessedExpInsert(dbh, -64, "a string", -64, "a string", "a string", "a string")) { + if (!chipPendingImfileInsert(dbh, -64, "a string", "a string")) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if (!chipProcessedExpInsert(dbh, -64, "a string", -64, "a string", "a string", "a string", "a string")) { exit(EXIT_FAILURE); } @@ -253,35 +253,35 @@ } - if (!chipProcessedImfileInsert(dbh, -64, "a string", -64, "a string", "a string", "a string", 64.64, 64.64, 64.64, "a string", -16)) { - exit(EXIT_FAILURE); - } - - psDBCleanup(dbh); - } - - { - psDB *dbh; - - dbh = psDBInit("localhost", "test", NULL, "test"); - if (!dbh) { - exit(EXIT_FAILURE); - } - - if (!camPendingExpInsert(dbh, -64, -64, "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 (!camProcessedExpInsert(dbh, -64, -64, "a string", "a string", "a string", 64.64, 64.64, 64.64, 32.32, 32.32, -32, "a string", 32.32, 32.32, -16, "a string", "a string")) { + if (!chipProcessedImfileInsert(dbh, -64, "a string", "a string", 64.64, 64.64, 64.64, "a string", -16)) { + exit(EXIT_FAILURE); + } + + psDBCleanup(dbh); + } + + { + psDB *dbh; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if (!camPendingExpInsert(dbh, -64, -64, "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 (!camProcessedExpInsert(dbh, -64, -64, "a string", "a string", "a string", "a string", "a string", 64.64, 64.64, 64.64, 32.32, 32.32, -32, "a string", 32.32, 32.32, -16)) { exit(EXIT_FAILURE); } Index: /trunk/ippdb/tests/insertobject.c =================================================================== --- /trunk/ippdb/tests/insertobject.c (revision 12201) +++ /trunk/ippdb/tests/insertobject.c (revision 12202) @@ -300,5 +300,5 @@ } - object = chipPendingImfileRowAlloc(-64, "a string", -64, "a string", "a string", "a string"); + object = chipPendingImfileRowAlloc(-64, "a string", "a string"); if (!object) { exit(EXIT_FAILURE); @@ -322,5 +322,5 @@ } - object = chipProcessedExpRowAlloc(-64, "a string", -64, "a string", "a string", "a string"); + object = chipProcessedExpRowAlloc(-64, "a string", -64, "a string", "a string", "a string", "a string"); if (!object) { exit(EXIT_FAILURE); @@ -366,5 +366,5 @@ } - object = chipProcessedImfileRowAlloc(-64, "a string", -64, "a string", "a string", "a string", 64.64, 64.64, 64.64, "a string", -16); + object = chipProcessedImfileRowAlloc(-64, "a string", "a string", 64.64, 64.64, 64.64, "a string", -16); if (!object) { exit(EXIT_FAILURE); @@ -388,5 +388,5 @@ } - object = camPendingExpRowAlloc(-64, -64, "a string", "a string", "a string"); + object = camPendingExpRowAlloc(-64, -64, "a string", "a string", "a string", "a string"); if (!object) { exit(EXIT_FAILURE); @@ -410,5 +410,5 @@ } - object = camProcessedExpRowAlloc(-64, -64, "a string", "a string", "a string", 64.64, 64.64, 64.64, 32.32, 32.32, -32, "a string", 32.32, 32.32, -16, "a string", "a string"); + object = camProcessedExpRowAlloc(-64, -64, "a string", "a string", "a string", "a string", "a string", 64.64, 64.64, 64.64, 32.32, 32.32, -32, "a string", 32.32, 32.32, -16); if (!object) { exit(EXIT_FAILURE); Index: /trunk/ippdb/tests/metadatafromobject.c =================================================================== --- /trunk/ippdb/tests/metadatafromobject.c (revision 12201) +++ /trunk/ippdb/tests/metadatafromobject.c (revision 12202) @@ -673,5 +673,5 @@ bool status; - object = chipPendingImfileRowAlloc(-64, "a string", -64, "a string", "a string", "a string"); + object = chipPendingImfileRowAlloc(-64, "a string", "a string"); if (!object) { exit(EXIT_FAILURE); @@ -688,4 +688,36 @@ exit(EXIT_FAILURE); } + if (strncmp(psMetadataLookupPtr(&status, md, "class_id"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "uri"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + } + + { + psMetadata *md; + chipProcessedExpRow *object; + bool status; + + object = chipProcessedExpRowAlloc(-64, "a string", -64, "a string", "a string", "a string", "a string"); + if (!object) { + exit(EXIT_FAILURE); + } + + md = chipProcessedExpMetadataFromObject(object); + if (!md) { + exit(EXIT_FAILURE); + } + + psFree(object); + + psFree(md); + exit(EXIT_FAILURE); + } if (strncmp(psMetadataLookupPtr(&status, md, "exp_tag"), "a string", MAX_STRING_LENGTH)) { psFree(md); @@ -695,127 +727,186 @@ exit(EXIT_FAILURE); } + if (strncmp(psMetadataLookupPtr(&status, md, "label"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "recipe"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (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; + 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; + chipProcessedImfileRow *object; + bool status; + + object = chipProcessedImfileRowAlloc(-64, "a string", "a string", 64.64, 64.64, 64.64, "a string", -16); + if (!object) { + exit(EXIT_FAILURE); + } + + md = chipProcessedImfileMetadataFromObject(object); + if (!md) { + exit(EXIT_FAILURE); + } + + psFree(object); + + psFree(md); + exit(EXIT_FAILURE); + } if (strncmp(psMetadataLookupPtr(&status, md, "class_id"), "a string", MAX_STRING_LENGTH)) { psFree(md); exit(EXIT_FAILURE); } + if (strncmp(psMetadataLookupPtr(&status, md, "uri"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF64(&status, md, "bg") == 64.64) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF64(&status, md, "bg_stdev") == 64.64) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataLookupF64(&status, md, "bg_mean_stdev") == 64.64) { + 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; + camPendingExpRow *object; + bool status; + + object = camPendingExpRowAlloc(-64, -64, "a string", "a string", "a string", "a string"); + if (!object) { + exit(EXIT_FAILURE); + } + + md = camPendingExpMetadataFromObject(object); + if (!md) { + exit(EXIT_FAILURE); + } + + psFree(object); + + psFree(md); + exit(EXIT_FAILURE); + } + 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, "recipe"), "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", "a string", "a string", "a string", "a string", 64.64, 64.64, 64.64, 32.32, 32.32, -32, "a string", 32.32, 32.32, -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, "label"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "recipe"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (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); + } if (strncmp(psMetadataLookupPtr(&status, md, "uri"), "a string", MAX_STRING_LENGTH)) { psFree(md); exit(EXIT_FAILURE); } - - psFree(md); - } - - { - psMetadata *md; - chipProcessedExpRow *object; - bool status; - - object = chipProcessedExpRowAlloc(-64, "a string", -64, "a string", "a string", "a string"); - if (!object) { - exit(EXIT_FAILURE); - } - - md = chipProcessedExpMetadataFromObject(object); - if (!md) { - exit(EXIT_FAILURE); - } - - psFree(object); - - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "exp_tag"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - 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, "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; - 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; - chipProcessedImfileRow *object; - bool status; - - object = chipProcessedImfileRowAlloc(-64, "a string", -64, "a string", "a string", "a string", 64.64, 64.64, 64.64, "a string", -16); - if (!object) { - exit(EXIT_FAILURE); - } - - md = chipProcessedImfileMetadataFromObject(object); - if (!md) { - exit(EXIT_FAILURE); - } - - psFree(object); - - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "exp_tag"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - 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); - } - if (strncmp(psMetadataLookupPtr(&status, md, "recipe"), "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 (!psMetadataLookupF64(&status, md, "bg") == 64.64) { psFree(md); @@ -830,117 +921,20 @@ 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 (!psMetadataLookupS32(&status, md, "nastro") == -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; - camPendingExpRow *object; - bool status; - - object = camPendingExpRowAlloc(-64, -64, "a string", "a string", "a string"); - if (!object) { - exit(EXIT_FAILURE); - } - - md = camPendingExpMetadataFromObject(object); - if (!md) { - exit(EXIT_FAILURE); - } - - psFree(object); - - psFree(md); - exit(EXIT_FAILURE); - } - 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, "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", "a string", "a string", 64.64, 64.64, 64.64, 32.32, 32.32, -32, "a string", 32.32, 32.32, -16, "a string", "a string"); - 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, "label"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "uri"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "recipe"), "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); - } - if (!psMetadataLookupF64(&status, md, "bg_mean_stdev") == 64.64) { - 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 (!psMetadataLookupS32(&status, md, "nastro") == -32) { - psFree(md); - exit(EXIT_FAILURE); - } - if (strncmp(psMetadataLookupPtr(&status, md, "path_base"), "a string", MAX_STRING_LENGTH)) { - psFree(md); - exit(EXIT_FAILURE); - } if (!psMetadataLookupF32(&status, md, "zp_mean") == 32.32) { psFree(md); @@ -951,12 +945,4 @@ exit(EXIT_FAILURE); } - 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); Index: /trunk/ippdb/tests/objectfrommetadata.c =================================================================== --- /trunk/ippdb/tests/objectfrommetadata.c (revision 12201) +++ /trunk/ippdb/tests/objectfrommetadata.c (revision 12202) @@ -1024,4 +1024,44 @@ exit(EXIT_FAILURE); } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "class_id", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "uri", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + + object = chipPendingImfileObjectFromMetadata(md); + if (!object) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->class_id, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->uri, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + + psFree(object); + } + + { + psMetadata *md; + chipProcessedExpRow *object; + + md = psMetadataAlloc(); + psFree(md); + exit(EXIT_FAILURE); + } if (!psMetadataAddStr(md, PS_LIST_TAIL, "exp_tag", 0, NULL, "a string")) { psFree(md); @@ -1031,36 +1071,311 @@ 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, "recipe", 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 = chipProcessedExpObjectFromMetadata(md); + if (!object) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->exp_tag, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->label, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->recipe, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (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; + 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; + chipProcessedImfileRow *object; + + md = psMetadataAlloc(); + psFree(md); + exit(EXIT_FAILURE); + } if (!psMetadataAddStr(md, PS_LIST_TAIL, "class_id", 0, NULL, "a string")) { psFree(md); exit(EXIT_FAILURE); } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "uri", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!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); + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "bg_mean_stdev", 0, NULL, 64.64)) { + 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); + } + if (strncmp(object->class_id, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->uri, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->bg == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->bg_stdev == 64.64) { + psFree(object); + exit(EXIT_FAILURE); + } + if (!object->bg_mean_stdev == 64.64) { + 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; + camPendingExpRow *object; + + md = psMetadataAlloc(); + psFree(md); + exit(EXIT_FAILURE); + } + 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, "recipe", 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 = camPendingExpObjectFromMetadata(md); + if (!object) { + psFree(md); + exit(EXIT_FAILURE); + } + + psFree(md); + + psFree(object); + exit(EXIT_FAILURE); + } + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->label, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->recipe, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (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, "label", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "recipe", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!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); + } if (!psMetadataAddStr(md, PS_LIST_TAIL, "uri", 0, NULL, "a string")) { psFree(md); exit(EXIT_FAILURE); } - - object = chipPendingImfileObjectFromMetadata(md); - if (!object) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->exp_tag, "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)) { + 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); + } + if (!psMetadataAddF64(md, PS_LIST_TAIL, "bg_mean_stdev", 0, NULL, 64.64)) { + 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 (!psMetadataAddS32(md, PS_LIST_TAIL, "nastro", 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); + } + 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); + } + 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->label, "a string", MAX_STRING_LENGTH)) { psFree(object); exit(EXIT_FAILURE); @@ -1070,177 +1385,16 @@ 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); + } if (strncmp(object->uri, "a string", MAX_STRING_LENGTH)) { psFree(object); exit(EXIT_FAILURE); } - - psFree(object); - } - - { - psMetadata *md; - chipProcessedExpRow *object; - - md = psMetadataAlloc(); - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "exp_tag", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - 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, "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 = chipProcessedExpObjectFromMetadata(md); - if (!object) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->exp_tag, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->label, "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; - 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; - chipProcessedImfileRow *object; - - md = psMetadataAlloc(); - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "exp_tag", 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); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "recipe", 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 (!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); - } - if (!psMetadataAddF64(md, PS_LIST_TAIL, "bg_mean_stdev", 0, NULL, 64.64)) { - 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); - } - if (strncmp(object->exp_tag, "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); - } - if (strncmp(object->recipe, "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 == 64.64) { psFree(object); @@ -1255,194 +1409,20 @@ 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->nastro == -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; - camPendingExpRow *object; - - md = psMetadataAlloc(); - psFree(md); - exit(EXIT_FAILURE); - } - 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, "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 = camPendingExpObjectFromMetadata(md); - if (!object) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - - psFree(object); - exit(EXIT_FAILURE); - } - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->label, "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, "label", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "uri", 0, NULL, "a string")) { - psFree(md); - exit(EXIT_FAILURE); - } - if (!psMetadataAddStr(md, PS_LIST_TAIL, "recipe", 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); - } - if (!psMetadataAddF64(md, PS_LIST_TAIL, "bg_mean_stdev", 0, NULL, 64.64)) { - 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 (!psMetadataAddS32(md, PS_LIST_TAIL, "nastro", 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); - } - 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); - } - 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 = camProcessedExpObjectFromMetadata(md); - if (!object) { - psFree(md); - exit(EXIT_FAILURE); - } - - psFree(md); - - psFree(object); - exit(EXIT_FAILURE); - } - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->label, "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->recipe, "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->bg_mean_stdev == 64.64) { - 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->nastro == -32) { - psFree(object); - exit(EXIT_FAILURE); - } - if (strncmp(object->path_base, "a string", MAX_STRING_LENGTH)) { - psFree(object); - exit(EXIT_FAILURE); - } if (!object->zp_mean == 32.32) { psFree(object); @@ -1453,12 +1433,4 @@ exit(EXIT_FAILURE); } - 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);