-// $Id: CQLBooleanNode.java,v 1.15 2007-06-29 10:21:30 mike Exp $
+// $Id: CQLBooleanNode.java,v 1.17 2007-07-03 13:40:13 mike Exp $
package org.z3950.zing.cql;
import java.util.Properties;
/**
* Represents a boolean node in a CQL parse-tree.
*
- * @version $Id: CQLBooleanNode.java,v 1.15 2007-06-29 10:21:30 mike Exp $
+ * @version $Id: CQLBooleanNode.java,v 1.17 2007-07-03 13:40:13 mike Exp $
*/
public abstract class CQLBooleanNode extends CQLNode {
/**
this.ms = ms;
}
- public String toXCQL(int level, Vector prefixes) {
- // ### Should this use CQLNode.toXCQL(level+2, prefixes)?
+ public String toXCQL(int level, Vector prefixes, Vector sortkeys) {
+ if (sortkeys != null)
+ throw new Error("CQLBooleanNode.toXCQL() called with sortkeys");
+
return (indent(level) + "<triple>\n" +
renderPrefixes(level+1, prefixes) +
ms.toXCQL(level+1, "boolean") +
public String toCQL() {
// ### We don't always need parens around the operands
- return "(" + left.toCQL() + ") " + op() + " (" + right.toCQL() + ")";
+ return ("(" + left.toCQL() + ")" +
+ " " + ms.toCQL() + " " +
+ "(" + right.toCQL() + ")");
}
public String toPQF(Properties config) throws PQFTranslationException {
}
// represents the operation for PQF: overridden for CQLProxNode
- String opPQF() { return op(); }
-
- abstract String op();
+ String opPQF() { return ms.getBase(); }
public byte[] toType1BER(Properties config) throws PQFTranslationException {
System.out.println("in CQLBooleanNode.toType1BER(): PQF=" +