X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=src%2Forg%2Fz3950%2Fzing%2Fcql%2FCQLTermNode.java;h=87511fca488ffdd03036af590264f35c43b836de;hb=543c38e1270ac8def3eeb9cb56abab2f34728ee5;hp=399ce103290332568198c474dd99706da94eb5cb;hpb=d974ba9312ebe456a1fd4fc3d63620e14baef372;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 399ce10..87511fc 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.18 2002-12-12 10:24:25 mike Exp $
+// $Id: CQLTermNode.java,v 1.26 2007-06-27 22:44:40 mike Exp $
package org.z3950.zing.cql;
import java.util.Properties;
@@ -8,34 +8,40 @@ import java.util.Vector;
/**
* Represents a terminal node in a CQL parse-tree.
* A term node consists of the term String itself, together with,
- * optionally, a qualifier string and a relation. Neither or both of
- * these must be provided - you can't have a qualifier without a
+ * optionally, an index string and a relation. Neither or both of
+ * these must be provided - you can't have an index without a
* relation or vice versa.
*
- * @version $Id: CQLTermNode.java,v 1.18 2002-12-12 10:24:25 mike Exp $
+ * @version $Id: CQLTermNode.java,v 1.26 2007-06-27 22:44:40 mike Exp $
*/
public class CQLTermNode extends CQLNode {
- private String qualifier;
+ private String index;
private CQLRelation relation;
private String term;
/**
- * Creates a new term node with the specified qualifier,
+ * Creates a new term node with the specified index,
* relation and term. The first two may be
* null, but the term may not.
*/
- public CQLTermNode(String qualifier, CQLRelation relation, String term) {
- this.qualifier = qualifier;
+ public CQLTermNode(String index, CQLRelation relation, String term) {
+ this.index = index;
this.relation = relation;
this.term = term;
}
- public String getQualifier() { return qualifier; }
+ public String getIndex() { return index; }
public CQLRelation getRelation() { return relation; }
public String getTerm() { return term; }
+ private static boolean isResultSetIndex(String qual) {
+ return (qual.equals("srw.resultSet") ||
+ qual.equals("srw.resultSetId") ||
+ qual.equals("srw.resultSetName"));
+ }
+
public String getResultSetName() {
- if (qualifier.equals("srw.resultSet"))
+ if (isResultSetIndex(index))
return term;
else
return null;
@@ -44,20 +50,21 @@ public class CQLTermNode extends CQLNode {
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()) +
+ indent(level+1) + "" + xq(index) + "\n" +
+ relation.toXCQL(level+1, new Vector()) +
indent(level+1) + "" + xq(term) + "\n" +
indent(level) + "\n");
}
public String toCQL() {
- String quotedQualifier = maybeQuote(qualifier);
+ String quotedIndex = maybeQuote(index);
String quotedTerm = maybeQuote(term);
String res = quotedTerm;
- if (!qualifier.equalsIgnoreCase("srw.serverChoice")) {
+ if (index != null &&
+ !index.equalsIgnoreCase("srw.serverChoice")) {
// ### We don't always need spaces around `relation'.
- res = quotedQualifier + " " + relation.toCQL() + " " + quotedTerm;
+ res = quotedIndex + " " + relation.toCQL() + " " + quotedTerm;
}
return res;
@@ -67,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"
@@ -81,9 +88,9 @@ public class CQLTermNode extends CQLNode {
if (attr != null)
attrs.add(attr);
- attr = config.getProperty("qualifier." + qualifier);
+ attr = config.getProperty("index." + index);
if (attr == null)
- throw new UnknownQualifierException(qualifier);
+ throw new UnknownIndexException(index);
attrs.add(attr);
String rel = relation.getBase();
@@ -102,11 +109,12 @@ public class CQLTermNode extends CQLNode {
throw new UnknownRelationException(rel);
attrs.add(attr);
- String[] mods = relation.getModifiers();
- for (int i = 0; i < mods.length; i++) {
- attr = config.getProperty("relationModifier." + mods[i]);
+ Vector mods = relation.getModifiers();
+ for (int i = 0; i < mods.size(); i++) {
+ String type = mods.get(i).type;
+ attr = config.getProperty("relationModifier." + type);
if (attr == null)
- throw new UnknownRelationModifierException(mods[i]);
+ throw new UnknownRelationModifierException(type);
attrs.add(attr);
}
@@ -141,7 +149,7 @@ public class CQLTermNode extends CQLNode {
}
public String toPQF(Properties config) throws PQFTranslationException {
- if (qualifier.equals("srw.resultSet")) {
+ if (isResultSetIndex(index)) {
// Special case: ignore relation, modifiers, wildcards, etc.
// There's parallel code in toType1BER()
return "@set " + maybeQuote(term);
@@ -166,6 +174,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 ||
@@ -184,7 +195,7 @@ public class CQLTermNode extends CQLNode {
}
public byte[] toType1BER(Properties config) throws PQFTranslationException {
- if (qualifier.equals("srw.resultSet")) {
+ if (isResultSetIndex(index)) {
// Special case: ignore relation, modifiers, wildcards, etc.
// There's parallel code in toPQF()
byte[] operand = new byte[term.length()+100];
@@ -210,8 +221,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
@@ -220,8 +230,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++) {
@@ -231,6 +239,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);
@@ -240,10 +250,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;