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

diff --git a/src/main/java/org/z3950/zing/cql/CQLParser.java b/src/main/java/org/z3950/zing/cql/CQLParser.java
index 90e9f59..b8f2ef9 100644
--- a/src/main/java/org/z3950/zing/cql/CQLParser.java
+++ b/src/main/java/org/z3950/zing/cql/CQLParser.java
@@ -19,9 +19,9 @@ import java.io.FileNotFoundException;
 public class CQLParser {
     private CQLLexer lexer;
     private int compat;	// When false, implement CQL 1.2
-    public static int V1POINT1 = 12368;
-    public static int V1POINT2 = 12369;
-    public static int V1POINT1SORT = 12370;
+    public static final int V1POINT1 = 12368;
+    public static final int V1POINT2 = 12369;
+    public static final int V1POINT1SORT = 12370;
 
     static private boolean DEBUG = false;
     static private boolean LEXDEBUG = false;
@@ -206,7 +206,7 @@ public class CQLParser {
 	    relation = new CQLRelation(relstr);
 	    match(lexer.ttype);
 	    ModifierSet ms = gatherModifiers(relstr);
-	    relation.setModifiers(ms);
+	    relation.ms = ms;
 	    debug("index='" + index + ", " +
 		  "relation='" + relation.toCQL() + "'");
 	}
@@ -245,7 +245,7 @@ public class CQLParser {
              lexer.sval.equals("all") ||
              lexer.sval.equals("within") ||
              lexer.sval.equals("encloses") ||
-             (lexer.sval.equals("exact") && compat != V1POINT2) ||
+             lexer.sval.equals("exact") ||
              (lexer.sval.equals("scr") && compat != V1POINT2) ||
              (lexer.sval.equals("adj") && compat == V1POINT2)))
           return true;