X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Forg%2Fz3950%2Fzing%2Fcql%2FCQLTermNode.java;h=a519215d528283ffd3cdc27e76b8aed576680f2a;hb=18405938a115378cc571d697060ac40775c62fb7;hp=516fd33b6db5993ec889f1ba91755143d708fe42;hpb=f8f333c94f7654313b529a6e879b5d23364c34e3;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 516fd33..a519215 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.12 2002-12-05 17:14:52 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;
@@ -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.12 2002-12-05 17:14:52 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;
@@ -34,6 +34,19 @@ public class CQLTermNode extends CQLNode {
     public CQLRelation getRelation() { return relation; }
     public String getTerm() { return term; }
 
+    private static boolean isResultSetQualifier(String qual) {
+	return (qual.equals("srw.resultSet") ||
+		qual.equals("srw.resultSetId") ||
+		qual.equals("srw.resultSetName"));
+    }
+
+    public String getResultSetName() {
+	if (isResultSetQualifier(qualifier))
+	    return term;
+	else
+	    return null;
+    }
+
     public String toXCQL(int level, Vector prefixes) {
 	return (indent(level) + "<searchClause>\n" +
 		renderPrefixes(level+1, prefixes) +
@@ -48,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;
 	}
@@ -103,12 +117,23 @@ public class CQLTermNode extends CQLNode {
 	    attrs.add(attr);
 	}
 
-	String pos = "unanchored";
+	String pos = "any";
 	String text = term;
 	if (text.length() > 0 && text.substring(0, 1).equals("^")) {
-	    text = text.substring(1);
-	    pos = "anchored";
+	    text = text.substring(1); // ### change not seen by caller
+	    pos = "first";
 	}
+	int len = text.length();
+	if (len > 0 && text.substring(len-1, len).equals("^")) {
+	    text = text.substring(0, len-1); // ### change not seen by caller
+	    pos = pos.equals("first") ? "firstAndLast" : "last";
+	    // ### in the firstAndLast case, the standard
+	    //  pqf.properties file specifies that we generate a
+	    //  completeness=whole-field attributem, which means that
+	    //  we don't generate a position attribute at all.  Do we
+	    //  care?  Does it matter?
+	}
+
 	attr = config.getProperty("position." + pos);
 	if (attr == null)
 	    throw new UnknownPositionException(pos);
@@ -123,6 +148,12 @@ public class CQLTermNode extends CQLNode {
     }
 
     public String toPQF(Properties config) throws PQFTranslationException {
+	if (isResultSetQualifier(qualifier)) {
+	    // Special case: ignore relation, modifiers, wildcards, etc.
+	    // There's parallel code in toType1BER()
+	    return "@set " + maybeQuote(term);
+	}
+
 	Vector attrs = getAttrs(config);
 
 	String attr, s = "";
@@ -134,10 +165,17 @@ public class CQLTermNode extends CQLNode {
 	String text = term;
 	if (text.length() > 0 && text.substring(0, 1).equals("^"))
 	    text = text.substring(1);
+	int len = text.length();
+	if (len > 0 && text.substring(len-1, len).equals("^"))
+	    text = text.substring(0, len-1);
+
 	return s + maybeQuote(text);
     }
 
     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 ||
@@ -155,15 +193,34 @@ public class CQLTermNode extends CQLNode {
 	return str;
     }
 
-    /**
-     * ### Document this!
-     */
-    public byte[] toType1(Properties config) throws PQFTranslationException {
+    public byte[] toType1BER(Properties config) throws PQFTranslationException {
+	if (isResultSetQualifier(qualifier)) {
+	    // Special case: ignore relation, modifiers, wildcards, etc.
+	    // There's parallel code in toPQF()
+	    byte[] operand = new byte[term.length()+100];
+	    int offset;
+	    offset = putTag(CONTEXT, 0, CONSTRUCTED, operand, 0); // op
+	    operand[offset++] = (byte)(0x80&0xff); // indefinite length
+	    offset = putTag(CONTEXT, 31, PRIMITIVE, operand, offset); // ResultSetId
+	    byte[] t = term.getBytes();
+	    offset = putLen(t.length, operand, offset);
+	    System.arraycopy(t, 0, operand, offset, t.length);
+	    offset += t.length;
+	    operand[offset++] = 0x00; // end of Operand
+	    operand[offset++] = 0x00;
+	    byte[] o = new byte[offset];
+	    System.arraycopy(operand, 0, o, 0, offset);
+	    return o;
+	}
+
 	String text = term;
 	if (text.length() > 0 && text.substring(0, 1).equals("^"))
 	    text = text.substring(1);
-	String attr, attrList, term = maybeQuote(text);
-	System.out.println("in CQLTermNode.toType101(): PQF=" + toPQF(config));
+	int len = text.length();
+	if (len > 0 && text.substring(len-1, len).equals("^"))
+	    text = text.substring(0, len-1);
+
+	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
@@ -172,8 +229,6 @@ public class CQLTermNode extends CQLNode {
 	operand[offset++] = (byte)(0x80&0xff); // indefinite length
 	offset = putTag(CONTEXT, 44, CONSTRUCTED, operand, offset); // AttributeList
 	operand[offset++] = (byte)(0x80&0xff); // indefinite length
-	offset = putTag(UNIVERSAL, SEQUENCE, CONSTRUCTED, operand, offset);
-	operand[offset++] = (byte)(0x80&0xff);
 
 	Vector attrs = getAttrs(config);
 	for(i = 0; i < attrs.size(); i++) {
@@ -183,6 +238,8 @@ public class CQLTermNode extends CQLNode {
 	    while (st.hasMoreTokens()) {
 		attr = st.nextToken();
 		j = attr.indexOf('=');
+		offset = putTag(UNIVERSAL, SEQUENCE, CONSTRUCTED, operand, offset);
+		operand[offset++] = (byte)(0x80&0xff);
 		offset = putTag(CONTEXT, 120, PRIMITIVE, operand, offset);
 		type = Integer.parseInt(attr.substring(0, j));
 		offset = putLen(numLen(type), operand, offset);
@@ -192,10 +249,10 @@ public class CQLTermNode extends CQLNode {
 		value = Integer.parseInt(attr.substring(j+1));
 		offset = putLen(numLen(value), operand, offset);
 		offset = putNum(value, operand, offset);
+		operand[offset++] = 0x00; // end of SEQUENCE
+		operand[offset++] = 0x00;
 	    }
 	}
-	operand[offset++] = 0x00; // end of SEQUENCE
-	operand[offset++] = 0x00;
 	operand[offset++] = 0x00; // end of AttributeList
 	operand[offset++] = 0x00;