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

diff --git a/src/cql.y b/src/cql.y
index 395389b..cf6995e 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,10 +162,10 @@ searchTerm extraTerms {
 ;
 
 extraTerms:
-extraTerms TERM {
+SIMPLE_STRING extraTerms {
     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;
+					 /* index */ 0, /* rel */ 0, $1.buf);
+    st->u.st.extra_terms = $2.cql;
     $$.cql = st;
 }
 | 
@@ -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
@@ -245,7 +245,7 @@ static void putb(YYSTYPE *lval, CQL_parser cp, int c)
     {
         char *nb = (char *)
 	    nmem_malloc(cp->nmem, (lval->size = lval->len * 2 + 20));
-        memcpy (nb, lval->buf, lval->len);
+        memcpy(nb, lval->buf, lval->len);
         lval->buf = nb;
     }
     if (c)
@@ -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;
 }
 
 
@@ -413,7 +415,7 @@ int cql_parser_stream(CQL_parser cp,
 
 CQL_parser cql_parser_create(void)
 {
-    CQL_parser cp = (CQL_parser) xmalloc (sizeof(*cp));
+    CQL_parser cp = (CQL_parser) xmalloc(sizeof(*cp));
 
     cp->top = 0;
     cp->getbyte = 0;