UnknownQualifierException becomes UnknownIndexException

[cql-java-moved-to-github.git] / src / org / z3950 / zing / cql / CQLParser.java

diff --git a/src/org/z3950/zing/cql/CQLParser.java b/src/org/z3950/zing/cql/CQLParser.java
index 13e505e..5361037 100644 (file)
--- a/src/org/z3950/zing/cql/CQLParser.java
+++ b/src/org/z3950/zing/cql/CQLParser.java
@@ -1,4 +1,4 @@
-// $Id: CQLParser.java,v 1.23 2003-09-04 21:56:46 mike Exp $
+// $Id: CQLParser.java,v 1.28 2007-06-27 22:44:40 mike Exp $
 
 package org.z3950.zing.cql;
 import java.io.IOException;
@@ -12,7 +12,7 @@ import java.io.FileNotFoundException;
 /**
  * Compiles CQL strings into parse trees of CQLNode subtypes.
  *
- * @version    $Id: CQLParser.java,v 1.23 2003-09-04 21:56:46 mike Exp $
+ * @version    $Id: CQLParser.java,v 1.28 2007-06-27 22:44:40 mike Exp $
  * @see                <A href="http://zing.z3950.org/cql/index.html"
  *                     >http://zing.z3950.org/cql/index.html</A>
  */
@@ -55,30 +55,30 @@ public class CQLParser {
        return root;
     }
 
