toXCQL() refactored as layer over new underlyingToXCQL()

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

diff --git a/src/org/z3950/zing/cql/ModifierSet.java b/src/org/z3950/zing/cql/ModifierSet.java
index 79e09e9..7b6991a 100644 (file)
--- a/src/org/z3950/zing/cql/ModifierSet.java
+++ b/src/org/z3950/zing/cql/ModifierSet.java
@@ -1,4 +1,4 @@
-// $Id: ModifierSet.java,v 1.9 2007-06-27 17:01:38 mike Exp $
+// $Id: ModifierSet.java,v 1.13 2007-07-03 13:30:18 mike Exp $
 
 package org.z3950.zing.cql;
 import java.util.Vector;
@@ -15,7 +15,7 @@ import java.lang.StringBuffer;
  * zero or more <I>type</I> <I>comparison</I> <I>value</I> pairs,
  * where type, comparison and value are all strings.
  *
- * @version $Id: ModifierSet.java,v 1.9 2007-06-27 17:01:38 mike Exp $
+ * @version $Id: ModifierSet.java,v 1.13 2007-07-03 13:30:18 mike Exp $
  */
 public class ModifierSet {
     String base;
@@ -37,12 +37,20 @@ public class ModifierSet {
     }
 
     /**
-     * Adds a modifier of the specified <TT>type</TT> and
-     * <TT>value</TT> to a ModifierSet.
+     * Adds a modifier of the specified <TT>type</TT>,
+     * <TT>comparison</TT> and <TT>value</TT> to a ModifierSet.
      */
-    public void addModifier(String type, String value) {
-       // ### Need to have comparison passed in
-       Modifier modifier = new Modifier(type, null, value);
+    public void addModifier(String type, String comparison, String value) {
+       Modifier modifier = new Modifier(type, comparison, value);
+       modifiers.add(modifier);
+    }
+
+    /**
+     * Adds a modifier of the specified <TT>type</TT>, but with no
+     * <TT>comparison</TT> and <TT>value</TT>, to a ModifierSet.
+     */
+    public void addModifier(String type) {
+       Modifier modifier = new Modifier(type);
        modifiers.add(modifier);
     }
 
@@ -70,14 +78,24 @@ public class ModifierSet {
     }
 
     public String toXCQL(int level, String topLevelElement) {
+       return underlyingToXCQL(level, topLevelElement, "value");
+    }
+
+    public String sortKeyToXCQL(int level) {
+       return underlyingToXCQL(level, "key", "index");
+    }
+
+    private String underlyingToXCQL(int level, String topLevelElement,
+                                   String valueElement) {
        StringBuffer buf = new StringBuffer();
        buf.append(Utils.indent(level) + "<" + topLevelElement + ">\n");
        buf.append(Utils.indent(level+1) +
-                  "<value>" + Utils.xq(base) + "</value>\n");
+                  "<" + valueElement + ">" + Utils.xq(base) +
+                  "</" + valueElement + ">\n");
        if (modifiers.size() > 0) {
            buf.append(Utils.indent(level+1) + "<modifiers>\n");
            for (int i = 0; i < modifiers.size(); i++) {
-               buf.append(modifiers.get(i).toXCQL(level+2, "relation"));
+               buf.append(modifiers.get(i).toXCQL(level+2, "comparison"));
            }
            buf.append(Utils.indent(level+1) + "</modifiers>\n");
        }
@@ -96,13 +114,13 @@ public class ModifierSet {
 
     public static void main(String[] args) {
        if (args.length < 1) {
-           System.err.println("Usage: ModifierSet <base> [<type> <name>]...");
+           System.err.println("Usage: ModifierSet <base> [<type> <comparison> <name>]...");
            System.exit(1);
        }
 
        ModifierSet res = new ModifierSet(args[0]);
-       for (int i = 1; i < args.length; i += 2) {
-           res.addModifier(args[i], args[i+1]);
+       for (int i = 1; i < args.length; i += 3) {
+           res.addModifier(args[i], args[i+1], args[i+2]);
        }
 
        System.out.println(res.toCQL());