All sorts of changes. Generally moving towards first release.

[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 489e39b..56c212f 100644 (file)
--- 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.5 2002-10-30 09:19:26 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.
- * ###
+ * ##
  *
- * @version    $Id: CQLBooleanNode.java,v 1.5 2002-10-30 09:19:26 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,12 +17,18 @@ 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() + ")";