Allow a list of quoted terms

[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 a4f2fc8..b435aa3 100644 (file)
--- a/src/main/java/org/z3950/zing/cql/CQLParser.java
+++ b/src/main/java/org/z3950/zing/cql/CQLParser.java
@@ -235,13 +235,13 @@ public class CQLParser {
 
            debug("non-parenthesised term");
            word = matchSymbol("index or term");
-            while (lexer.what() == CQLTokenizer.TT_WORD && !isRelation()) {
+            while (isWordOrString() && !isRelation()) {
               word = word + " " + lexer.value();
-              match(CQLTokenizer.TT_WORD);
+              match(lexer.what());
             }
 
            if (!isRelation())
-               break;
+              break;
 
            index = word;
            String relstr = (lexer.what() == CQLTokenizer.TT_WORD ?
@@ -278,6 +278,11 @@ public class CQLParser {
 
        return new CQLPrefixNode(name, identifier, node);
     }
+    
+    private boolean isWordOrString() {
+      return CQLTokenizer.TT_WORD == lexer.what() 
+        || CQLTokenizer.TT_STRING == lexer.what();
+    }
 
     private boolean isRelation() {
        debug("isRelation: checking what()=" + lexer.what() +
@@ -326,12 +331,10 @@ public class CQLParser {
 
        debug("in matchSymbol()");
        if (lexer.what() == CQLTokenizer.TT_WORD ||
-           lexer.what() == '"' ||
+           lexer.what() == CQLTokenizer.TT_STRING ||
            // The following is a complete list of keywords.  Because
            // they're listed here, they can be used unquoted as
            // indexes, terms, prefix names and prefix identifiers.
-           // ### Instead, we should ask the lexer whether what we
-           // have is a keyword, and let the knowledge reside there.
             (allowKeywordTerms &&
            lexer.what() == CQLTokenizer.TT_AND ||
            lexer.what() == CQLTokenizer.TT_OR ||