X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fcql.y;h=5041a3d183b08149e6824ac1d03c0dcd8ff1b659;hb=dceeaf843f3bd4c87d667ed62fd4b5446d934cff;hp=395389bcee36ef119b7be9afff3965e72a7285d0;hpb=9549afd48c2dc297f9bcd832d7ef9cea8c336f13;p=yaz-moved-to-github.git

diff --git a/src/cql.y b/src/cql.y
index 395389b..5041a3d 100644
--- a/src/cql.y
+++ b/src/cql.y
@@ -56,7 +56,7 @@
 %}
 
 %pure_parser
-%token DOTTERM TERM AND OR NOT PROX GE LE NE EXACT SORTBY
+%token PREFIX_NAME SIMPLE_STRING AND OR NOT PROX GE LE NE EXACT SORTBY
 
 %%
 
@@ -162,7 +162,7 @@ searchTerm extraTerms {
 ;
 
 extraTerms:
-extraTerms TERM {
+extraTerms SIMPLE_STRING {
     struct cql_node *st = cql_node_mk_sc(((CQL_parser) parm)->nmem, 
 					 /* index */ 0, /* rel */ 0, $2.buf);
     st->u.st.extra_terms = $1.cql;
@@ -173,7 +173,7 @@ extraTerms TERM {
 ;
 
 
-/* unary NOT search TERM here .. */
+/* unary NOT search SIMPLE_STRING here .. */
 
 boolean: 
   AND | OR | NOT | PROX ;
@@ -201,7 +201,7 @@ modifiers '/' searchTerm relation_symbol searchTerm
 }
 ;
 
-relation: DOTTERM | relation_symbol;
+relation: PREFIX_NAME | relation_symbol;
 
 relation_symbol:
   '=' 
@@ -217,8 +217,8 @@ index:
   searchTerm;
 
 searchTerm:
-  TERM
-| DOTTERM
+  SIMPLE_STRING
+| PREFIX_NAME
 | AND
 | OR
 | NOT
@@ -334,7 +334,7 @@ int yylex(YYSTYPE *lval, void *vp)
 	    putb(lval, cp, c);
         }
         putb(lval, cp, 0);
-	return TERM;
+	return SIMPLE_STRING;
     }
     else
     {
@@ -388,10 +388,12 @@ int yylex(YYSTYPE *lval, void *vp)
 	    relation_like = 1;
 	if (!cql_strcmp(lval->buf, "any"))
 	    relation_like = 1;
+	if (!cql_strcmp(lval->buf, "adj"))
+	    relation_like = 1;
 	if (relation_like)
-	    return DOTTERM;
+	    return PREFIX_NAME;
     }
-    return TERM;
+    return SIMPLE_STRING;
 }