X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Forg%2Fz3950%2Fzing%2Fcql%2FCQLTermNode.java;h=5889354c478be34e3db824ebef47f32a4e9473c5;hb=df372083094087da8590a526e0222c81c9ae7fc0;hp=64a0a8414a30e83cb10a59ffcb958d1019adbc42;hpb=953117d805ff5f53b2b3c541eff5ecd6461eba29;p=cql-java-moved-to-github.git

diff --git a/src/org/z3950/zing/cql/CQLTermNode.java b/src/org/z3950/zing/cql/CQLTermNode.java
index 64a0a84..5889354 100644
--- a/src/org/z3950/zing/cql/CQLTermNode.java
+++ b/src/org/z3950/zing/cql/CQLTermNode.java
@@ -1,55 +1,112 @@
-// $Id: CQLTermNode.java,v 1.3 2002-10-25 16:56:43 mike Exp $
+// $Id: CQLTermNode.java,v 1.7 2002-11-06 00:05:58 mike Exp $
 
 package org.z3950.zing.cql;
+import java.util.Properties;
+import java.util.Vector;
 
 
 /**
- * Represents a terminal node in a CQL parse-tree ...
- * ###
+ * Represents a terminal node in a CQL parse-tree.
+ * A term node consists of the term String itself, together with,
+ * optionally, a qualifier string and a relation.  Neither or both of
+ * these must be provided - you can't have a qualifier without a
+ * relation or vice versa.
  *
- * @version	$Id: CQLTermNode.java,v 1.3 2002-10-25 16:56:43 mike Exp $
+ * @version	$Id: CQLTermNode.java,v 1.7 2002-11-06 00:05:58 mike Exp $
  */
 public class CQLTermNode extends CQLNode {
     private String qualifier;
-    private String relation;
+    private CQLRelation relation;
     private String term;
 
-    public CQLTermNode(String qualifier, String relation, String term) {
+    /**
+     * Creates a new term node with the specified <TT>qualifier</TT>,
+     * <TT>relation</TT> and <TT>term</TT>.  The first two may be
+     * <TT>null</TT>, but the <TT>term</TT> may not.
+     */
+    public CQLTermNode(String qualifier, CQLRelation relation, String term) {
 	this.qualifier = qualifier;
 	this.relation = relation;
 	this.term = term;
     }
 
-    String toXCQL(int level) {
+    public String getQualifier() { return qualifier; }
+    public CQLRelation getRelation() { return relation; }
+    public String getTerm() { return term; }
+
+    public String toXCQL(int level) {
 	return (indent(level) + "<searchClause>\n" +
-		indent(level+1) + "<index>" + qualifier + "<index>\n" +
-		indent(level+1) + "<relation>" + relation + "<relation>\n" +
-		indent(level+1) + "<term>" + term + "<term>\n" +
+		indent(level+1) + "<index>" + xq(qualifier) + "</index>\n" +
+		relation.toXCQL(level+1) +
+		indent(level+1) + "<term>" + xq(term) + "</term>\n" +
 		indent(level) + "</searchClause>\n");
     }
 
-    String toCQL() {
-	String quotedTerm = term;
+    public String toCQL() {
+	String quotedQualifier = maybeQuote(qualifier);
+	String quotedTerm = maybeQuote(term);
+	String res = quotedTerm;
 
-	if (quotedTerm.indexOf('"') != -1) {
-	    // ### precede each '"' with a '/'
+	if (!qualifier.equalsIgnoreCase("srw.serverChoice")) {
+	    // ### We don't always need spaces around `relation'.
+	    res = quotedQualifier + " " + relation.toCQL() + " " + quotedTerm;
 	}
 
-	// ### There must be a better way ...
-	if (quotedTerm.indexOf('"') != -1 ||
-	    quotedTerm.indexOf(' ') != -1 ||
-	    quotedTerm.indexOf('\t') != -1 ||
-	    quotedTerm.indexOf('=') != -1 ||
-	    quotedTerm.indexOf('<') != -1 ||
-	    quotedTerm.indexOf('>') != -1 ||
-	    quotedTerm.indexOf('/') != -1 ||
-	    quotedTerm.indexOf('(') != -1 ||
-	    quotedTerm.indexOf(')') != -1) {
-	    quotedTerm = '"' + quotedTerm + '"';
+	return res;
+    }
+
+    public String toPQF(Properties config)
+	throws UnknownQualifierException, UnknownRelationException {
+	Vector attrs = new Vector();
+
+	if (qualifier != null) {
+	    String s = config.getProperty(qualifier);
+	    if (s == null)
+		throw new UnknownQualifierException(qualifier);
+	    attrs.add(s);
+	} else {
+	    // ### get a default access point from properties?
+	}
+
+	if (relation != null) {
+	    String rel = relation.getBase();
+	    // ### handle "any" and "all"
+	    String s = config.getProperty("cql-java.relation." + rel);
+	    if (s == null)
+		throw new UnknownRelationException(rel);
+	    attrs.add(s);
+	} else {
+	    // ### get a default relation from properties?
+	}
+
+	// ### handle position attributes
+	// ### handle structure attributes
+	// ### handle "always" attributes
+
+	// ### should split Vector elements on spaces
+	String s = "";
+	for (int i = 0; i < attrs.size(); i++) {
+	    s += "@attr " + (String) attrs.get(i) + " ";
+	}
+
+	return s + maybeQuote(term);
+    }
+
+    static String maybeQuote(String str) {
+	// There _must_ be a better way to make this test ...
+	if (str.length() == 0 ||
+	    str.indexOf('"') != -1 ||
+	    str.indexOf(' ') != -1 ||
+	    str.indexOf('\t') != -1 ||
+	    str.indexOf('=') != -1 ||
+	    str.indexOf('<') != -1 ||
+	    str.indexOf('>') != -1 ||
+	    str.indexOf('/') != -1 ||
+	    str.indexOf('(') != -1 ||
+	    str.indexOf(')') != -1) {
+	    str = '"' + Utils.replaceString(str, "\"", "\\\"") + '"';
 	}
 
-	// ### The qualifier may need quoting.
-	// ### We don't always need spaces around `relation'.
-	return qualifier + " " + relation + " " + quotedTerm;
+	return str;
     }
 }