Move otherinfo facet stuff to facet.c

[yaz-moved-to-github.git] / client / client.c

diff --git a/client/client.c b/client/client.c
index 2331307..36e328d 100644 (file)
--- a/client/client.c
+++ b/client/client.c
@@ -245,14 +245,12 @@ static void do_hex_dump(const char* buf, size_t len)
 void add_otherInfos(Z_APDU *a)
 {
     Z_OtherInformation **oi;
-    int i = 0;
+    int i;
 
     yaz_oi_APDU(a, &oi);
-    if (facet_list) {
-        yaz_oi_set_facetlist_oid(oi, out, yaz_oid_userinfo_facet_1, 1, facet_list);
-        i++;
-    }
-    for(; i<maxOtherInfosSupported; ++i)
+    if (facet_list)
+        yaz_oi_set_facetlist(oi, out, facet_list);
+    for (i = 0; i < maxOtherInfosSupported; ++i)
     {
         if (oid_oidlen(extraOtherInfos[i].oid) > 0)
             yaz_oi_set_string_oid(oi, out, extraOtherInfos[i].oid,
@@ -1649,13 +1647,13 @@ static void display_queryExpression(const char *lead, Z_QueryExpression *qe)
 static void display_facet(Z_FacetField *facet) {
     if (facet->attributes) {
         Z_AttributeList *al = facet->attributes;
-        struct attrvalues attr_values;
+        struct yaz_facet_attr attr_values;
         attr_values.errcode = 0;
         attr_values.limit = -1;
         attr_values.useattr = 0;
         attr_values.relation = "default";
 
-        facetattrs(al, &attr_values);
+        yaz_facet_attr_get_z_attributes(al, &attr_values);
         if (!attr_values.errcode) {
             int term_index;
             printf("  %s (%d): \n", attr_values.useattr, /* attr_values.relation, attr_values.limit, */ facet->num_terms);