X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Forg%2Fz3950%2Fzing%2Fcql%2FCQLBooleanNode.java;h=9462914e3b55602f6d04f8110e0bcdb179d2d8a9;hb=f57d48d060411f662eea823b97cc45038bda0def;hp=a3c37496ce37575a176977a322f62b782289e614;hpb=df372083094087da8590a526e0222c81c9ae7fc0;p=cql-java-moved-to-github.git
diff --git a/src/org/z3950/zing/cql/CQLBooleanNode.java b/src/org/z3950/zing/cql/CQLBooleanNode.java
index a3c3749..9462914 100644
--- a/src/org/z3950/zing/cql/CQLBooleanNode.java
+++ b/src/org/z3950/zing/cql/CQLBooleanNode.java
@@ -1,16 +1,16 @@
-// $Id: CQLBooleanNode.java,v 1.7 2002-11-06 00:05:58 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;
+import java.util.Vector;
/**
* Represents a boolean node in a CQL parse-tree.
*
- * @version $Id: CQLBooleanNode.java,v 1.7 2002-11-06 00:05:58 mike Exp $
+ * @version $Id: CQLBooleanNode.java,v 1.17 2007-07-03 13:40:13 mike Exp $
*/
public abstract class CQLBooleanNode extends CQLNode {
- CQLBooleanNode() {} // prevent javadoc from documenting this
-
/**
* The root of a parse-tree representing the left-hand side.
*/
@@ -21,25 +21,71 @@ public abstract class CQLBooleanNode extends CQLNode {
*/
public CQLNode right;
- abstract String op();
+ /**
+ * The set of modifiers that are applied to this boolean.
+ */
+ public ModifierSet ms;
- public String toXCQL(int level) {
- return (indent(level) + "\n" +
- booleanXQL(level+1) +
- left.toXCQL(level+1) +
- right.toXCQL(level+1) +
- indent(level) + "\n");
+ protected CQLBooleanNode(CQLNode left, CQLNode right, ModifierSet ms) {
+ this.left = left;
+ this.right = right;
+ this.ms = ms;
}
- // Represents the boolean operation itself: overridden for CQLProxNode
- String booleanXQL(int level) {
- return(indent(level) + "\n" +
- indent(level+1) + "" + op() + "\n" +
- indent(level) + "\n");
+ public String toXCQL(int level, Vector prefixes, Vector sortkeys) {
+ if (sortkeys != null)
+ throw new Error("CQLBooleanNode.toXCQL() called with sortkeys");
+
+ return (indent(level) + "\n" +
+ renderPrefixes(level+1, prefixes) +
+ ms.toXCQL(level+1, "boolean") +
+ indent(level+1) + "\n" +
+ left.toXCQL(level+2) +
+ indent(level+1) + "\n" +
+ indent(level+1) + "\n" +
+ right.toXCQL(level+2) +
+ indent(level+1) + "\n" +
+ indent(level) + "\n");
}
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 {
+ return ("@" + opPQF() +
+ " " + left.toPQF(config) +
+ " " + right.toPQF(config));
+ }
+
+ // represents the operation for PQF: overridden for CQLProxNode
+ String opPQF() { return ms.getBase(); }
+
+ public byte[] toType1BER(Properties config) throws PQFTranslationException {
+ System.out.println("in CQLBooleanNode.toType1BER(): PQF=" +
+ toPQF(config));
+ byte[] rpn1 = left.toType1BER(config);
+ byte[] rpn2 = right.toType1BER(config);
+ byte[] op = opType1();
+ byte[] rpnStructure = new byte[rpn1.length+rpn2.length+op.length+4];
+
+ // rpnRpnOp
+ int offset = putTag(CONTEXT, 1, CONSTRUCTED, rpnStructure, 0);
+
+ rpnStructure[offset++] = (byte)(0x80&0xff); // indefinite length
+ System.arraycopy(rpn1, 0, rpnStructure, offset, rpn1.length);
+ offset += rpn1.length;
+ System.arraycopy(rpn2, 0, rpnStructure, offset, rpn2.length);
+ offset += rpn2.length;
+ System.arraycopy(op, 0, rpnStructure, offset, op.length);
+ offset += op.length;
+ rpnStructure[offset++] = 0x00; // end rpnRpnOp
+ rpnStructure[offset++] = 0x00;
+ return rpnStructure;
+ }
+
+ abstract byte[] opType1();
}