X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Forg%2Fz3950%2Fzing%2Fcql%2FCQLBooleanNode.java;h=56c212fc66c1595bb29bc17f518222b09a038cdb;hb=f8154c71944186a9b64ddb782082a2026c5a912f;hp=728768cf28198e31c9ba4e2ea232065caff5f4e5;hpb=8ac74dfaa036a225b07e57f1ac61ea868b3df6e4;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 728768c..56c212f 100644
--- a/src/org/z3950/zing/cql/CQLBooleanNode.java
+++ b/src/org/z3950/zing/cql/CQLBooleanNode.java
@@ -1,13 +1,13 @@
-// $Id: CQLBooleanNode.java,v 1.4 2002-10-25 19:44:31 mike Exp $
+// $Id: CQLBooleanNode.java,v 1.6 2002-10-31 22:22:01 mike Exp $
 
 package org.z3950.zing.cql;
 
 
 /**
- * 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.6 2002-10-31 22:22:01 mike Exp $
  */
 public abstract class CQLBooleanNode extends CQLNode {
     protected CQLNode left;
@@ -17,13 +17,20 @@ public abstract class CQLBooleanNode extends CQLNode {
 
     String toXCQL(int level) {
 	return (indent(level) + "<triple>\n" +
-		indent(level+1) + "<boolean>" + op() + "</boolean>\n" +
+		booleanXQL(level+1) +
 		left.toXCQL(level+1) +
 		right.toXCQL(level+1) +
 		indent(level) + "</triple>\n");
     }
 
+    String booleanXQL(int level) {
+	return(indent(level) + "<boolean>\n" +
+	       indent(level+1) + "<value>" + op() + "</value>\n" +
+	       indent(level) + "</boolean>\n");
+    }
+
     String toCQL() {
+	// ### We don't always need parens around the operands
 	return "(" + left.toCQL() + ") " + op() + " (" + right.toCQL() + ")";
     }
 }