From: Adam Dickmeiss <adam@indexdata.dk>
Date: Mon, 18 Jun 2012 14:15:33 +0000 (+0200)
Subject: nativesyntax "xml" is passed verbatim to ZOOM
X-Git-Tag: v1.6.15~13
X-Git-Url: http://jsfdemo.indexdata.com/cgi-bin?a=commitdiff_plain;h=f9c7c18836e77f24e8963d280676bc7943bf1dbb;p=pazpar2-moved-to-github.git

nativesyntax "xml" is passed verbatim to ZOOM

Before leading xml would ALWAYS be mapped to just "xml". Now
xml can be used as is or augmented with other things, such as
charset.
---

diff --git a/src/client.c b/src/client.c
index e6ddc66..c2187a9 100644
--- a/src/client.c
+++ b/src/client.c
@@ -412,16 +412,12 @@ static int nativesyntax_to_type(const char *s, char *type,
             const char *cp = strchr(s, ';');
             yaz_snprintf(type, 80, "xml; charset=%s", cp ? cp+1 : "marc-8s");
         }
-        else if (!strncmp(s, "xml", 3))
-        {
-            strcpy(type, "xml");
-        }
         else if (!strncmp(s, "txml", 4))
         {
             const char *cp = strchr(s, ';');
             yaz_snprintf(type, 80, "txml; charset=%s", cp ? cp+1 : "marc-8s");
         }
-        else
+        else /* pass verbatim to ZOOM - including "xml" */
             strcpy(type, s);
         return 0;
     }