X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Forg%2Fz3950%2Fzing%2Fcql%2FCQLTermNode.java;h=841c139cf58bf7cfe5c0165aa14d45612546c373;hb=f3c88fe15ee06a671407a0368e449db991526802;hp=1a7cdd200d95210bc621830c8a48bc48c0b9856f;hpb=08b7134bda92b6a33c57c7c6c333dacf1461c7c7;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 1a7cdd2..841c139 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.19 2003-01-13 13:08:59 mike Exp $
+// $Id: CQLTermNode.java,v 1.23 2007-06-06 12:22:01 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 a qualifier without a
  * relation or vice versa.
  *
- * @version	$Id: CQLTermNode.java,v 1.19 2003-01-13 13:08:59 mike Exp $
+ * @version	$Id: CQLTermNode.java,v 1.23 2007-06-06 12:22:01 mike Exp $
  */
 public class CQLTermNode extends CQLNode {
     private String qualifier;
@@ -51,7 +51,7 @@ public class CQLTermNode extends CQLNode {
 	return (indent(level) + "<searchClause>\n" +
 		renderPrefixes(level+1, prefixes) +
 		indent(level+1) + "<index>" + xq(qualifier) + "</index>\n" +
-		relation.toXCQL(level+1, new Vector()) +
+		relation.toXCQL(level+1, new Vector<String>()) +
 		indent(level+1) + "<term>" + xq(term) + "</term>\n" +
 		indent(level) + "</searchClause>\n");
     }
@@ -61,7 +61,8 @@ public class CQLTermNode extends CQLNode {
 	String quotedTerm = maybeQuote(term);
 	String res = quotedTerm;
 
-	if (!qualifier.equalsIgnoreCase("srw.serverChoice")) {
+	if (qualifier != null &&
+	    !qualifier.equalsIgnoreCase("srw.serverChoice")) {
 	    // ### We don't always need spaces around `relation'.
 	    res = quotedQualifier + " " + relation.toCQL() + " " + quotedTerm;
 	}
@@ -73,7 +74,7 @@ public class CQLTermNode extends CQLNode {
     //	regards truncation of the term and generation of truncation
     //	attributes.  Change the interface to fix this.
     private Vector getAttrs(Properties config) throws PQFTranslationException {
-	Vector attrs = new Vector();
+	Vector<String> attrs = new Vector<String>();
 
 	// Do this first so that if any other truncation or
 	// completeness attributes are generated, they "overwrite"
@@ -172,6 +173,9 @@ public class CQLTermNode extends CQLNode {
     }
 
     static String maybeQuote(String str) {
+       if (str == null)
+          return null;
+
 	// There _must_ be a better way to make this test ...
 	if (str.length() == 0 ||
 	    str.indexOf('"') != -1 ||
@@ -216,8 +220,7 @@ public class CQLTermNode extends CQLNode {
 	if (len > 0 && text.substring(len-1, len).equals("^"))
 	    text = text.substring(0, len-1);
 
-	String attr, attrList, term = maybeQuote(text);
-	System.out.println("in CQLTermNode.toType1BER(): PQF=" + toPQF(config));
+	String attr, attrList, term = text;
 	byte[] operand = new byte[text.length()+100];
 	int i, j, offset, type, value;
 	offset = putTag(CONTEXT, 0, CONSTRUCTED, operand, 0); // op