X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fz3950%2Fzing%2Fcql%2FCQLParser.java;h=cbe64d5d09bab05fc7b9aa1d1f5623100316fb66;hb=HEAD;hp=8a0fc172592a572a6cf25e9802009a59414d5905;hpb=738438f3da478a1d0121cbbdab620c47f222c73e;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 8a0fc17..cbe64d5 100644 --- a/src/main/java/org/z3950/zing/cql/CQLParser.java +++ b/src/main/java/org/z3950/zing/cql/CQLParser.java @@ -244,14 +244,15 @@ public class CQLParser { if (!isRelation()) break; //we're done if no relation + //render relation + String relstr = (lexer.what() == CQLTokenizer.TT_WORD ? + lexer.value() : lexer.render(lexer.what(), false)); //we have relation, but it only makes sense if preceded by a single term if (all.length() > first.length()) { - throw new CQLParseException("unexpected relation '"+lexer.value()+"'" + throw new CQLParseException("unexpected relation '"+relstr+"'" , lexer.pos()); } index = first; - String relstr = (lexer.what() == CQLTokenizer.TT_WORD ? - lexer.value() : lexer.render(lexer.what(), false)); relation = new CQLRelation(relstr); match(lexer.what()); ModifierSet ms = gatherModifiers(relstr);