X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Forg%2Fz3950%2Fzing%2Fcql%2FCQLBooleanNode.java;h=794e2ace6b5ec46ddb46919be9ea5cf3c90b78d1;hb=f3c88fe15ee06a671407a0368e449db991526802;hp=56fdde2564de9b2140e2edf52e6a98e29f72c0c4;hpb=f744abfa23a7e569a156e4686e0e8e3cec242652;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 56fdde2..794e2ac 100644
--- a/src/org/z3950/zing/cql/CQLBooleanNode.java
+++ b/src/org/z3950/zing/cql/CQLBooleanNode.java
@@ -1,4 +1,4 @@
-// $Id: CQLBooleanNode.java,v 1.9 2002-11-20 01:15:14 mike Exp $
+// $Id: CQLBooleanNode.java,v 1.14 2007-06-06 12:22:01 mike Exp $
package org.z3950.zing.cql;
import java.util.Properties;
@@ -8,7 +8,7 @@ import java.util.Vector;
/**
* Represents a boolean node in a CQL parse-tree.
*
- * @version $Id: CQLBooleanNode.java,v 1.9 2002-11-20 01:15:14 mike Exp $
+ * @version $Id: CQLBooleanNode.java,v 1.14 2007-06-06 12:22:01 mike Exp $
*/
public abstract class CQLBooleanNode extends CQLNode {
CQLBooleanNode() {} // prevent javadoc from documenting this
@@ -24,20 +24,21 @@ public abstract class CQLBooleanNode extends CQLNode {
public CQLNode right;
public String toXCQL(int level, Vector prefixes) {
+ // ### Should this use CQLNode.toXCQL(level+2, prefixes)?
return (indent(level) + "\n" +
renderPrefixes(level+1, prefixes) +
- opXQL(level+1) +
+ opXCQL(level+1) +
indent(level+1) + "\n" +
- left.toXCQL(level+2, new Vector()) +
+ left.toXCQL(level+2) +
indent(level+1) + "\n" +
indent(level+1) + "\n" +
- right.toXCQL(level+2, new Vector()) +
+ right.toXCQL(level+2) +
indent(level+1) + "\n" +
indent(level) + "\n");
}
// Represents the boolean operation itself: overridden for CQLProxNode
- String opXQL(int level) {
+ String opXCQL(int level) {
return(indent(level) + "\n" +
indent(level+1) + "" + op() + "\n" +
indent(level) + "\n");
@@ -58,4 +59,29 @@ public abstract class CQLBooleanNode extends CQLNode {
String opPQF() { return op(); }
abstract String op();
+
+ 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();
}