From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 17 May 2011 10:31:07 +0000 (+0200)
Subject: Use yaz_utf8_check
X-Git-Tag: v1.5.7~13^2~18
X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=910d87220b571e57a9e97a45f6a62a9f68381f77;p=pazpar2-moved-to-github.git

Use yaz_utf8_check
---

diff --git a/src/http_command.c b/src/http_command.c
index eb799f0..e171cc9 100644
--- a/src/http_command.c
+++ b/src/http_command.c
@@ -1096,31 +1096,6 @@ static void cmd_ping(struct http_channel *c)
     release_session(c, s);
 }
 
-static int utf_8_valid(const char *str)
-{
-    yaz_iconv_t cd = yaz_iconv_open("utf-8", "utf-8");
-    if (cd)
-    {
-        /* check that query is UTF-8 encoded */
-        char *inbuf = (char *) str; /* we know iconv does not alter this */
-        size_t inbytesleft = strlen(inbuf);
-
-        size_t outbytesleft = strlen(inbuf) + 10;
-        char *out = xmalloc(outbytesleft);
-        char *outbuf = out;
-        size_t r = yaz_iconv(cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft);
-
-        /* if OK, try flushing the rest  */
-        if (r != (size_t) (-1))
-            r = yaz_iconv(cd, 0, 0, &outbuf, &outbytesleft);
-        yaz_iconv_close(cd);
-        xfree(out);
-        if (r == (size_t) (-1))
-            return 0;
-    }
-    return 1;
-}
-
 static void cmd_search(struct http_channel *c)
 {
     struct http_request *rq = c->request;
@@ -1141,7 +1116,7 @@ static void cmd_search(struct http_channel *c)
         release_session(c,s);
         return;
     }
-    if (!utf_8_valid(query))
+    if (!yaz_utf8_check(query))
     {
         error(rs, PAZPAR2_MALFORMED_PARAMETER_ENCODING, "query");
         release_session(c,s);