X-Git-Url: http://git.indexdata.com/?p=cql-java-moved-to-github.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fz3950%2Fzing%2Fcql%2FCQLParser.java;h=90e9f59a5c45b9a2e9bb31e9ac4531f1d5f2b8df;hp=25b49d083f76bb669ab9a50f7906494f79355401;hb=67054ebf3e57c9570fab3d6e2c962f816487848e;hpb=801e980014525774921192500be1430dc3645454

diff --git a/src/main/java/org/z3950/zing/cql/CQLParser.java b/src/main/java/org/z3950/zing/cql/CQLParser.java
index 25b49d0..90e9f59 100644
--- a/src/main/java/org/z3950/zing/cql/CQLParser.java
+++ b/src/main/java/org/z3950/zing/cql/CQLParser.java
@@ -241,10 +241,13 @@ public class CQLParser {
 	      " (" + lexer.render() + ")");
         if (lexer.ttype == lexer.TT_WORD &&
             (lexer.sval.indexOf('.') >= 0 ||
-             lexer.sval.equals("exact") ||
              lexer.sval.equals("any") ||
              lexer.sval.equals("all") ||
-             (lexer.sval.equals("scr") && compat == V1POINT2)))
+             lexer.sval.equals("within") ||
+             lexer.sval.equals("encloses") ||
+             (lexer.sval.equals("exact") && compat != V1POINT2) ||
+             (lexer.sval.equals("scr") && compat != V1POINT2) ||
+             (lexer.sval.equals("adj") && compat == V1POINT2)))
           return true;
 
         return isSymbolicRelation();