From f678b071ee1e5bd7ab1e1ca5ec514060d09f308c Mon Sep 17 00:00:00 2001 From: miker Date: Thu, 31 Jan 2008 21:40:30 +0000 Subject: [PATCH] moving dedup to just where it is needed git-svn-id: svn://svn.open-ils.org/ILS/trunk@8558 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/src/c-apps/oils_cstore.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Open-ILS/src/c-apps/oils_cstore.c b/Open-ILS/src/c-apps/oils_cstore.c index 407a8b114f..0b782a3c91 100644 --- a/Open-ILS/src/c-apps/oils_cstore.c +++ b/Open-ILS/src/c-apps/oils_cstore.c @@ -1173,7 +1173,7 @@ static char* searchFieldTransform (const char* class, osrfHash* field, const jso } else { buffer_fadd( sql_buf, "\"%s\".%s", class, osrfHashGet(field, "name")); - } + } if (field_transform) free(field_transform); @@ -2518,10 +2518,10 @@ static jsonObject* doFieldmapperSearch ( osrfMethodContext* ctx, osrfHash* meta, osrfLogDebug(OSRF_LOG_MARK, "%s SQL = %s", MODULENAME, sql); dbi_result result = dbi_conn_query(dbhandle, sql); - osrfHash* dedup = osrfNewHash(); jsonObject* res_list = jsonParseString("[]"); if(result) { osrfLogDebug(OSRF_LOG_MARK, "Query returned with no errors"); + osrfHash* dedup = osrfNewHash(); if (dbi_result_first_row(result)) { /* JSONify the result */ @@ -2541,6 +2541,8 @@ static jsonObject* doFieldmapperSearch ( osrfMethodContext* ctx, osrfHash* meta, osrfLogDebug(OSRF_LOG_MARK, "%s returned no results for query %s", MODULENAME, sql); } + osrfHashFree(dedup); + /* clean up the query */ dbi_result_free(result); @@ -2556,12 +2558,10 @@ static jsonObject* doFieldmapperSearch ( osrfMethodContext* ctx, osrfHash* meta, *err = -1; free(sql); jsonObjectFree(res_list); - osrfHashFree(dedup); return jsonNULL; } - osrfHashFree(dedup); free(sql); if (res_list->size && order_hash) { -- 2.43.2