X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=ccl%2Fccltoken.c;h=e530e1138faad8ea901f30c3bb1586a7c536e6c6;hb=4d531a1a9131d69c3b6c27fbac42837e22cff61c;hp=afbac9c2e29081b4ed848d8979e27e3c6709e078;hpb=6f41c38bc479344d4ecd347a607546dc95971efa;p=yaz-moved-to-github.git

diff --git a/ccl/ccltoken.c b/ccl/ccltoken.c
index afbac9c..e530e11 100644
--- a/ccl/ccltoken.c
+++ b/ccl/ccltoken.c
@@ -44,7 +44,7 @@
 /* CCL - lexical analysis
  * Europagate, 1995
  *
- * $Id: ccltoken.c,v 1.19 2002-06-06 12:54:24 adam Exp $
+ * $Id: ccltoken.c,v 1.21 2002-12-28 12:13:03 adam Exp $
  *
  * Old Europagate Log:
  *
@@ -244,7 +244,7 @@ struct ccl_token *ccl_parser_tokenize (CCL_parser cclp, const char *command)
 	case '%':
 	case '!':
 	    last->kind = CCL_TOK_PROX;
-	    while (*cp == '%' || *cp == '!')
+            while (isdigit(*cp))
 	    {
 		++ last->len;
 		cp++;
@@ -277,9 +277,9 @@ struct ccl_token *ccl_parser_tokenize (CCL_parser cclp, const char *command)
 		cp++;
 	    break;
 	default:
-	    if (!strchr ("(),%!><=- \t\n\r", cp[-1]))
+	    if (!strchr ("(),%!><= \t\n\r", cp[-1]))
 	    {
-		while (*cp && !strchr ("(),%!><=- \t\n\r", *cp))
+		while (*cp && !strchr ("(),%!><= \t\n\r", *cp))
 		{
 		    cp++;
 		    ++ last->len;