Add new and more general isRelation() that recognises well-known word relations.

diff --git a/src/main/java/org/z3950/zing/cql/CQLParser.java b/src/main/java/org/z3950/zing/cql/CQLParser.java
index 7580959..dab0e80 100644 (file)
--- a/src/main/java/org/z3950/zing/cql/CQLParser.java
+++ b/src/main/java/org/z3950/zing/cql/CQLParser.java
@@ -231,7 +231,19 @@ public class CQLParser {
        return new CQLPrefixNode(name, identifier, node);
     }
 
-    // Checks for a relation
+    private boolean isRelation() {
+       debug("isRelation: checking ttype=" + lexer.ttype +
+             " (" + lexer.render() + ")");
+        if (lexer.ttype == lexer.TT_WORD &&
+            (lexer.sval == "exact" ||
+             lexer.sval == "any" ||
+             lexer.sval == "all" ||
+             (lexer.sval == "scr" && compat == V1POINT2)))
+          return true;
+
+        return isSymbolicRelation();
+    }
+
     private boolean isSymbolicRelation() {
        debug("isSymbolicRelation: checking ttype=" + lexer.ttype +
              " (" + lexer.render() + ")");