From: mike Date: Tue, 29 Jul 2003 22:53:02 +0000 (+0000) Subject: Release 0.6, fixes Ralph's term-quoting bug in BER serialiser. X-Git-Tag: v1.5~155 X-Git-Url: http://lists.indexdata.dk/?a=commitdiff_plain;h=c8fb74389ea5c8c0390bfb4249ec224b48f9b518;p=cql-java-moved-to-github.git Release 0.6, fixes Ralph's term-quoting bug in BER serialiser. --- diff --git a/Changes b/Changes index 6a9e5af..6385752 100644 --- a/Changes +++ b/Changes @@ -1,8 +1,13 @@ -$Id: Changes,v 1.31 2003-02-05 15:54:30 mike Exp $ +$Id: Changes,v 1.32 2003-07-29 22:53:02 mike Exp $ Revision history for the CQL-Java package. See the bottom of this file for a list of things still to do. +0.6 Tue Jul 29 23:33:56 2003 + - Include Ralph's fix for CQLTermNode::toType1BER() to prevent + it surrounding multi-word terms in quotes when encoded into + BER packet. + 0.5 Wed Feb 5 15:50:57 2003 - Add an extra back-end method, byte[] toType1BER(Properties config) diff --git a/VERSION b/VERSION index 2eb3c4f..5a2a580 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.5 +0.6 diff --git a/src/org/z3950/zing/cql/CQLTermNode.java b/src/org/z3950/zing/cql/CQLTermNode.java index 8249227..aba0b48 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.20 2003-03-04 18:06:11 mike Exp $ +// $Id: CQLTermNode.java,v 1.21 2003-07-29 22:53:02 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.20 2003-03-04 18:06:11 mike Exp $ + * @version $Id: CQLTermNode.java,v 1.21 2003-07-29 22:53:02 mike Exp $ */ public class CQLTermNode extends CQLNode { private String qualifier; @@ -216,7 +216,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); + 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