diff --git a/src/main/java/org/xbib/cql/elasticsearch/FilterGenerator.java b/src/main/java/org/xbib/cql/elasticsearch/FilterGenerator.java index cad6100..bdd27f5 100644 --- a/src/main/java/org/xbib/cql/elasticsearch/FilterGenerator.java +++ b/src/main/java/org/xbib/cql/elasticsearch/FilterGenerator.java @@ -128,7 +128,7 @@ public class FilterGenerator implements Visitor { case ALL: { String field = arg1.toString(); String value = arg2 != null ? arg2.toString() : ""; - boolean phrase = arg2 instanceof Token && ((Token) arg2).isProtected(); + boolean phrase = arg2 instanceof Token && ((Token) arg2).isQuoted(); if (phrase) { builder.startArray("and"); QuotedStringTokenizer qst = new QuotedStringTokenizer(value); @@ -144,7 +144,7 @@ public class FilterGenerator implements Visitor { break; } case ANY: { - boolean phrase = arg2 instanceof Token && ((Token) arg2).isProtected(); + boolean phrase = arg2 instanceof Token && ((Token) arg2).isQuoted(); String field = arg1.toString(); String value = arg2 != null ? arg2.toString() : ""; if (phrase) { diff --git a/src/main/java/org/xbib/cql/elasticsearch/QueryGenerator.java b/src/main/java/org/xbib/cql/elasticsearch/QueryGenerator.java index 8d6bcb4..ff45eb3 100644 --- a/src/main/java/org/xbib/cql/elasticsearch/QueryGenerator.java +++ b/src/main/java/org/xbib/cql/elasticsearch/QueryGenerator.java @@ -197,7 +197,7 @@ public class QueryGenerator implements Visitor { String field = arg1.toString(); String value = arg2 != null ? arg2.toString() : ""; if (tok2 != null) { - if (tok2.isProtected()) { + if (tok2.isQuoted()) { builder.startObject("match_phrase") .startObject(field) .field("query", tok2.getString()) @@ -264,7 +264,7 @@ public class QueryGenerator implements Visitor { String from = null; String to = null; if (tok2 != null) { - if (!tok2.isProtected()) { + if (!tok2.isQuoted()) { throw new IllegalArgumentException("range within: unable to derive range from a non-phrase: " + value); } if (tok2.getStringList().size() != 2) { diff --git a/src/main/java/org/xbib/cql/elasticsearch/ast/Token.java b/src/main/java/org/xbib/cql/elasticsearch/ast/Token.java index 9ec3576..0e9af24 100644 --- a/src/main/java/org/xbib/cql/elasticsearch/ast/Token.java +++ b/src/main/java/org/xbib/cql/elasticsearch/ast/Token.java @@ -22,7 +22,7 @@ public class Token implements Node { public enum TokenClass { - NORMAL, ALL, WILDCARD, BOUNDARY, PROTECTED + NORMAL, ALL, WILDCARD, BOUNDARY, QUOTED } private TokenType type; @@ -60,12 +60,12 @@ public class Token implements Node { } if (this.value != null) { - // protected? + // quoted? if (value.startsWith("\"") && value.endsWith("\"")) { this.stringvalue = value; this.value = value.substring(1, value.length() - 1).replaceAll("\\\\\"", "\""); this.values = parseQuot(this.value); - tokenClass.add(TokenClass.PROTECTED); + tokenClass.add(TokenClass.QUOTED); } // wildcard? if (this.value.indexOf('*') >= 0 || this.value.indexOf('?') >= 0) { @@ -182,8 +182,8 @@ public class Token implements Node { return sb.toString(); } - public boolean isProtected() { - return tokenClass.contains(TokenClass.PROTECTED); + public boolean isQuoted() { + return tokenClass.contains(TokenClass.QUOTED); } public boolean isBoundary() {