From: mike <mike>
Date: Tue, 3 Jul 2007 13:41:24 +0000 (+0000)
Subject: Implement new, wider toXCQL() API.
X-Git-Tag: v1.5~54
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=d90bf698cbf07f0b2bcf4fc79357516e8bd934fd;p=cql-java-moved-to-github.git

Implement new, wider toXCQL() API.
Render sort keys, if any.
---

diff --git a/src/org/z3950/zing/cql/CQLTermNode.java b/src/org/z3950/zing/cql/CQLTermNode.java
index 1d500a7..f9b17ac 100644
--- a/src/org/z3950/zing/cql/CQLTermNode.java
+++ b/src/org/z3950/zing/cql/CQLTermNode.java
@@ -1,4 +1,4 @@
-// $Id: CQLTermNode.java,v 1.27 2007-06-29 15:26:29 mike Exp $
+// $Id: CQLTermNode.java,v 1.28 2007-07-03 13:41:24 mike Exp $
 
 package org.z3950.zing.cql;
 import java.util.Properties;
@@ -12,7 +12,7 @@ import java.util.Vector;
  * these must be provided - you can't have an index without a
  * relation or vice versa.
  *
- * @version	$Id: CQLTermNode.java,v 1.27 2007-06-29 15:26:29 mike Exp $
+ * @version	$Id: CQLTermNode.java,v 1.28 2007-07-03 13:41:24 mike Exp $
  */
 public class CQLTermNode extends CQLNode {
     private String index;
@@ -50,12 +50,14 @@ public class CQLTermNode extends CQLNode {
 	    return null;
     }
 
-    public String toXCQL(int level, Vector prefixes) {
+    public String toXCQL(int level, Vector<CQLPrefix> prefixes,
+			 Vector<ModifierSet> sortkeys) {
 	return (indent(level) + "<searchClause>\n" +
 		renderPrefixes(level+1, prefixes) +
 		indent(level+1) + "<index>" + xq(index) + "</index>\n" +
-		relation.toXCQL(level+1, new Vector<String>()) +
+		relation.toXCQL(level+1) +
 		indent(level+1) + "<term>" + xq(term) + "</term>\n" +
+		renderSortKeys(level+1, sortkeys) +
 		indent(level) + "</searchClause>\n");
     }