X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Forg%2Fz3950%2Fzing%2Fcql%2FCQLTermNode.java;h=516fd33b6db5993ec889f1ba91755143d708fe42;hb=f8f333c94f7654313b529a6e879b5d23364c34e3;hp=49d42b3d495cf30abd0ea3892b415ab8a6f55429;hpb=f744abfa23a7e569a156e4686e0e8e3cec242652;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 49d42b3..516fd33 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.9 2002-11-20 01:15:15 mike Exp $
+// $Id: CQLTermNode.java,v 1.12 2002-12-05 17:14:52 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.9 2002-11-20 01:15:15 mike Exp $
+ * @version	$Id: CQLTermNode.java,v 1.12 2002-12-05 17:14:52 mike Exp $
  */
 public class CQLTermNode extends CQLNode {
     private String qualifier;
@@ -39,8 +39,7 @@ public class CQLTermNode extends CQLNode {
 		renderPrefixes(level+1, prefixes) +
 		indent(level+1) + "<index>" + xq(qualifier) + "</index>\n" +
 		relation.toXCQL(level+1, new Vector()) +
-		indent(level+2) + "<term>" + xq(term) + "</term>\n" +
-		// ######### ^-- this should be "1"
+		indent(level+1) + "<term>" + xq(term) + "</term>\n" +
 		indent(level) + "</searchClause>\n");
     }
 
@@ -57,10 +56,24 @@ public class CQLTermNode extends CQLNode {
 	return res;
     }
 
-    public String toPQF(Properties config) throws PQFTranslationException {
+    // ### Interaction between this and its callers is not good as
+    //	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();
 
-	String attr;
+	// Do this first so that if any other truncation or
+	// completeness attributes are generated, they "overwrite"
+	// those specified here.
+	//
+	//  ###	This approach relies on an unpleasant detail of Index
+	//	Data's (admittedly definitive) implementation of PQF,
+	//	and should not relied upon.
+	//
+	String attr = config.getProperty("always");
+	if (attr != null)
+	    attrs.add(attr);
+
 	attr = config.getProperty("qualifier." + qualifier);
 	if (attr == null)
 	    throw new UnknownQualifierException(qualifier);
@@ -106,16 +119,21 @@ public class CQLTermNode extends CQLNode {
 	    attr = config.getProperty("structure.*");
 	attrs.add(attr);
 
-	attr = config.getProperty("always");
-	if (attr != null)
-	    attrs.add(attr);
+	return attrs;
+    }
+
+    public String toPQF(Properties config) throws PQFTranslationException {
+	Vector attrs = getAttrs(config);
 
-	String s = "";
+	String attr, s = "";
 	for (int i = 0; i < attrs.size(); i++) {
 	    attr = (String) attrs.get(i);
 	    s += "@attr " + Utils.replaceString(attr, " ", " @attr ") + " ";
 	}
 
+	String text = term;
+	if (text.length() > 0 && text.substring(0, 1).equals("^"))
+	    text = text.substring(1);
 	return s + maybeQuote(text);
     }
 
@@ -136,4 +154,63 @@ public class CQLTermNode extends CQLNode {
 
 	return str;
     }
+
+    /**
+     * ### Document this!
+     */
+    public byte[] toType1(Properties config) throws PQFTranslationException {
+	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));
+	byte[] operand = new byte[text.length()+100];
+	int i, j, offset, type, value;
+	offset = putTag(CONTEXT, 0, CONSTRUCTED, operand, 0); // op
+	operand[offset++]=(byte)(0x80&0xff); // indefinite length
+	offset = putTag(CONTEXT, 102, CONSTRUCTED, operand, offset); // AttributesPlusTerm
+	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++) {
+	    attrList = (String) attrs.get(i);
+	    java.util.StringTokenizer st =
+		new java.util.StringTokenizer(attrList);
+	    while (st.hasMoreTokens()) {
+		attr = st.nextToken();
+		j = attr.indexOf('=');
+		offset = putTag(CONTEXT, 120, PRIMITIVE, operand, offset);
+		type = Integer.parseInt(attr.substring(0, j));
+		offset = putLen(numLen(type), operand, offset);
+		offset = putNum(type, operand, offset);
+
+		offset = putTag(CONTEXT, 121, PRIMITIVE, operand, offset);
+		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 AttributeList
+	operand[offset++] = 0x00;
+
+	offset = putTag(CONTEXT, 45, PRIMITIVE, operand, offset); // general Term
+	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 AttributesPlusTerm
+	operand[offset++] = 0x00;
+	operand[offset++] = 0x00; // end of Operand
+	operand[offset++] = 0x00;
+	byte[] o = new byte[offset];
+	System.arraycopy(operand, 0, o, 0, offset);
+	return o;
+    }
 }