X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fzoom-c.c;h=d42e3941b229d2b8b349c504dec1fdc21eb4f71c;hb=3dc0c503f9594142c8568fabb2c8e354377251ef;hp=948a1de903d2f91d4168eb24dee2363a63f9a2ec;hpb=8d00bb643c800e61f47f7c26a5d489d4e6346229;p=yaz-moved-to-github.git

diff --git a/src/zoom-c.c b/src/zoom-c.c
index 948a1de..d42e394 100644
--- a/src/zoom-c.c
+++ b/src/zoom-c.c
@@ -908,6 +908,7 @@ ZOOM_resultset ZOOM_resultset_create(void)
     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);
@@ -1262,6 +1263,19 @@ ZOOM_API(size_t)
     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)
@@ -1746,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);
             }
         }
     }
@@ -2681,17 +2695,20 @@ 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);
     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;
 }
@@ -2710,11 +2727,14 @@ static void handle_facet_result(ZOOM_connection c, ZOOM_resultset r,
                 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]);
                 }
             }