X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=ztest%2Fztest.c;h=50872a34993ccbd8bd9eb5cc7de7813161f5d9f4;hp=d5e5d2769fef96796f2858917b02b949ce2d65ca;hb=b3b11da5d7ad0d762d85ca912351351b7181d4d7;hpb=be042bc51e825a53074dc1b586f1fff0a002ab0b

diff --git a/ztest/ztest.c b/ztest/ztest.c
index d5e5d27..50872a3 100644
--- a/ztest/ztest.c
+++ b/ztest/ztest.c
@@ -232,13 +232,13 @@ static void addterms(ODR odr, Z_FacetField *facet_field, const char *facet_name)
     int index;
     int freq = 100;
     int length = strlen(facet_name) + 10;
-    char key[length];
+    char *key = odr_malloc(odr, length);
     key[0] = '\0';
     for (index = 0; index < facet_field->num_terms; index++) {
         Z_Term *term;
         Z_FacetTerm *facet_term;
-        // sprintf(key, "%s%d", facet_name, index);
-        //yaz_log(YLOG_DEBUG, "facet add term %s %d %s", facet_name, index, key);
+        sprintf(key, "%s%d", facet_name, index);
+        yaz_log(YLOG_DEBUG, "facet add term %s %d %s", facet_name, index, key);
         term = term_create(odr, key);
         facet_term = facet_term_create(odr, term, freq);
         freq = freq - 10 ;
@@ -251,19 +251,23 @@ Z_OtherInformation *build_facet_response(ODR odr, Z_FacetList *facet_list) {
     Z_FacetList *new_list = facet_list_create(odr, facet_list->num);
 
     for (index = 0; index < facet_list->num; index++) {
-        struct attrvalues attrvalues;
-        facet_struct_init(&attrvalues);
+        struct yaz_facet_attr attrvalues;
+        yaz_facet_attr_init(&attrvalues);
         attrvalues.limit = 10;
-        yaz_log(YLOG_LOG, "Attributes: %s %s %d ", attrvalues.useattr, attrvalues.useattrbuff, attrvalues.limit);
-        facetattrs(facet_list->elements[index]->attributes, &attrvalues);
-        yaz_log(YLOG_LOG, "Attributes: %s %s %d ", attrvalues.useattr, attrvalues.useattrbuff, attrvalues.limit);
+        yaz_facet_attr_get_z_attributes(facet_list->elements[index]->attributes,
+                                        &attrvalues);
+        yaz_log(YLOG_LOG, "Attributes: %s %d ", attrvalues.useattr, attrvalues.limit);
         if (attrvalues.errstring)
             yaz_log(YLOG_LOG, "Error parsing attributes: %s", attrvalues.errstring);
-        if (attrvalues.limit > 0) {
+        if (attrvalues.limit > 0 && attrvalues.useattr) {
             new_list->elements[new_index] = facet_field_create(odr, facet_list->elements[index]->attributes, attrvalues.limit);
             addterms(odr, new_list->elements[new_index], attrvalues.useattr);
             new_index++;
         }
+        else {
+            yaz_log(YLOG_DEBUG, "Facet: skipping %s due to 0 limit.", attrvalues.useattr);
+        }
+
     }
     new_list->num = new_index;
     if (new_index > 0) {
@@ -275,6 +279,8 @@ Z_OtherInformation *build_facet_response(ODR odr, Z_FacetList *facet_list) {
         oiu->which = Z_OtherInfo_externallyDefinedInfo;
         oiu->information.externallyDefinedInfo = odr_malloc(odr, sizeof(*oiu->information.externallyDefinedInfo));
         oiu->information.externallyDefinedInfo->direct_reference = odr_oiddup(odr, yaz_oid_userinfo_facet_1);
+        oiu->information.externallyDefinedInfo->descriptor = 0;
+        oiu->information.externallyDefinedInfo->indirect_reference = 0;
         oiu->information.externallyDefinedInfo->which = Z_External_userFacets;
         oiu->information.externallyDefinedInfo->u.facetList = new_list;
         oi->list[0] = oiu;
@@ -390,9 +396,7 @@ int ztest_search(void *handle, bend_search_rr *rr)
 
     if (1)
     {
-        /* TODO Not general. Only handles one (Facet) OtherInformation. Overwrite  */
-        Z_FacetList *facet_list = extract_facet_request(rr->stream, rr->search_input);
-
+        Z_FacetList *facet_list = yaz_oi_get_facetlist(&rr->search_input);
         if (facet_list) {
             yaz_log(YLOG_LOG, "%d Facets in search request.", facet_list->num);
             rr->search_info = build_facet_response(rr->stream, facet_list);