Finish (more or less) to CQL-to-PQF translator.

[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 a3c3749..b0ca761 100644 (file)
--- a/src/org/z3950/zing/cql/CQLBooleanNode.java
+++ b/src/org/z3950/zing/cql/CQLBooleanNode.java
@@ -1,12 +1,13 @@
-// $Id: CQLBooleanNode.java,v 1.7 2002-11-06 00:05:58 mike Exp $
+// $Id: CQLBooleanNode.java,v 1.8 2002-11-06 20:13:45 mike Exp $
 
 package org.z3950.zing.cql;
+import java.util.Properties;
 
 
 /**
  * Represents a boolean node in a CQL parse-tree.
  *
- * @version    $Id: CQLBooleanNode.java,v 1.7 2002-11-06 00:05:58 mike Exp $
+ * @version    $Id: CQLBooleanNode.java,v 1.8 2002-11-06 20:13:45 mike Exp $
  */
 public abstract class CQLBooleanNode extends CQLNode {
     CQLBooleanNode() {}                // prevent javadoc from documenting this
@@ -21,18 +22,16 @@ public abstract class CQLBooleanNode extends CQLNode {
      */ 
     public CQLNode right;
 
-    abstract String op();
-
     public String toXCQL(int level) {
        return (indent(level) + "<triple>\n" +
-               booleanXQL(level+1) +
+               opXQL(level+1) +
                left.toXCQL(level+1) +
                right.toXCQL(level+1) +
                indent(level) + "</triple>\n");
     }
 
     // Represents the boolean operation itself: overridden for CQLProxNode
-    String booleanXQL(int level) {
+    String opXQL(int level) {
        return(indent(level) + "<boolean>\n" +
               indent(level+1) + "<value>" + op() + "</value>\n" +
               indent(level) + "</boolean>\n");
@@ -42,4 +41,15 @@ public abstract class CQLBooleanNode extends CQLNode {
        // ### We don't always need parens around the operands
        return "(" + left.toCQL() + ") " + op() + " (" + 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 op(); }
+
+    abstract String op();
 }