X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Forg%2Fz3950%2Fzing%2Fcql%2FCQLBooleanNode.java;h=c449ce957fd1d6c6da0a85eeb04f3c3d7860a3b4;hb=af923f9b50aecdbf896af612e733817f96c4388a;hp=7064784ab901c44036420fcf545d4b395adf5088;hpb=e57e14d4481428581265449445514fb426fbea45;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 7064784..c449ce9 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.13 2002-12-11 17:14:20 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;
@@ -8,11 +8,9 @@ import java.util.Vector;
 /**
  * Represents a boolean node in a CQL parse-tree.
  *
- * @version	$Id: CQLBooleanNode.java,v 1.13 2002-12-11 17:14:20 mike Exp $
+ * @version	$Id: CQLBooleanNode.java,v 1.15 2007-06-29 10:21:30 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.
      */ 
@@ -23,26 +21,31 @@ public abstract class CQLBooleanNode extends CQLNode {
      */ 
     public CQLNode right;
 
+    /**
+     * 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 prefixes) {
+	// ### Should this use CQLNode.toXCQL(level+2, prefixes)?
 	return (indent(level) + "<triple>\n" +
 		renderPrefixes(level+1, prefixes) +
-		opXCQL(level+1) +
+		ms.toXCQL(level+1, "boolean") +
 		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");
     }
 
-    // Represents the boolean operation itself: overridden for CQLProxNode
-    String opXCQL(int level) {
-	return(indent(level) + "<boolean>\n" +
-	       indent(level+1) + "<value>" + op() + "</value>\n" +
-	       indent(level) + "</boolean>\n");
-    }
-
     public String toCQL() {
 	// ### We don't always need parens around the operands
 	return "(" + left.toCQL() + ") " + op() + " (" + right.toCQL() + ")";