From a85318e88468026d7704f527fbe45010c5e24e91 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Wed, 13 Feb 2013 13:18:18 +0100 Subject: [PATCH] Rename handle_facet_list to ZOOM_handle_facet_list --- src/zoom-p.h | 1 + src/zoom-sru.c | 4 +--- src/zoom-z3950.c | 5 +++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/zoom-p.h b/src/zoom-p.h index 5959a31..b205905 100644 --- a/src/zoom-p.h +++ b/src/zoom-p.h @@ -285,6 +285,7 @@ ZOOM_Event ZOOM_connection_get_event(ZOOM_connection c); void ZOOM_connection_remove_events(ZOOM_connection c); void ZOOM_Event_destroy(ZOOM_Event event); zoom_ret ZOOM_send_GDU(ZOOM_connection c, Z_GDU *gdu); +void ZOOM_handle_facet_list(ZOOM_resultset r, Z_FacetList *fl); /* * Local variables: diff --git a/src/zoom-sru.c b/src/zoom-sru.c index c3328fe..3e668a4 100644 --- a/src/zoom-sru.c +++ b/src/zoom-sru.c @@ -18,8 +18,6 @@ #include #include -void handle_facet_list(ZOOM_resultset r, Z_FacetList *fl); - #if YAZ_HAVE_XML2 static void set_SRU_error(ZOOM_connection c, Z_SRW_diagnostic *d) { @@ -267,7 +265,7 @@ static zoom_ret handle_srw_response(ZOOM_connection c, c->tasks->u.search.recv_search_fired = 1; } if (res->facetList) - handle_facet_list(resultset, res->facetList); + ZOOM_handle_facet_list(resultset, res->facetList); break; case ZOOM_TASK_RETRIEVE: resultset = c->tasks->u.retrieve.resultset; diff --git a/src/zoom-z3950.c b/src/zoom-z3950.c index 070feab..bea3125 100644 --- a/src/zoom-z3950.c +++ b/src/zoom-z3950.c @@ -1117,7 +1117,8 @@ static ZOOM_facet_field get_zoom_facet_field(ODR odr, Z_FacetField *facet) { } /* Can be share with SOLR/SRU/SRW requests */ -void handle_facet_list(ZOOM_resultset r, Z_FacetList *fl) { +void ZOOM_handle_facet_list(ZOOM_resultset r, Z_FacetList *fl) +{ int j; r->num_facets = fl->num; yaz_log(YLOG_DEBUG, "Facets found: %d", fl->num); @@ -1143,7 +1144,7 @@ static void handle_facet_result(ZOOM_connection c, ZOOM_resultset r, Z_External *ext = o->list[i]->information.externallyDefinedInfo; if (ext->which == Z_External_userFacets) { - handle_facet_list(r, ext->u.facetList); + ZOOM_handle_facet_list(r, ext->u.facetList); } } } -- 1.7.10.4