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

diff --git a/src/cql.y b/src/cql.y
index b0b26e2..187cba1 100644
--- a/src/cql.y
+++ b/src/cql.y
@@ -1,6 +1,6 @@
-/* $Id: cql.y,v 1.10 2006-10-05 16:13:34 adam Exp $
-   Copyright (C) 2002-2004
-   Index Data Aps
+/* $Id: cql.y,v 1.13 2006-12-14 09:05:18 adam Exp $
+   Copyright (C) 2002-2006
+   Index Data ApS
 
 This file is part of the YAZ toolkit.
 
@@ -135,8 +135,7 @@ searchClause:
 /* unary NOT search TERM here .. */
 
 boolean: 
-  AND | OR | NOT | PROX 
-  ;
+  AND | OR | NOT | PROX ;
 
 modifiers: modifiers '/' searchTerm
 { 
@@ -299,13 +298,25 @@ int yylex(YYSTYPE *lval, void *vp)
         if (c != 0)
             cp->ungetbyte(c, cp->client_data);
         if (!cql_strcmp(lval->buf, "and"))
+	{
+	    lval->buf = "and";
             return AND;
+	}
         if (!cql_strcmp(lval->buf, "or"))
+	{
+	    lval->buf = "or";
             return OR;
+	}
         if (!cql_strcmp(lval->buf, "not"))
+	{
+	    lval->buf = "not";
             return NOT;
+	}
         if (!cql_strcmp(lval->buf, "prox"))
+	{
+	    lval->buf = "prox";
             return PROX;
+	}
     }
     return TERM;
 }