-// $Id: CQLParser.java,v 1.27 2007-06-27 22:39:55 mike Exp $
+// $Id: CQLParser.java,v 1.31 2007-06-29 10:25:38 mike Exp $
package org.z3950.zing.cql;
import java.io.IOException;
/**
* Compiles CQL strings into parse trees of CQLNode subtypes.
*
- * @version $Id: CQLParser.java,v 1.27 2007-06-27 22:39:55 mike Exp $
+ * @version $Id: CQLParser.java,v 1.31 2007-06-29 10:25:38 mike Exp $
* @see <A href="http://zing.z3950.org/cql/index.html"
* >http://zing.z3950.org/cql/index.html</A>
*/
debug("in parseQuery()");
CQLNode term = parseTerm(index, relation);
- while (lexer.ttype != lexer.TT_EOF &&
- lexer.ttype != ')') {
- if (lexer.ttype == lexer.TT_AND) {
- match(lexer.TT_AND);
+ while (lexer.ttype != lexer.TT_EOF && lexer.ttype != ')') {
+ if (lexer.ttype == lexer.TT_AND ||
+ lexer.ttype == lexer.TT_OR ||
+ lexer.ttype == lexer.TT_NOT) {
+ int type = lexer.ttype;
+ String val = lexer.sval;
+ match(type);
+ ModifierSet ms = gatherModifiers(val);
CQLNode term2 = parseTerm(index, relation);
- term = new CQLAndNode(term, term2);
- } else if (lexer.ttype == lexer.TT_OR) {
- match(lexer.TT_OR);
- CQLNode term2 = parseTerm(index, relation);
- term = new CQLOrNode(term, term2);
- } else if (lexer.ttype == lexer.TT_NOT) {
- match(lexer.TT_NOT);
- CQLNode term2 = parseTerm(index, relation);
- term = new CQLNotNode(term, term2);
+ term = ((type == lexer.TT_AND) ? new CQLAndNode(term, term2, ms) :
+ (type == lexer.TT_OR) ? new CQLOrNode (term, term2, ms) :
+ new CQLNotNode(term, term2, ms));
} else if (lexer.ttype == lexer.TT_PROX) {
- match(lexer.TT_PROX);
+ match(lexer.ttype);
CQLProxNode proxnode = new CQLProxNode(term);
gatherProxParameters(proxnode);
CQLNode term2 = parseTerm(index, relation);
return term;
}
+ private ModifierSet gatherModifiers(String base)
+ throws CQLParseException, IOException {
+ debug("in gatherModifiers()");
+
+ ModifierSet ms = new ModifierSet(base);
+ while (lexer.ttype == '/') {
+ match('/');
+ if (lexer.ttype != lexer.TT_WORD)
+ throw new CQLParseException("expected modifier, "
+ + "got " + lexer.render());
+ String type = lexer.sval.toLowerCase();
+ match(lexer.ttype);
+ if (!isRelation()) {
+ // It's a simple modifier consisting of type only
+ ms.addModifier(type);
+ } else {
+ // It's a complex modifier of the form type=value
+ String comparision = lexer.render(lexer.ttype, false);
+ match(lexer.ttype);
+
+ // Yuck
+ String value = lexer.ttype == lexer.TT_WORD ? lexer.sval :
+ (double) lexer.nval == (int) lexer.nval ?
+ new Integer((int) lexer.nval).toString() :
+ new Double((double) lexer.nval).toString();
+
+ matchSymbol("modifier value");
+ ms.addModifier(type, comparision, value);
+ }
+ }
+
+ return ms;
+ }
+
private CQLNode parseTerm(String index, CQLRelation relation)
throws CQLParseException, IOException {
debug("in parseTerm()");
debug("non-parenthesised term");
word = matchSymbol("index or term");
- if (!isBaseRelation())
+ if (!isRelation() && lexer.ttype != lexer.TT_WORD)
break;
index = word;
- relation = new CQLRelation(lexer.ttype == lexer.TT_WORD ?
- lexer.sval :
- lexer.render(lexer.ttype, false));
+ String relstr = (lexer.ttype == lexer.TT_WORD ?
+ lexer.sval : lexer.render(lexer.ttype, false));
+ relation = new CQLRelation(relstr);
match(lexer.ttype);
-
- while (lexer.ttype == '/') {
- match('/');
- if (lexer.ttype != lexer.TT_RELEVANT &&
- lexer.ttype != lexer.TT_FUZZY &&
- lexer.ttype != lexer.TT_STEM &&
- lexer.ttype != lexer.TT_PHONETIC &&
- lexer.ttype != lexer.TT_WORD)
- throw new CQLParseException("expected relation modifier, "
- + "got " + lexer.render());
- if (lexer.ttype == lexer.TT_WORD &&
- lexer.sval.indexOf('.') == -1)
- throw new CQLParseException("unknown first-class " +
- "relation modifier: " +
- lexer.sval);
-
- relation.addModifier(lexer.sval.toLowerCase());
- match(lexer.ttype);
- }
-
+ ModifierSet ms = gatherModifiers(relstr);
+ relation.setModifiers(ms);
debug("index='" + index + ", " +
"relation='" + relation.toCQL() + "'");
}
private void gatherProxRelation(CQLProxNode node)
throws CQLParseException, IOException {
- if (!isProxRelation())
+ if (!isRelation())
throw new CQLParseException("expected proximity relation, got " +
lexer.render());
node.addModifier("relation", null, lexer.render(lexer.ttype, false));
match(lexer.ttype);
}
- private boolean isBaseRelation()
- throws CQLParseException {
- debug("isBaseRelation: checking ttype=" + lexer.ttype +
- " (" + lexer.render() + ")");
-
- if (lexer.ttype == lexer.TT_WORD &&
- lexer.sval.indexOf('.') == -1)
- throw new CQLParseException("unknown first-class relation: " +
- lexer.sval);
-
- return (isProxRelation() ||
- lexer.ttype == lexer.TT_ANY ||
- lexer.ttype == lexer.TT_ALL ||
- lexer.ttype == lexer.TT_EXACT ||
- lexer.ttype == lexer.TT_SCR ||
- lexer.ttype == lexer.TT_WORD);
- }
-
// Checks for a relation that may be used inside a prox operator
- private boolean isProxRelation() {
- debug("isProxRelation: checking ttype=" + lexer.ttype +
+ private boolean isRelation() {
+ debug("isRelation: checking ttype=" + lexer.ttype +
" (" + lexer.render() + ")");
return (lexer.ttype == '<' ||
lexer.ttype == '>' ||
lexer.ttype == lexer.TT_OR ||
lexer.ttype == lexer.TT_NOT ||
lexer.ttype == lexer.TT_PROX ||
- lexer.ttype == lexer.TT_ANY ||
- lexer.ttype == lexer.TT_ALL ||
- lexer.ttype == lexer.TT_EXACT ||
lexer.ttype == lexer.TT_pWORD ||
lexer.ttype == lexer.TT_SENTENCE ||
lexer.ttype == lexer.TT_PARAGRAPH ||
lexer.ttype == lexer.TT_ELEMENT ||
lexer.ttype == lexer.TT_ORDERED ||
- lexer.ttype == lexer.TT_UNORDERED ||
- lexer.ttype == lexer.TT_RELEVANT ||
- lexer.ttype == lexer.TT_FUZZY ||
- lexer.ttype == lexer.TT_STEM ||
- lexer.ttype == lexer.TT_SCR ||
- lexer.ttype == lexer.TT_PHONETIC) {
+ lexer.ttype == lexer.TT_UNORDERED) {
String symbol = (lexer.ttype == lexer.TT_NUMBER) ?
lexer.render() : lexer.sval;
match(lexer.ttype);
} catch (IOException ex) {
System.err.println("Can't render query: " + ex.getMessage());
System.exit(5);
- } catch (UnknownQualifierException ex) {
+ } catch (UnknownIndexException ex) {
System.err.println("Unknown index: " + ex.getMessage());
System.exit(6);
} catch (UnknownRelationException ex) {
projects / cql-java-moved-to-github.git / blobdiff