Case insensitive relation check, fixes #17

Author: adamdickmeiss

src/main/java/org/z3950/zing/cql/CQLParser.java

@@ -282,40 +282,39 @@ private CQLNode parsePrefix(String index, CQLRelation relation,
 
 	return new CQLPrefixNode(name, identifier, node);
     }
-    
+
     private boolean isWordOrString() {
-      return CQLTokenizer.TT_WORD == lexer.what() 
+      return CQLTokenizer.TT_WORD == lexer.what()
         || CQLTokenizer.TT_STRING == lexer.what();
     }
 
     private boolean isRelation() {
-	debug("isRelation: checking what()=" + lexer.what() +
-	      " (" + lexer.render() + ")");
-        if (lexer.what() == CQLTokenizer.TT_WORD &&
-            (lexer.value().indexOf('.') >= 0 ||
-             lexer.value().equals("any") ||
-             lexer.value().equals("all") ||
-             lexer.value().equals("within") ||
-             lexer.value().equals("encloses") ||
-             (lexer.value().equals("exact") && compat != V1POINT2) ||
-             (lexer.value().equals("scr") && compat != V1POINT2) ||
-             (lexer.value().equals("adj") && compat == V1POINT2) ||
-             customRelations.contains(lexer.value())))
-          return true;
-
+        debug("isRelation: checking what()=" + lexer.what() +
+                " (" + lexer.render() + ")");
+        if (lexer.what() == CQLTokenizer.TT_WORD) {
+            return lexer.value().indexOf('.') >= 0 ||
+                    lexer.value().equalsIgnoreCase("any") ||
+                    lexer.value().equalsIgnoreCase("all") ||
+                    lexer.value().equalsIgnoreCase("within") ||
+                    lexer.value().equalsIgnoreCase("encloses") ||
+                    (lexer.value().equalsIgnoreCase("exact") && compat != V1POINT2) ||
+                    (lexer.value().equalsIgnoreCase("scr") && compat != V1POINT2) ||
+                    (lexer.value().equalsIgnoreCase("adj") && compat == V1POINT2) ||
+                    customRelations.stream().anyMatch(r -> r.equalsIgnoreCase(lexer.value()));
+        }
         return isSymbolicRelation();
     }
 
     private boolean isSymbolicRelation() {
-	debug("isSymbolicRelation: checking what()=" + lexer.what() +
-	      " (" + lexer.render() + ")");
-	return (lexer.what() == '<' ||
-		lexer.what() == '>' ||
-		lexer.what() == '=' ||
-		lexer.what() == CQLTokenizer.TT_LE ||
-		lexer.what() == CQLTokenizer.TT_GE ||
-		lexer.what() == CQLTokenizer.TT_NE ||
-		lexer.what() == CQLTokenizer.TT_EQEQ);
+        debug("isSymbolicRelation: checking what()=" + lexer.what() +
+                " (" + lexer.render() + ")");
+        return (lexer.what() == '<' ||
+                lexer.what() == '>' ||
+                lexer.what() == '=' ||
+                lexer.what() == CQLTokenizer.TT_LE ||
+                lexer.what() == CQLTokenizer.TT_GE ||
+                lexer.what() == CQLTokenizer.TT_NE ||
+                lexer.what() == CQLTokenizer.TT_EQEQ);
     }
 
     private void match(int token)

src/test/resources/regression/02/03.cql

@@ -1 +1 @@
-title any fish
+title Any fish

src/test/resources/regression/02/03.xcql

@@ -1,7 +1,7 @@
 <searchClause>
   <index>title</index>
   <relation>
-    <value>any</value>
+    <value>Any</value>
   </relation>
   <term>fish</term>
 </searchClause>

src/test/resources/regression/09/06.cql

@@ -1 +1 @@
-sortby sortby sortby sortby sortby
+Sortby Sortby Sortby Sortby Sortby

src/test/resources/regression/09/06.xcql

@@ -3,16 +3,16 @@
   <relation>
     <value>=</value>
   </relation>
-  <term>sortby</term>
+  <term>Sortby</term>
   <sortKeys>
     <key>
-      <index>sortby</index>
+      <index>Sortby</index>
     </key>
     <key>
-      <index>sortby</index>
+      <index>Sortby</index>
     </key>
     <key>
-      <index>sortby</index>
+      <index>Sortby</index>
     </key>
   </sortKeys>
 </searchClause>