X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Forg%2Fz3950%2Fzing%2Fcql%2FCQLTermNode.java;h=fc310ede2d2fe44ec3b96ce5dee816384312a81e;hb=55136632bf2d7d9a54fe08bbb89bed6c03eb70b1;hp=a519215d528283ffd3cdc27e76b8aed576680f2a;hpb=18405938a115378cc571d697060ac40775c62fb7;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 a519215..fc310ed 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.22 2006-06-14 14:36:36 mike Exp $ +// $Id: CQLTermNode.java,v 1.25 2007-06-27 22:39:55 mike Exp $ package org.z3950.zing.cql; import java.util.Properties; @@ -8,40 +8,41 @@ 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.22 2006-06-14 14:36:36 mike Exp $ + * @version $Id: CQLTermNode.java,v 1.25 2007-06-27 22:39:55 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 String getQualifier() { return getIndex(); } // for legacy applications public CQLRelation getRelation() { return relation; } public String getTerm() { return term; } - private static boolean isResultSetQualifier(String qual) { + private static boolean isResultSetIndex(String qual) { return (qual.equals("srw.resultSet") || qual.equals("srw.resultSetId") || qual.equals("srw.resultSetName")); } public String getResultSetName() { - if (isResultSetQualifier(qualifier)) + if (isResultSetIndex(index)) return term; else return null; @@ -50,21 +51,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 != null && - !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; @@ -74,7 +75,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" @@ -88,9 +89,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 UnknownQualifierException(index); attrs.add(attr); String rel = relation.getBase(); @@ -109,11 +110,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); } @@ -148,7 +150,7 @@ public class CQLTermNode extends CQLNode { } public String toPQF(Properties config) throws PQFTranslationException { - if (isResultSetQualifier(qualifier)) { + if (isResultSetIndex(index)) { // Special case: ignore relation, modifiers, wildcards, etc. // There's parallel code in toType1BER() return "@set " + maybeQuote(term); @@ -194,7 +196,7 @@ public class CQLTermNode extends CQLNode { } public byte[] toType1BER(Properties config) throws PQFTranslationException { - if (isResultSetQualifier(qualifier)) { + if (isResultSetIndex(index)) { // Special case: ignore relation, modifiers, wildcards, etc. // There's parallel code in toPQF() byte[] operand = new byte[term.length()+100];