toXCQL() renders sort-keys, if any.

[cql-java-moved-to-github.git] / src / org / z3950 / zing / cql / CQLBooleanNode.java

diff --git a/src/org/z3950/zing/cql/CQLBooleanNode.java b/src/org/z3950/zing/cql/CQLBooleanNode.java
index 728768c..ec0608c 100644 (file)
--- a/src/org/z3950/zing/cql/CQLBooleanNode.java
+++ b/src/org/z3950/zing/cql/CQLBooleanNode.java
@@ -1,29 +1,90 @@
-// $Id: CQLBooleanNode.java,v 1.4 2002-10-25 19:44:31 mike Exp $
+// $Id: CQLBooleanNode.java,v 1.18 2007-07-03 16:03:00 mike Exp $
 
 package org.z3950.zing.cql;
+import java.util.Properties;
+import java.util.Vector;
 
 
 /**
- * Represents a boolean node in a CQL parse-tree ...
- * ###
+ * Represents a boolean node in a CQL parse-tree.
  *
- * @version    $Id: CQLBooleanNode.java,v 1.4 2002-10-25 19:44:31 mike Exp $
+ * @version    $Id: CQLBooleanNode.java,v 1.18 2007-07-03 16:03:00 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) {
+    /**
+     * 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;
+    }
+
+    public String toXCQL(int level, Vector<CQLPrefix> prefixes,
+                        Vector<ModifierSet> sortkeys) {
        return (indent(level) + "<triple>\n" +
-               indent(level+1) + "<boolean>" + op() + "</boolean>\n" +
-               left.toXCQL(level+1) +
-               right.toXCQL(level+1) +
+               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" +
+               renderSortKeys(level+1, sortkeys) +
                indent(level) + "</triple>\n");
     }
 
-    String toCQL() {
-       return "(" + left.toCQL() + ") " + op() + " (" + right.toCQL() + ")";
+    public String toCQL() {
+       // ### We don't always need parens around the operands
+       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();
 }