From: Adam Dickmeiss <adam@indexdata.dk>
Date: Thu, 19 Sep 2013 11:11:47 +0000 (+0200)
Subject: Merge branch 'master' into sru_2_0
X-Git-Tag: v5.0.0~32^2~4
X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=commitdiff_plain;h=a00add15f1d9f9a33d8f6fe2e5f3cb04171d8aa1;hp=b0c3ff462ce33f05398aef45cf83da3967ad2016

Merge branch 'master' into sru_2_0

Conflicts:
	IDMETA
---

diff --git a/client/client.c b/client/client.c
index 1c5523b..56178da 100644
--- 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/src/record_render.c b/src/record_render.c
index 82da22c..bcd4c39 100644
--- 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(