X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Forg%2Fz3950%2Fzing%2Fcql%2FCQLBooleanNode.java;h=c449ce957fd1d6c6da0a85eeb04f3c3d7860a3b4;hb=b53fe47e0bd5f0825b0d8ceeb33538e714bf9e7e;hp=56c212fc66c1595bb29bc17f518222b09a038cdb;hpb=f8154c71944186a9b64ddb782082a2026c5a912f;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 56c212f..c449ce9 100644
--- a/src/org/z3950/zing/cql/CQLBooleanNode.java
+++ b/src/org/z3950/zing/cql/CQLBooleanNode.java
@@ -1,36 +1,89 @@
-// $Id: CQLBooleanNode.java,v 1.6 2002-10-31 22:22:01 mike Exp $
+// $Id: CQLBooleanNode.java,v 1.15 2007-06-29 10:21:30 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.6 2002-10-31 22:22:01 mike Exp $
+ * @version	$Id: CQLBooleanNode.java,v 1.15 2007-06-29 10:21:30 mike Exp $
  */
 public abstract class CQLBooleanNode extends CQLNode {
-    protected CQLNode left;
-    protected CQLNode right;
+    /**
+     * The root of a parse-tree representing the left-hand side.
+     */ 
+    public CQLNode left;
 
-    abstract String op();
+    /**
+     * The root of a parse-tree representing the right-hand side.
+     */ 
+    public CQLNode right;
 
-    String toXCQL(int level) {
-	return (indent(level) + "<triple>\n" +
-		booleanXQL(level+1) +
-		left.toXCQL(level+1) +
-		right.toXCQL(level+1) +
-		indent(level) + "</triple>\n");
+    /**
+     * The set of modifiers that are applied to this boolean.
+     */
+    public ModifierSet ms;
+
+    protected CQLBooleanNode(CQLNode left, CQLNode right, ModifierSet ms) {
+	this.left = left;
+	this.right = right;
+	this.ms = ms;
     }
 
-    String booleanXQL(int level) {
-	return(indent(level) + "<boolean>\n" +
-	       indent(level+1) + "<value>" + op() + "</value>\n" +
-	       indent(level) + "</boolean>\n");
+    public String toXCQL(int level, Vector prefixes) {
+	// ### Should this use CQLNode.toXCQL(level+2, prefixes)?
+	return (indent(level) + "<triple>\n" +
+		renderPrefixes(level+1, prefixes) +
+		ms.toXCQL(level+1, "boolean") +
+		indent(level+1) + "<leftOperand>\n" +
+		left.toXCQL(level+2) +
+		indent(level+1) + "</leftOperand>\n" +
+		indent(level+1) + "<rightOperand>\n" +
+		right.toXCQL(level+2) +
+		indent(level+1) + "</rightOperand>\n" +
+		indent(level) + "</triple>\n");
     }
 
-    String toCQL() {
+    public String toCQL() {
 	// ### We don't always need parens around the operands
 	return "(" + left.toCQL() + ") " + op() + " (" + 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 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();
 }