X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Forg%2Fz3950%2Fzing%2Fcql%2FModifierSet.java;h=c04bb88f7eee296ba5bedfa12eab2f1d917d80e2;hb=64ca1306b4e0d55a8b15b8da982bc1d37bc8b63c;hp=213f1992bd4f71dfe70c6a17f9c5c0cf34b1c3a4;hpb=00b61385371994aaf79ad06561e0d775754567ad;p=cql-java-moved-to-github.git

diff --git a/src/main/java/org/z3950/zing/cql/ModifierSet.java b/src/main/java/org/z3950/zing/cql/ModifierSet.java
index 213f199..c04bb88 100644
--- a/src/main/java/org/z3950/zing/cql/ModifierSet.java
+++ b/src/main/java/org/z3950/zing/cql/ModifierSet.java
@@ -4,8 +4,6 @@ package org.z3950.zing.cql;
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.z3950.zing.cql.Utils.*;
-
 /**
  * Represents a base String and a set of Modifiers.
  * <P>
@@ -80,30 +78,33 @@ public class ModifierSet {
     }
 
     public String toXCQL(int level, String topLevelElement) {
-	return underlyingToXCQL(level, topLevelElement, "value");
+	return "";//underlyingToXCQL(level, topLevelElement, "value");
     }
 
     public String sortKeyToXCQL(int level) {
-	return underlyingToXCQL(level, "key", "index");
+	return "";//underlyingToXCQL(level, "key", "index");
+    }
+
+    protected XCQLBuilder toXCQLInternal(XCQLBuilder b, int level,
+        String topLevelElement) {
+        return toXCQLInternal(b, level, topLevelElement, "value");
     }
 
-    private String underlyingToXCQL(int level, String topLevelElement,
-				    String valueElement) {
-	StringBuilder buf = new StringBuilder();
-	buf.append(indent(level)).append("<").append(topLevelElement).
-            append(">\n").append(indent(level + 1)).append("<").
-            append(valueElement).append(">").append(xq(base)).append("</").
+    private XCQLBuilder toXCQLInternal(XCQLBuilder b, int level, 
+        String topLevelElement, String valueElement) {
+	b.indent(level).append("<").append(topLevelElement).
+            append(">\n").indent(level + 1).append("<").
+            append(valueElement).append(">").xq(base).append("</").
             append(valueElement).append(">\n");
 	if (modifiers.size() > 0) {
-	    buf.append(indent(level + 1)).append("<modifiers>\n");
+	    b.indent(level + 1).append("<modifiers>\n");
 	    for (int i = 0; i < modifiers.size(); i++) {
-		buf.append(modifiers.get(i).toXCQL(level+2, "comparison"));
+              modifiers.get(i).toXCQLInternal(b, level+2, "comparison");
 	    }
-	    buf.append(indent(level + 1)).append("</modifiers>\n");
+	    b.indent(level + 1).append("</modifiers>\n");
 	}
-	buf.append(indent(level)).append("</").append(topLevelElement).
-            append(">\n");
-	return buf.toString();
+	b.indent(level).append("</").append(topLevelElement).append(">\n");
+        return b;
     }
 
     public String toCQL() {