From f9c7c18836e77f24e8963d280676bc7943bf1dbb Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Mon, 18 Jun 2012 16:15:33 +0200 Subject: [PATCH] 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. --- src/client.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) 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; } -- 1.7.10.4