X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fcql.y;h=b0b26e2cc9d69bd8ef434efb6477a0de120c2b24;hb=4d377a28c907f9fee3f576f32d96020fb7a8436c;hp=1086549135ef97bed750f6856ca3c96d8abe41f4;hpb=87ca9b11fd146605fc3b54fcafbcad9869487295;p=yaz-moved-to-github.git

diff --git a/src/cql.y b/src/cql.y
index 1086549..b0b26e2 100644
--- a/src/cql.y
+++ b/src/cql.y
@@ -1,4 +1,4 @@
-/* $Id: cql.y,v 1.8 2004-11-01 20:13:02 adam Exp $
+/* $Id: cql.y,v 1.10 2006-10-05 16:13:34 adam Exp $
    Copyright (C) 2002-2004
    Index Data Aps
 
@@ -286,26 +286,25 @@ int yylex(YYSTYPE *lval, void *vp)
     }
     else
     {
-        putb(lval, cp, c);
-        while ((c = cp->getbyte(cp->client_data)) != 0 &&
-               !strchr(" \n()=<>/", c))
+        while (c != 0 && !strchr(" \n()=<>/", c))
         {
             if (c == '\\')
                 c = cp->getbyte(cp->client_data);
             putb(lval, cp, c);
+	    c = cp->getbyte(cp->client_data);
         }
 #if YYDEBUG
         printf ("got %s\n", lval->buf);
 #endif
         if (c != 0)
             cp->ungetbyte(c, cp->client_data);
-        if (!strcmp(lval->buf, "and"))
+        if (!cql_strcmp(lval->buf, "and"))
             return AND;
-        if (!strcmp(lval->buf, "or"))
+        if (!cql_strcmp(lval->buf, "or"))
             return OR;
-        if (!strcmp(lval->buf, "not"))
+        if (!cql_strcmp(lval->buf, "not"))
             return NOT;
-        if (!strncmp(lval->buf, "prox", 4))
+        if (!cql_strcmp(lval->buf, "prox"))
             return PROX;
     }
     return TERM;