Patch sent by Rafe Rosen <rr236@cornell.edu>

[cql-java-moved-to-github.git] / src / org / z3950 / zing / cql / CQLPrefixNode.java

diff --git a/src/org/z3950/zing/cql/CQLPrefixNode.java b/src/org/z3950/zing/cql/CQLPrefixNode.java
index 43a526c..3e2ad87 100644 (file)
--- a/src/org/z3950/zing/cql/CQLPrefixNode.java
+++ b/src/org/z3950/zing/cql/CQLPrefixNode.java
@@ -1,14 +1,15 @@
-// $Id: CQLPrefixNode.java,v 1.1 2002-11-14 22:04:16 mike Exp $
+// $Id: CQLPrefixNode.java,v 1.5 2002-12-11 17:14:20 mike Exp $
 
 package org.z3950.zing.cql;
 import java.lang.String;
 import java.util.Properties;
+import java.util.Vector;
 
 
 /**
  * Represents a prefix node in a CQL parse-tree.
  *
- * @version    $Id: CQLPrefixNode.java,v 1.1 2002-11-14 22:04:16 mike Exp $
+ * @version    $Id: CQLPrefixNode.java,v 1.5 2002-12-11 17:14:20 mike Exp $
  */
 public class CQLPrefixNode extends CQLNode {
     /**
@@ -32,16 +33,19 @@ public class CQLPrefixNode extends CQLNode {
        this.subtree = subtree;
     }
 
-    public String toXCQL(int level) {
-       String maybeName = "";
-       if (prefix.name != null)
-           maybeName = indent(level+1) + "<name>" + prefix.name + "<name>\n";
-
-       return (indent(level) + "<prefix>\n" + maybeName +
-               indent(level+1) +
-                   "<identifier>" + prefix.identifier + "<identifier>\n" +
-               subtree.toXCQL(level+1) +
-               indent(level) + "</prefix>\n");
+    public String toXCQL(int level, Vector prefixes) {
+//     String maybeName = "";
+//     if (prefix.name != null)
+//         maybeName = indent(level+1) + "<name>" + prefix.name + "</name>\n";
+//
+//     return (indent(level) + "<prefix>\n" + maybeName +
+//             indent(level+1) +
+//                 "<identifier>" + prefix.identifier + "</identifier>\n" +
+//             subtree.toXCQL(level+1, prefixes) +
+//             indent(level) + "</prefix>\n");
+       Vector tmp = new Vector(prefixes);
+       tmp.add(prefix);
+       return subtree.toXCQL(level, tmp);
     }
 
     public String toCQL() {
@@ -57,4 +61,9 @@ public class CQLPrefixNode extends CQLNode {
        // `config'.
        return subtree.toPQF(config);
     }
+
+    public byte[] toType1BER(Properties config) throws PQFTranslationException {
+       // See comment on toPQF()
+       return subtree.toType1BER(config);
+    }
 }