projects
/
cql-java-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Correct the set of word-relations recognised -- fixes #3435
[cql-java-moved-to-github.git]
/
src
/
main
/
java
/
org
/
z3950
/
zing
/
cql
/
CQLParser.java
diff --git
a/src/main/java/org/z3950/zing/cql/CQLParser.java
b/src/main/java/org/z3950/zing/cql/CQLParser.java
index
25b49d0
..
90e9f59
100644
(file)
--- a/
src/main/java/org/z3950/zing/cql/CQLParser.java
+++ b/
src/main/java/org/z3950/zing/cql/CQLParser.java
@@
-241,10
+241,13
@@
public class CQLParser {
" (" + lexer.render() + ")");
if (lexer.ttype == lexer.TT_WORD &&
(lexer.sval.indexOf('.') >= 0 ||
" (" + lexer.render() + ")");
if (lexer.ttype == lexer.TT_WORD &&
(lexer.sval.indexOf('.') >= 0 ||
- lexer.sval.equals("exact") ||
lexer.sval.equals("any") ||
lexer.sval.equals("all") ||
lexer.sval.equals("any") ||
lexer.sval.equals("all") ||
- (lexer.sval.equals("scr") && compat == V1POINT2)))
+ lexer.sval.equals("within") ||
+ lexer.sval.equals("encloses") ||
+ (lexer.sval.equals("exact") && compat != V1POINT2) ||
+ (lexer.sval.equals("scr") && compat != V1POINT2) ||
+ (lexer.sval.equals("adj") && compat == V1POINT2)))
return true;
return isSymbolicRelation();
return true;
return isSymbolicRelation();