X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Forg%2Fz3950%2Fzing%2Fcql%2FCQLPrefixNode.java;h=3e2ad87992509080a9d8e10e39253b9a2de17169;hb=18405938a115378cc571d697060ac40775c62fb7;hp=604ef5f69699fc1974a4317eb90855961f0905e4;hpb=08be5e2bc983dc2537b3efae7e4336322c297a0c;p=cql-java-moved-to-github.git

diff --git a/src/org/z3950/zing/cql/CQLPrefixNode.java b/src/org/z3950/zing/cql/CQLPrefixNode.java
index 604ef5f..3e2ad87 100644
--- 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.2 2002-11-14 22:07:32 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.2 2002-11-14 22:07:32 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);
+    }
 }