X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fzoom-c.c;h=4ed5d8d5cab941a0a7673c21132718a670af3384;hp=56d631f435715028e351fc385698e95d57a87e6e;hb=b56b6242e4e9c0011b9a2dae6d67c3ef0789251f;hpb=3d536728dae01844f9a2b89337eb3b3fdb759382 diff --git a/src/zoom-c.c b/src/zoom-c.c index 56d631f..4ed5d8d 100644 --- a/src/zoom-c.c +++ b/src/zoom-c.c @@ -27,6 +27,7 @@ #include #include #include +#include #include @@ -906,6 +907,9 @@ ZOOM_resultset ZOOM_resultset_create(void) r->connection = 0; r->databaseNames = 0; r->num_databaseNames = 0; + r->facets = 0; + r->num_facets = 0; + r->facets_names = 0; r->mutex = 0; yaz_mutex_create(&r->mutex); #if SHPTR @@ -1254,6 +1258,56 @@ ZOOM_API(void) } } +ZOOM_API(size_t) + ZOOM_resultset_facets_size(ZOOM_resultset r) { + return r->num_facets; +} + +ZOOM_API(ZOOM_facet_field) + ZOOM_resultset_get_facet_field(ZOOM_resultset r, const char *name) { + int num = r->num_facets; + ZOOM_facet_field *facets = r->facets; + int index; + for (index = 0; index < num; index++) { + if (!strcmp(facets[index]->facet_name, name)) { + return facets[index]; + } + } + return 0; +} + + +ZOOM_API(ZOOM_facet_field *) + ZOOM_resultset_facets(ZOOM_resultset r) +{ + return r->facets; +} + +ZOOM_API(const char**) + ZOOM_resultset_facet_names(ZOOM_resultset r) +{ + return (const char **) r->facets_names; +} + +ZOOM_API(const char*) + ZOOM_facet_field_name(ZOOM_facet_field field) +{ + return field->facet_name; +} + +ZOOM_API(size_t) + ZOOM_facet_field_term_count(ZOOM_facet_field field) +{ + return field->num_terms; +} + +ZOOM_API(const char*) + ZOOM_facet_field_get_term(ZOOM_facet_field field, size_t idx, int *freq) { + *freq = field->facet_terms[idx].frequency; + return field->facet_terms[idx].term; +} + + static void get_cert(ZOOM_connection c) { char *cert_buf; @@ -1677,6 +1731,7 @@ static zoom_ret ZOOM_connection_send_search(ZOOM_connection c) const char *elementSetName; const char *smallSetElementSetName; const char *mediumSetElementSetName; + const char *facets; assert(c->tasks); assert(c->tasks->which == ZOOM_TASK_SEARCH); @@ -1698,6 +1753,18 @@ static zoom_ret ZOOM_connection_send_search(ZOOM_connection c) if (!mediumSetElementSetName) mediumSetElementSetName = elementSetName; + facets = ZOOM_options_get(r->options, "facets"); + if (facets) { + Z_FacetList *facet_list = yaz_pqf_parse_facet_list(c->odr_out, facets); + if (facet_list) { + Z_OtherInformation **oi; + yaz_oi_APDU(apdu, &oi); + if (facet_list) { + yaz_oi_set_facetlist_oid(oi, c->odr_out, yaz_oid_userinfo_facet_1, 1, facet_list); + } + } + } + assert(r); assert(r->query); @@ -2546,7 +2613,7 @@ static void handle_queryExpression(ZOOM_options opt, const char *name, } } -static void handle_searchResult(ZOOM_connection c, ZOOM_resultset resultset, +static void handle_search_result(ZOOM_connection c, ZOOM_resultset resultset, Z_OtherInformation *o) { int i; @@ -2614,6 +2681,68 @@ static void handle_searchResult(ZOOM_connection c, ZOOM_resultset resultset, } } +static char *get_term_cstr(ODR odr, Z_Term *term) { + + switch (term->which) { + case Z_Term_general: + return odr_strdupn(odr, (const char *) term->u.general->buf, (size_t) term->u.general->len); + break; + case Z_Term_characterString: + return odr_strdup(odr, term->u.characterString); + } + return 0; +} + +static ZOOM_facet_field get_zoom_facet_field(ODR odr, Z_FacetField *facet) { + int term_index; + struct yaz_facet_attr attr_values; + ZOOM_facet_field facet_field = odr_malloc(odr, sizeof(*facet_field)); + yaz_facet_attr_init(&attr_values); + yaz_facet_attr_get_z_attributes(facet->attributes, &attr_values); + facet_field->facet_name = odr_strdup(odr, attr_values.useattr); + facet_field->num_terms = facet->num_terms; + yaz_log(YLOG_DEBUG, "ZOOM_facet_field %s %d terms %d", attr_values.useattr, attr_values.limit, facet->num_terms); + facet_field->facet_terms = odr_malloc(odr, facet_field->num_terms * sizeof(*facet_field->facet_terms)); + for (term_index = 0 ; term_index < facet->num_terms; term_index++) { + Z_FacetTerm *facetTerm = facet->terms[term_index]; + facet_field->facet_terms[term_index].frequency = *facetTerm->count; + facet_field->facet_terms[term_index].term = get_term_cstr(odr, facetTerm->term); + yaz_log(YLOG_DEBUG, " term[%d] %s %d", + term_index, facet_field->facet_terms[term_index].term, facet_field->facet_terms[term_index].frequency); + } + return facet_field; +} + +static void handle_facet_result(ZOOM_connection c, ZOOM_resultset r, + Z_OtherInformation *o) +{ + int i; + for (i = 0; o && i < o->num_elements; i++) + { + if (o->list[i]->which == Z_OtherInfo_externallyDefinedInfo) + { + Z_External *ext = o->list[i]->information.externallyDefinedInfo; + if (ext->which == Z_External_userFacets) + { + int j; + Z_FacetList *fl = ext->u.facetList; + r->num_facets = fl->num; + yaz_log(YLOG_DEBUG, "Facets found: %d", fl->num); + r->facets = odr_malloc(r->odr, r->num_facets * sizeof(*r->facets)); + r->facets_names = odr_malloc(r->odr, r->num_facets * sizeof(*r->facets_names)); + for (j = 0; j < fl->num; j++) + { + r->facets[j] = get_zoom_facet_field(r->odr, fl->elements[j]); + if (!r->facets[j]) + yaz_log(YLOG_DEBUG, "Facet field missing on index %d !", j); + r->facets_names[j] = (char *) ZOOM_facet_field_name(r->facets[j]); + } + } + } + } +} + + static void handle_search_response(ZOOM_connection c, Z_SearchResponse *sr) { ZOOM_resultset resultset; @@ -2637,7 +2766,9 @@ static void handle_search_response(ZOOM_connection c, Z_SearchResponse *sr) ZOOM_options_set_int(resultset->options, "presentStatus", *sr->presentStatus); } - handle_searchResult(c, resultset, sr->additionalSearchInfo); + handle_search_result(c, resultset, sr->additionalSearchInfo); + + handle_facet_result(c, resultset, sr->additionalSearchInfo); resultset->size = *sr->resultCount; handle_records(c, sr->records, 0);