From: Mike Taylor Date: Tue, 27 Jul 2010 16:20:57 +0000 (+0100) Subject: Reinstate the "exact" relation even when v1.2 is in effect (the X-Git-Tag: v1.7~4 X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=1387063d408c45ec66e3c21f0e4dcf5cf211beb9;p=cql-java-moved-to-github.git Reinstate the "exact" relation even when v1.2 is in effect (the default), despite its removal from v1.2 of CQL. In practice, it seems to be in fairly widespread use, and little real purpose is served in removing it. --- diff --git a/src/main/java/org/z3950/zing/cql/CQLParser.java b/src/main/java/org/z3950/zing/cql/CQLParser.java index 90e9f59..cf1272c 100644 --- a/src/main/java/org/z3950/zing/cql/CQLParser.java +++ b/src/main/java/org/z3950/zing/cql/CQLParser.java @@ -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;