X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fzoom-c.c;h=d42e3941b229d2b8b349c504dec1fdc21eb4f71c;hb=3dc0c503f9594142c8568fabb2c8e354377251ef;hp=b483fd934dde9756f8c0417498bf92c0734e1ce0;hpb=66490c4cd60228c4036596003a8f24373cbd0fd8;p=yaz-moved-to-github.git diff --git a/src/zoom-c.c b/src/zoom-c.c index b483fd9..d42e394 100644 --- a/src/zoom-c.c +++ b/src/zoom-c.c @@ -1760,7 +1760,7 @@ static zoom_ret ZOOM_connection_send_search(ZOOM_connection c) 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); + yaz_oi_set_facetlist(oi, c->odr_out, facet_list); } } } @@ -2695,10 +2695,10 @@ static char *get_term_cstr(ODR odr, Z_Term *term) { static ZOOM_facet_field get_zoom_facet_field(ODR odr, Z_FacetField *facet) { int term_index; - struct attrvalues attr_values; + struct yaz_facet_attr attr_values; ZOOM_facet_field facet_field = odr_malloc(odr, sizeof(*facet_field)); - memset(&attr_values, 0, sizeof(attr_values)); - facetattrs(facet->attributes, &attr_values); + 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);