Index: /branches/jhoblitt/ippdb/configure.ac =================================================================== --- /branches/jhoblitt/ippdb/configure.ac (revision 8147) +++ /branches/jhoblitt/ippdb/configure.ac (revision 8148) @@ -1,5 +1,5 @@ AC_PREREQ(2.59) -AC_INIT([ippdb], [0.0.12], [pan-starrs.ifa.hawaii.edu]) +AC_INIT([ippdb], [0.0.13], [pan-starrs.ifa.hawaii.edu]) AC_CONFIG_SRCDIR([ippdb.pc.in]) Index: /branches/jhoblitt/ippdb/src/ippdb.c =================================================================== --- /branches/jhoblitt/ippdb/src/ippdb.c (revision 8147) +++ /branches/jhoblitt/ippdb/src/ippdb.c (revision 8148) @@ -14669,5 +14669,5 @@ static void detResidImfileAnalysisRowFree(detResidImfileAnalysisRow *object); -detResidImfileAnalysisRow *detResidImfileAnalysisRowAlloc(psS32 det_id, psS32 iteration, const char *exp_id, const char *class_id, const char *recipe) +detResidImfileAnalysisRow *detResidImfileAnalysisRowAlloc(psS32 det_id, psS32 iteration, const char *exp_id, const char *class_id, const char *recipe, const char *uri, const char *b1_uri, const char *b2_uri) { detResidImfileAnalysisRow *object; @@ -14681,4 +14681,7 @@ object->class_id = psStringCopy(class_id); object->recipe = psStringCopy(recipe); + object->uri = psStringCopy(uri); + object->b1_uri = psStringCopy(b1_uri); + object->b2_uri = psStringCopy(b2_uri); return object; @@ -14690,4 +14693,7 @@ psFree(object->class_id); psFree(object->recipe); + psFree(object->uri); + psFree(object->b1_uri); + psFree(object->b2_uri); } @@ -14728,4 +14734,19 @@ return false; } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "uri", 0, NULL, "64")) { + psError(PS_ERR_UNKNOWN, false, "failed to add item uri"); + psFree(md); + return false; + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "b1_uri", 0, NULL, "64")) { + psError(PS_ERR_UNKNOWN, false, "failed to add item b1_uri"); + psFree(md); + return false; + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "b2_uri", 0, NULL, "64")) { + psError(PS_ERR_UNKNOWN, false, "failed to add item b2_uri"); + psFree(md); + return false; + } status = psDBCreateTable(dbh, DETRESIDIMFILEANALYSIS_TABLE_NAME, md); @@ -14741,5 +14762,5 @@ } -bool detResidImfileAnalysisInsert(psDB * dbh, psS32 det_id, psS32 iteration, const char *exp_id, const char *class_id, const char *recipe) +bool detResidImfileAnalysisInsert(psDB * dbh, psS32 det_id, psS32 iteration, const char *exp_id, const char *class_id, const char *recipe, const char *uri, const char *b1_uri, const char *b2_uri) { psMetadata *md; @@ -14769,4 +14790,19 @@ if (!psMetadataAddStr(md, PS_LIST_TAIL, "recipe", 0, NULL, recipe)) { psError(PS_ERR_UNKNOWN, false, "failed to add item recipe"); + psFree(md); + return false; + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "uri", 0, NULL, uri)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item uri"); + psFree(md); + return false; + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "b1_uri", 0, NULL, b1_uri)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item b1_uri"); + psFree(md); + return false; + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "b2_uri", 0, NULL, b2_uri)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item b2_uri"); psFree(md); return false; @@ -14793,5 +14829,5 @@ return deleted; } -bool detResidImfileAnalysisPop(psDB *dbh, psS32 *det_id, psS32 *iteration, char **exp_id, char **class_id, char **recipe) +bool detResidImfileAnalysisPop(psDB *dbh, psS32 *det_id, psS32 *iteration, char **exp_id, char **class_id, char **recipe, char **uri, char **b1_uri, char **b2_uri) { psArray *rowSet; @@ -14867,4 +14903,22 @@ return false; } + *uri = psMetadataLookupPtr(&status, row, "uri"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item uri"); + psFree(row); + return false; + } + *b1_uri = psMetadataLookupPtr(&status, row, "b1_uri"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item b1_uri"); + psFree(row); + return false; + } + *b2_uri = psMetadataLookupPtr(&status, row, "b2_uri"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item b2_uri"); + psFree(row); + return false; + } psFree(row); @@ -14875,5 +14929,5 @@ bool detResidImfileAnalysisInsertObject(psDB *dbh, detResidImfileAnalysisRow *object) { - return detResidImfileAnalysisInsert(dbh, object->det_id, object->iteration, object->exp_id, object->class_id, object->recipe); + return detResidImfileAnalysisInsert(dbh, object->det_id, object->iteration, object->exp_id, object->class_id, object->recipe, object->uri, object->b1_uri, object->b2_uri); } @@ -14885,11 +14939,14 @@ char class_id[256]; char recipe[256]; - - if (!detResidImfileAnalysisPop(dbh, &det_id, &iteration, (char **)&exp_id, (char **)&class_id, (char **)&recipe)) { + char uri[256]; + char b1_uri[256]; + char b2_uri[256]; + + if (!detResidImfileAnalysisPop(dbh, &det_id, &iteration, (char **)&exp_id, (char **)&class_id, (char **)&recipe, (char **)&uri, (char **)&b1_uri, (char **)&b2_uri)) { psError(PS_ERR_UNKNOWN, false, "failed to pop a database row"); return NULL; } - return detResidImfileAnalysisRowAlloc(det_id, iteration, exp_id, class_id, recipe); + return detResidImfileAnalysisRowAlloc(det_id, iteration, exp_id, class_id, recipe, uri, b1_uri, b2_uri); } @@ -15015,4 +15072,19 @@ return NULL; } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "uri", 0, NULL, object->uri)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item uri"); + psFree(md); + return NULL; + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "b1_uri", 0, NULL, object->b1_uri)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item b1_uri"); + psFree(md); + return NULL; + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "b2_uri", 0, NULL, object->b2_uri)) { + psError(PS_ERR_UNKNOWN, false, "failed to add item b2_uri"); + psFree(md); + return NULL; + } return md; @@ -15027,4 +15099,7 @@ char *class_id; char *recipe; + char *uri; + char *b1_uri; + char *b2_uri; det_id = psMetadataLookupS32(&status, md, "det_id"); @@ -15053,6 +15128,21 @@ return false; } - - return detResidImfileAnalysisRowAlloc(det_id, iteration, exp_id, class_id, recipe); + uri = psMetadataLookupPtr(&status, md, "uri"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item uri"); + return false; + } + b1_uri = psMetadataLookupPtr(&status, md, "b1_uri"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item b1_uri"); + return false; + } + b2_uri = psMetadataLookupPtr(&status, md, "b2_uri"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item b2_uri"); + return false; + } + + return detResidImfileAnalysisRowAlloc(det_id, iteration, exp_id, class_id, recipe, uri, b1_uri, b2_uri); } psArray *detResidImfileAnalysisSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) Index: /branches/jhoblitt/ippdb/src/ippdb.h =================================================================== --- /branches/jhoblitt/ippdb/src/ippdb.h (revision 8147) +++ /branches/jhoblitt/ippdb/src/ippdb.h (revision 8148) @@ -5908,4 +5908,7 @@ char *class_id; char *recipe; + char *uri; + char *b1_uri; + char *b2_uri; } detResidImfileAnalysisRow; @@ -5920,5 +5923,8 @@ const char *exp_id, const char *class_id, - const char *recipe + const char *recipe, + const char *uri, + const char *b1_uri, + const char *b2_uri ); @@ -5954,5 +5960,8 @@ const char *exp_id, const char *class_id, - const char *recipe + const char *recipe, + const char *uri, + const char *b1_uri, + const char *b2_uri ); @@ -5979,5 +5988,8 @@ char **exp_id, char **class_id, - char **recipe + char **recipe, + char **uri, + char **b1_uri, + char **b2_uri ); Index: /branches/jhoblitt/ippdb/tests/alloc.c =================================================================== --- /branches/jhoblitt/ippdb/tests/alloc.c (revision 8147) +++ /branches/jhoblitt/ippdb/tests/alloc.c (revision 8148) @@ -1207,5 +1207,5 @@ detResidImfileAnalysisRow *object; - object = detResidImfileAnalysisRowAlloc(-32, -32, "a string", "a string", "a string" ); + object = detResidImfileAnalysisRowAlloc(-32, -32, "a string", "a string", "a string", "a string", "a string", "a string" ); if (!object) { @@ -1230,4 +1230,16 @@ } 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 (strncmp(object->b1_uri, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->b2_uri, "a string", MAX_STRING_LENGTH)) { psFree(object); exit(EXIT_FAILURE); Index: /branches/jhoblitt/ippdb/tests/insert.c =================================================================== --- /branches/jhoblitt/ippdb/tests/insert.c (revision 8147) +++ /branches/jhoblitt/ippdb/tests/insert.c (revision 8148) @@ -448,5 +448,5 @@ } - if (!detResidImfileAnalysisInsert(dbh, -32, -32, "a string", "a string", "a string")) { + if (!detResidImfileAnalysisInsert(dbh, -32, -32, "a string", "a string", "a string", "a string", "a string", "a string")) { exit(EXIT_FAILURE); } Index: /branches/jhoblitt/ippdb/tests/insertobject.c =================================================================== --- /branches/jhoblitt/ippdb/tests/insertobject.c (revision 8147) +++ /branches/jhoblitt/ippdb/tests/insertobject.c (revision 8148) @@ -652,5 +652,5 @@ } - object = detResidImfileAnalysisRowAlloc(-32, -32, "a string", "a string", "a string"); + object = detResidImfileAnalysisRowAlloc(-32, -32, "a string", "a string", "a string", "a string", "a string", "a string"); if (!object) { exit(EXIT_FAILURE); Index: /branches/jhoblitt/ippdb/tests/metadatafromobject.c =================================================================== --- /branches/jhoblitt/ippdb/tests/metadatafromobject.c (revision 8147) +++ /branches/jhoblitt/ippdb/tests/metadatafromobject.c (revision 8148) @@ -1442,5 +1442,5 @@ bool status; - object = detResidImfileAnalysisRowAlloc(-32, -32, "a string", "a string", "a string"); + object = detResidImfileAnalysisRowAlloc(-32, -32, "a string", "a string", "a string", "a string", "a string", "a string"); if (!object) { exit(EXIT_FAILURE); @@ -1471,4 +1471,16 @@ } 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 (strncmp(psMetadataLookupPtr(&status, md, "b1_uri"), "a string", MAX_STRING_LENGTH)) { + psFree(md); + exit(EXIT_FAILURE); + } + if (strncmp(psMetadataLookupPtr(&status, md, "b2_uri"), "a string", MAX_STRING_LENGTH)) { psFree(md); exit(EXIT_FAILURE); Index: /branches/jhoblitt/ippdb/tests/objectfrommetadata.c =================================================================== --- /branches/jhoblitt/ippdb/tests/objectfrommetadata.c (revision 8147) +++ /branches/jhoblitt/ippdb/tests/objectfrommetadata.c (revision 8148) @@ -2195,4 +2195,16 @@ 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, "b1_uri", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } + if (!psMetadataAddStr(md, PS_LIST_TAIL, "b2_uri", 0, NULL, "a string")) { + psFree(md); + exit(EXIT_FAILURE); + } object = detResidImfileAnalysisObjectFromMetadata(md); @@ -2221,4 +2233,16 @@ } 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 (strncmp(object->b1_uri, "a string", MAX_STRING_LENGTH)) { + psFree(object); + exit(EXIT_FAILURE); + } + if (strncmp(object->b2_uri, "a string", MAX_STRING_LENGTH)) { psFree(object); exit(EXIT_FAILURE); Index: /branches/jhoblitt/ippdb/tests/pop.c =================================================================== --- /branches/jhoblitt/ippdb/tests/pop.c (revision 8147) +++ /branches/jhoblitt/ippdb/tests/pop.c (revision 8148) @@ -652,11 +652,14 @@ char class_id[256]; char recipe[256]; - - dbh = psDBInit("localhost", "test", NULL, "test"); - if (!dbh) { - exit(EXIT_FAILURE); - } - - if (!detResidImfileAnalysisPop(dbh, &det_id, &iteration, (char **)&exp_id, (char **)&class_id, (char **)&recipe)) { + char uri[256]; + char b1_uri[256]; + char b2_uri[256]; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + if (!detResidImfileAnalysisPop(dbh, &det_id, &iteration, (char **)&exp_id, (char **)&class_id, (char **)&recipe, (char **)&uri, (char **)&b1_uri, (char **)&b2_uri)) { exit(EXIT_FAILURE); }