-    private CQLNode parseQuery(String qualifier, CQLRelation relation)
+    private CQLNode parseQuery(String index, CQLRelation relation)
        throws CQLParseException, IOException {
        debug("in parseQuery()");
 
-       CQLNode term = parseTerm(qualifier, relation);
+       CQLNode term = parseTerm(index, relation);
        while (lexer.ttype != lexer.TT_EOF &&
               lexer.ttype != ')') {
            if (lexer.ttype == lexer.TT_AND) {
                match(lexer.TT_AND);
-               CQLNode term2 = parseTerm(qualifier, relation);
+               CQLNode term2 = parseTerm(index, relation);
                term = new CQLAndNode(term, term2);
            } else if (lexer.ttype == lexer.TT_OR) {
                match(lexer.TT_OR);
-               CQLNode term2 = parseTerm(qualifier, relation);
+               CQLNode term2 = parseTerm(index, relation);
                term = new CQLOrNode(term, term2);
            } else if (lexer.ttype == lexer.TT_NOT) {
                match(lexer.TT_NOT);
-               CQLNode term2 = parseTerm(qualifier, relation);
+               CQLNode term2 = parseTerm(index, relation);
                term = new CQLNotNode(term, term2);
            } else if (lexer.ttype == lexer.TT_PROX) {
                match(lexer.TT_PROX);
                CQLProxNode proxnode = new CQLProxNode(term);
                gatherProxParameters(proxnode);
-               CQLNode term2 = parseTerm(qualifier, relation);
+               CQLNode term2 = parseTerm(index, relation);
                proxnode.addSecondSubterm(term2);
                term = (CQLNode) proxnode;
            } else {
@@ -91,7 +91,7 @@ public class CQLParser {
        return term;
     }
 
-    private CQLNode parseTerm(String qualifier, CQLRelation relation)
+    private CQLNode parseTerm(String index, CQLRelation relation)
        throws CQLParseException, IOException {
        debug("in parseTerm()");
 
@@ -100,20 +100,20 @@ public class CQLParser {
            if (lexer.ttype == '(') {
                debug("parenthesised term");
                match('(');
-               CQLNode expr = parseQuery(qualifier, relation);
+               CQLNode expr = parseQuery(index, relation);
                match(')');
                return expr;
            } else if (lexer.ttype == '>') {
                match('>');
-               return parsePrefix(qualifier, relation);
+               return parsePrefix(index, relation);
            }
 
            debug("non-parenthesised term");
-           word = matchSymbol("qualifier or term");
+           word = matchSymbol("index or term");
            if (!isBaseRelation())
                break;
 
-           qualifier = word;
+           index = word;
            relation = new CQLRelation(lexer.ttype == lexer.TT_WORD ?
                                       lexer.sval :
                                       lexer.render(lexer.ttype, false));
@@ -138,16 +138,16 @@ public class CQLParser {
                match(lexer.ttype);
            }
 
-           debug("qualifier='" + qualifier + ", " +
+           debug("index='" + index + ", " +
                  "relation='" + relation.toCQL() + "'");
        }
 
-       CQLTermNode node = new CQLTermNode(qualifier, relation, word);
+       CQLTermNode node = new CQLTermNode(index, relation, word);
        debug("made term node " + node.toCQL());
        return node;
     }
 
-    private CQLNode parsePrefix(String qualifier, CQLRelation relation)
+    private CQLNode parsePrefix(String index, CQLRelation relation)
        throws CQLParseException, IOException {
        debug("prefix mapping");
 
@@ -158,7 +158,7 @@ public class CQLParser {
            name = identifier;
            identifier = matchSymbol("prefix-identifer");
        }
-       CQLNode term = parseQuery(qualifier, relation);
+       CQLNode term = parseQuery(index, relation);
        return new CQLPrefixNode(name, identifier, term);
     }
 
@@ -188,7 +188,7 @@ public class CQLParser {
        if (!isProxRelation())
            throw new CQLParseException("expected proximity relation, got " +
                                        lexer.render());
-       node.addModifier("relation", lexer.render(lexer.ttype, false));
+       node.addModifier("relation", null, lexer.render(lexer.ttype, false));
        match(lexer.ttype);
        debug("gPR matched " + lexer.render(lexer.ttype, false));
     }
@@ -198,7 +198,7 @@ public class CQLParser {
        if (lexer.ttype != lexer.TT_NUMBER)
            throw new CQLParseException("expected proximity distance, got " +
                                        lexer.render());
-       node.addModifier("distance", lexer.render(lexer.ttype, false));
+       node.addModifier("distance", null, lexer.render(lexer.ttype, false));
        match(lexer.ttype);
        debug("gPD matched " + lexer.render(lexer.ttype, false));
     }
@@ -211,7 +211,7 @@ public class CQLParser {
            lexer.ttype != lexer.TT_ELEMENT)
            throw new CQLParseException("expected proximity unit, got " +
                                        lexer.render());
-       node.addModifier("unit", lexer.render());
+       node.addModifier("unit", null, lexer.render());
        match(lexer.ttype);
     }
 
@@ -221,7 +221,7 @@ public class CQLParser {
            lexer.ttype != lexer.TT_UNORDERED)
            throw new CQLParseException("expected proximity ordering, got " +
                                        lexer.render());
-       node.addModifier("ordering", lexer.render());
+       node.addModifier("ordering", null, lexer.render());
        match(lexer.ttype);
     }
 
@@ -277,7 +277,7 @@ public class CQLParser {
            lexer.ttype == '"' ||
            // The following is a complete list of keywords.  Because
            // they're listed here, they can be used unquoted as
-           // qualifiers, terms, prefix names and prefix identifiers.
+           // 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.
            lexer.ttype == lexer.TT_AND ||
@@ -368,11 +368,16 @@ public class CQLParser {
        char mode = 'x';        // x=XCQL, c=CQL, p=PQF
        String pfile = null;
 
-       Vector argv = new Vector();
+       Vector<String> argv = new Vector<String>();
        for (int i = 0; i < args.length; i++) {
            argv.add(args[i]);
        }
 
+       if (argv.size() > 0 && argv.get(0).equals("-d")) {
+           DEBUG = true;
+           argv.remove(0);
+       }
+
        if (argv.size() > 0 && argv.get(0).equals("-c")) {
            mode = 'c';
            argv.remove(0);
@@ -384,8 +389,7 @@ public class CQLParser {
        }
 
        if (argv.size() > 1) {
-           System.err.println(
-               "Usage: CQLParser [-c] [-p <pqf-properties> [<CQL-query>]");
+           System.err.println("Usage: CQLParser [-d] [-c] [-p <pqf-properties> [<CQL-query>]");
            System.err.println("If unspecified, query is read from stdin");
            System.exit(1);
        }
@@ -435,8 +439,8 @@ public class CQLParser {
        } catch (IOException ex) {
            System.err.println("Can't render query: " + ex.getMessage());
            System.exit(5);
-       } catch (UnknownQualifierException ex) {
-           System.err.println("Unknown qualifier: " + ex.getMessage());
+       } catch (UnknownIndexException ex) {
+           System.err.println("Unknown index: " + ex.getMessage());
            System.exit(6);
        } catch (UnknownRelationException ex) {
            System.err.println("Unknown relation: " + ex.getMessage());