X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Forg%2Fz3950%2Fzing%2Fcql%2FCQLTermNode.java;h=841c139cf58bf7cfe5c0165aa14d45612546c373;hb=f3c88fe15ee06a671407a0368e449db991526802;hp=190e9f2c5da4faa224128ed052cab39ab873b332;hpb=4edb0611999ddd542aad632183165be2068bba10;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 190e9f2..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.13 2002-12-06 12:35:42 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.13 2002-12-06 12:35:42 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;
@@ -34,11 +34,24 @@ 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) + "\n" +
renderPrefixes(level+1, prefixes) +
indent(level+1) + "" + xq(qualifier) + "\n" +
- relation.toXCQL(level+1, new Vector()) +
+ relation.toXCQL(level+1, new Vector()) +
indent(level+1) + "" + xq(term) + "\n" +
indent(level) + "\n");
}
@@ -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;
}
@@ -60,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 attrs = new Vector();
// Do this first so that if any other truncation or
// completeness attributes are generated, they "overwrite"
@@ -106,10 +120,20 @@ public class CQLTermNode extends CQLNode {
String pos = "any";
String text = term;
if (text.length() > 0 && text.substring(0, 1).equals("^")) {
- text = text.substring(1);
+ text = text.substring(1); // ### change not seen by caller
pos = "first";
}
- // ### add back the last-in-field stuff
+ 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);
@@ -124,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 = "";
@@ -135,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 ||
@@ -156,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
@@ -173,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++) {
@@ -184,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);
@@ -193,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;