X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Forg%2Fz3950%2Fzing%2Fcql%2FCQLPrefixNode.java;h=aae60388b9c6a6a1207649b070db11b8ea27a2c8;hb=f57d48d060411f662eea823b97cc45038bda0def;hp=3e2ad87992509080a9d8e10e39253b9a2de17169;hpb=e57e14d4481428581265449445514fb426fbea45;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 3e2ad87..aae6038 100644
--- a/src/org/z3950/zing/cql/CQLPrefixNode.java
+++ b/src/org/z3950/zing/cql/CQLPrefixNode.java
@@ -1,4 +1,4 @@
-// $Id: CQLPrefixNode.java,v 1.5 2002-12-11 17:14:20 mike Exp $
+// $Id: CQLPrefixNode.java,v 1.9 2007-07-03 13:40:41 mike Exp $
package org.z3950.zing.cql;
import java.lang.String;
@@ -9,7 +9,7 @@ import java.util.Vector;
/**
* Represents a prefix node in a CQL parse-tree.
*
- * @version $Id: CQLPrefixNode.java,v 1.5 2002-12-11 17:14:20 mike Exp $
+ * @version $Id: CQLPrefixNode.java,v 1.9 2007-07-03 13:40:41 mike Exp $
*/
public class CQLPrefixNode extends CQLNode {
/**
@@ -25,7 +25,7 @@ public class CQLPrefixNode extends CQLNode {
/**
* Creates a new CQLPrefixNode inducing a mapping from the
- * specified qualifier-set name to the specified identifier across
+ * specified index-set name to the specified identifier across
* the specified subtree.
*/
public CQLPrefixNode(String name, String identifier, CQLNode subtree) {
@@ -33,30 +33,32 @@ public class CQLPrefixNode extends CQLNode {
this.subtree = subtree;
}
- public String toXCQL(int level, Vector prefixes) {
-// String maybeName = "";
-// if (prefix.name != null)
-// maybeName = indent(level+1) + "" + prefix.name + "\n";
-//
-// return (indent(level) + "\n" + maybeName +
-// indent(level+1) +
-// "" + prefix.identifier + "\n" +
-// subtree.toXCQL(level+1, prefixes) +
-// indent(level) + "\n");
- Vector tmp = new Vector(prefixes);
+ public String toXCQL(int level, Vector prefixes,
+ Vector sortkeys) {
+ if (sortkeys != null)
+ throw new Error("CQLPrefixNode.toXCQL() called with sortkeys");
+
+ Vector tmp = (prefixes == null ?
+ new Vector() :
+ new Vector(prefixes));
tmp.add(prefix);
return subtree.toXCQL(level, tmp);
}
public String toCQL() {
- // ### We don't always need parens around the operand
- return ">" + prefix.name + "=\"" + prefix.identifier + "\" " +
- "(" + subtree.toCQL() + ")";
+ // ### We don't always need parens around the subtree
+ if (prefix.name == null) {
+ return ">\"" + prefix.identifier + "\" " +
+ "(" + subtree.toCQL() + ")";
+ } else {
+ return ">" + prefix.name + "=\"" + prefix.identifier + "\" " +
+ "(" + subtree.toCQL() + ")";
+ }
}
public String toPQF(Properties config) throws PQFTranslationException {
// Prefixes and their identifiers don't actually play any role
- // in PQF translation, since the meanings of the qualifiers,
+ // in PQF translation, since the meanings of the indexes,
// including their prefixes if any, are instead wired into
// `config'.
return subtree.toPQF(config);