From d463b3e1051ac2986b613ba361b37309a391ef93 Mon Sep 17 00:00:00 2001 From: mike Date: Wed, 27 Jun 2007 22:14:46 +0000 Subject: [PATCH] addModifier() now uses broader ModifierSet API. --- src/org/z3950/zing/cql/CQLParser.java | 12 ++++++------ src/org/z3950/zing/cql/CQLRelation.java | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/org/z3950/zing/cql/CQLParser.java b/src/org/z3950/zing/cql/CQLParser.java index 892c8da..84b0488 100644 --- 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.25 2007-06-26 16:43:41 mike Exp $ +// $Id: CQLParser.java,v 1.26 2007-06-27 22:16:23 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.25 2007-06-26 16:43:41 mike Exp $ + * @version $Id: CQLParser.java,v 1.26 2007-06-27 22:16:23 mike Exp $ * @see http://zing.z3950.org/cql/index.html */ @@ -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); } diff --git a/src/org/z3950/zing/cql/CQLRelation.java b/src/org/z3950/zing/cql/CQLRelation.java index 19ee46a..49e9f63 100644 --- a/src/org/z3950/zing/cql/CQLRelation.java +++ b/src/org/z3950/zing/cql/CQLRelation.java @@ -1,4 +1,4 @@ -// $Id: CQLRelation.java,v 1.13 2007-06-27 17:18:00 mike Exp $ +// $Id: CQLRelation.java,v 1.14 2007-06-27 22:14:46 mike Exp $ package org.z3950.zing.cql; import java.util.Vector; @@ -8,7 +8,7 @@ import java.lang.StringBuffer; /** * Represents a relation between a CQL qualifier and term. * - * @version $Id: CQLRelation.java,v 1.13 2007-06-27 17:18:00 mike Exp $ + * @version $Id: CQLRelation.java,v 1.14 2007-06-27 22:14:46 mike Exp $ */ public class CQLRelation extends CQLNode { ModifierSet ms; @@ -41,7 +41,7 @@ public class CQLRelation extends CQLNode { * for the text relations. */ public void addModifier(String modifier) { - ms.addModifier(modifier, null); + ms.addModifier(modifier, null, null); } /** -- 1.7.10.4