X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fcclptree.c;h=3ceb4871829c87fc557f04103af60c1cbe9298d7;hp=1bbcaad7db9d7ad528c3f270e3a7217734bd3bce;hb=4f3bcae93d51a26709c12b51261c3d95af610cb2;hpb=1fbd038d97d6e1bfe97270ecc17cca123bcc435c

diff --git a/src/cclptree.c b/src/cclptree.c
index 1bbcaad..3ceb487 100644
--- a/src/cclptree.c
+++ b/src/cclptree.c
@@ -15,9 +15,9 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <ctype.h>
 
 #include <yaz/querytowrbuf.h>
+#include <yaz/yaz-iconv.h>
 #include <yaz/ccl.h>
 
 static void ccl_pquery_indent(WRBUF w, struct ccl_rpn_node *p, int indent);
@@ -45,7 +45,7 @@ static void ccl_pquery_complex(WRBUF w, struct ccl_rpn_node *p, int indent)
             if (*cp == '!')
             {   
                 /* word order specified */
-                if (isdigit(((const unsigned char *) cp)[1]))
+                if (yaz_isdigit(cp[1]))
                     wrbuf_printf(w, "@prox 0 %s 1 2 k 2", cp+1);
                 else
                     wrbuf_printf(w, "@prox 0 1 1 2 k 2");
@@ -53,7 +53,7 @@ static void ccl_pquery_complex(WRBUF w, struct ccl_rpn_node *p, int indent)
             else if (*cp == '%')
             {
                 /* word order not specified */
-                if (isdigit(((const unsigned char *) cp)[1]))
+                if (yaz_isdigit(cp[1]))
                     wrbuf_printf(w, "@prox 0 %s 0 2 k 2", cp+1);
                 else
                     wrbuf_printf(w, "@prox 0 1 0 2 k 2");