-// $Id: CQLTermNode.java,v 1.19 2003-01-13 13:08:59 mike Exp $
+// $Id: CQLTermNode.java,v 1.22 2006-06-14 14:36:36 mike Exp $
package org.z3950.zing.cql;
import java.util.Properties;
* 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.22 2006-06-14 14:36:36 mike Exp $
*/
public class CQLTermNode extends CQLNode {
private String qualifier;
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;
}
}
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 ||
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