X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fz3950%2Fzing%2Fcql%2FCQLParser.java;h=7580959cf328718a342e0c9e3df2fff87e8b6c3d;hb=7d8ec6eaa2b799a2c466605af660e381644c48cc;hp=58e03269c8aa41bc9196ba9649b9f7e191f1fbbc;hpb=83ec0e33533dc85b30897f2f38f3a30286937c98;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 58e0326..7580959 100644 --- a/src/main/java/org/z3950/zing/cql/CQLParser.java +++ b/src/main/java/org/z3950/zing/cql/CQLParser.java @@ -159,7 +159,7 @@ public class CQLParser { + "got " + lexer.render()); String type = lexer.sval.toLowerCase(); match(lexer.ttype); - if (!isRelation()) { + if (!isSymbolicRelation()) { // It's a simple modifier consisting of type only ms.addModifier(type); } else { @@ -192,7 +192,7 @@ public class CQLParser { debug("non-parenthesised term"); word = matchSymbol("index or term"); - if (!isRelation() && lexer.ttype != lexer.TT_WORD) + if (!isSymbolicRelation() && lexer.ttype != lexer.TT_WORD) break; index = word; @@ -232,8 +232,8 @@ public class CQLParser { } // Checks for a relation - private boolean isRelation() { - debug("isRelation: checking ttype=" + lexer.ttype + + private boolean isSymbolicRelation() { + debug("isSymbolicRelation: checking ttype=" + lexer.ttype + " (" + lexer.render() + ")"); return (lexer.ttype == '<' || lexer.ttype == '>' ||