X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Forg%2Fz3950%2Fzing%2Fcql%2FCQLBooleanNode.java;h=794e2ace6b5ec46ddb46919be9ea5cf3c90b78d1;hb=3d47a2407f3b28ce9bb43013a6d6da0e99f336c5;hp=6e772eb812ddb3cb84ca733323c804cec065750d;hpb=f8f333c94f7654313b529a6e879b5d23364c34e3;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 6e772eb..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.12 2002-12-05 17:14:52 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.12 2002-12-05 17:14:52 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,14 +24,15 @@ 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) + "<triple>\n" +
 		renderPrefixes(level+1, prefixes) +
 		opXCQL(level+1) +
 		indent(level+1) + "<leftOperand>\n" +
-		left.toXCQL(level+2, new Vector()) +
+		left.toXCQL(level+2) +
 		indent(level+1) + "</leftOperand>\n" +
 		indent(level+1) + "<rightOperand>\n" +
-		right.toXCQL(level+2, new Vector()) +
+		right.toXCQL(level+2) +
 		indent(level+1) + "</rightOperand>\n" +
 		indent(level) + "</triple>\n");
     }
@@ -59,11 +60,11 @@ public abstract class CQLBooleanNode extends CQLNode {
 
     abstract String op();
 
-    public byte[] toType1(Properties config) throws PQFTranslationException {
-        System.out.println("in CQLBooleanNode.toType101(): PQF=" +
+    public byte[] toType1BER(Properties config) throws PQFTranslationException {
+        System.out.println("in CQLBooleanNode.toType1BER(): PQF=" +
 			   toPQF(config));
-        byte[] rpn1 = left.toType1(config);
-        byte[] rpn2 = right.toType1(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];