From: Adam Dickmeiss <adam@indexdata.dk>
Date: Fri, 20 Sep 2013 07:20:28 +0000 (+0200)
Subject: Merge branch 'sru_2_0' of ssh://git.indexdata.com/home/git/pub/yaz into sru_2_0
X-Git-Tag: v5.0.0~32
X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=commitdiff_plain;h=eeff5ede530161a722200afb3d0042e66c954169;hp=c6f7e21560c74ac3cd856c5d0bf9120fc2dfce9f

Merge branch 'sru_2_0' of ssh://git.indexdata.com/home/git/pub/yaz into sru_2_0
---

diff --git a/client/client.c b/client/client.c
index 56178da..b6c720e 100644
--- a/client/client.c
+++ b/client/client.c
@@ -253,9 +253,12 @@ static void add_otherInfos(Z_APDU *a)
     Z_OtherInformation **oi;
     int i;
 
-    yaz_oi_APDU(a, &oi);
-    if (facet_list)
+    if (facet_list && a->which == Z_APDU_searchRequest)
+    {
+        oi = &a->u.searchRequest->additionalSearchInfo;
         yaz_oi_set_facetlist(oi, out, facet_list);
+    }
+    yaz_oi_APDU(a, &oi);
     for (i = 0; i < maxOtherInfosSupported; ++i)
     {
         if (oid_oidlen(extraOtherInfos[i].oid) > 0)
diff --git a/src/zoom-z3950.c b/src/zoom-z3950.c
index fe86050..69d6dbe 100644
--- a/src/zoom-z3950.c
+++ b/src/zoom-z3950.c
@@ -670,8 +670,7 @@ zoom_ret ZOOM_connection_Z3950_send_search(ZOOM_connection c)
     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);
+            Z_OtherInformation **oi = &search_req->additionalSearchInfo;
             yaz_oi_set_facetlist(oi, c->odr_out, facet_list);
         }
         else