package org.z3950.zing.cql;
+
import java.io.BufferedReader;
import java.io.IOException;
import java.util.Properties;
import java.io.InputStream;
import java.io.FileInputStream;
-import java.io.FileNotFoundException;
import java.io.InputStreamReader;
-import java.io.Reader;
-import java.io.StringReader;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
throws CQLParseException, IOException {
debug("in parseTerm()");
- String word;
+ String first;
+ StringBuilder all;
while (true) {
if (lexer.what() == '(') {
debug("parenthesised term");
}
debug("non-parenthesised term");
- word = matchSymbol("index or term");
- while (lexer.what() == CQLTokenizer.TT_WORD && !isRelation()) {
- word = word + " " + lexer.value();
- match(CQLTokenizer.TT_WORD);
+ first = matchSymbol("index or term");
+ all = new StringBuilder(first);
+ //match relation only on second postion
+ while (isWordOrString() && (all.length() > first.length() || !isRelation())) {
+ all.append(" ").append(lexer.value());
+ match(lexer.what());
}
if (!isRelation())
- break;
-
- index = word;
+ break; //we're done if no relation
+
+ //render relation
String relstr = (lexer.what() == CQLTokenizer.TT_WORD ?
lexer.value() : lexer.render(lexer.what(), false));
+ //we have relation, but it only makes sense if preceded by a single term
+ if (all.length() > first.length()) {
+ throw new CQLParseException("unexpected relation '"+relstr+"'"
+ , lexer.pos());
+ }
+ index = first;
relation = new CQLRelation(relstr);
match(lexer.what());
ModifierSet ms = gatherModifiers(relstr);
debug("index='" + index + ", " +
"relation='" + relation.toCQL() + "'");
}
-
- CQLTermNode node = new CQLTermNode(index, relation, word);
+ CQLTermNode node = new CQLTermNode(index, relation, all.toString());
debug("made term node " + node.toCQL());
return node;
}
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() +
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 ||
root = parser.parse(cql);
} catch (CQLParseException ex) {
System.err.println("Syntax error: " + ex.getMessage());
+ StringBuilder space = new StringBuilder(cql.length());
+ System.out.println(cql);
+ for (int i=0; i<ex.getPosition(); i++) space.append(" ");
+ space.append("^");
+ System.err.println(space.toString());
System.exit(3);
return; //compiler
} catch (IOException ex) {