Merge branch 'master' into sru_2_0

Conflicts:
	IDMETA
	debian/changelog
	debian/rules

diff --git a/NEWS b/NEWS
index d6e820b..f67c855 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,15 @@
+--- 4.2.67 2013/09/19 
+
+Don't decode MAB as MARC. Just like we don't attempt to decode
+HTML/XML as MARC. Fixes MAB display problem that was introduced in 4.2.64.
+
+CCL: allow quoted terms for date ranges. YAZ-681
+
+Introduce ccl_parser_qual_search. This function makes old function
+ccl_qual_search, from YAZ 2, available again.
+
+Add yaz_facet_list_to_wrbuf. YAZ-683
+
 --- 4.2.66 2013/09/11
 
 ZOOM: fix record handling for Solr. ZOOM_record_get would return 0, if

diff --git a/client/client.c b/client/client.c
index 1c5523b..56178da 100644 (file)
--- a/client/client.c
+++ b/client/client.c
@@ -923,7 +923,10 @@ static void display_record(Z_External *r)
             || !oid_oidcmp(oid, yaz_oid_recsyn_html))
         {
             print_xml_record(octet_buf, octet_len);
-
+        }
+        else if (!oid_oidcmp(oid, yaz_oid_recsyn_mab))
+        {
+            print_record(octet_buf, octet_len);
         }
         else
         {

diff --git a/debian/changelog b/debian/changelog
index c1701b0..5f2412f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,12 @@ yaz (5.0.0-1indexdata) unstable; urgency=low
 
  -- Adam Dickmeiss <adam@indexdata.dk>  Wed, 11 Sep 2013 09:26:11 +0200
 
+yaz (4.2.67-1indexdata) unstable; urgency=low
+
+  * Upstram.
+
+ -- Adam Dickmeiss <adam@indexdata.dk>  Thu, 19 Sep 2013 13:19:07 +0200
+
 yaz (4.2.66-1indexdata) unstable; urgency=low
 
   * Upstream.

diff --git a/doc/tools.xml b/doc/tools.xml
index 1fce518..242cdae 100644 (file)
--- a/doc/tools.xml
+++ b/doc/tools.xml
@@ -686,8 +686,8 @@
 
          <row><entry><literal>s=ag</literal></entry><entry>
            Tokens that appears as phrases (with blank in them) gets
-           structure phrase attached. Tokens that appers as words
-           gets structure phrase attached. Phrases and words are
+           structure phrase attached (4=1). Tokens that appear to be words
+           gets structure word attached (4=2). Phrases and words are
            ANDed. This is a variant of s=al and s=pw, with the main
            difference that words are not split (with operator AND)
            but instead kept in one RPN token. This facility appeared

diff --git a/src/record_render.c b/src/record_render.c
index 82da22c..bcd4c39 100644 (file)
--- a/src/record_render.c
+++ b/src/record_render.c
@@ -169,6 +169,7 @@ static const char *return_record_wrbuf(WRBUF wrbuf, int *len,
     {
         if (oid_oidcmp(oid, yaz_oid_recsyn_xml)
             && oid_oidcmp(oid, yaz_oid_recsyn_application_xml)
+            && oid_oidcmp(oid, yaz_oid_recsyn_mab)
             && oid_oidcmp(oid, yaz_oid_recsyn_html))
         {
             const char *ret_buf = return_marc_record(

diff --git a/src/seshigh.c b/src/seshigh.c
index a9a3cba..d357095 100644 (file)
--- a/src/seshigh.c
+++ b/src/seshigh.c
@@ -2681,7 +2681,9 @@ static Z_APDU *process_searchRequest(association *assoc, request *reqb)
         bsrr->errcode = 0;
         bsrr->errstring = NULL;
         bsrr->search_info = NULL;
-        bsrr->search_input = req->otherInfo;
+        bsrr->search_input = req->additionalSearchInfo;
+        if (!bsrr->search_input)
+            bsrr->search_input = req->otherInfo;
         bsrr->present_number = *req->mediumSetPresentNumber;
 
         if (assoc->server && assoc->server->cql_transform