From 8f748a67f1250ad9350bc86b4e8eaac9093ec1eb Mon Sep 17 00:00:00 2001
From: mike <mike>
Date: Thu, 12 Dec 2002 15:03:50 +0000
Subject: [PATCH] Changes files etc. for recent tweaks.

---
 Changes                             |   17 +++++++++--------
 VERSION                             |    2 +-
 src/org/z3950/zing/cql/CQLNode.java |    8 +++++---
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/Changes b/Changes
index 39fde05..e20ba63 100644
--- a/Changes
+++ b/Changes
@@ -1,30 +1,31 @@
-$Id: Changes,v 1.27 2002-12-11 17:14:20 mike Exp $
+$Id: Changes,v 1.28 2002-12-12 15:03:50 mike Exp $
 
 Revision history for the CQL-Java package.
 See the bottom of this file for a list of things still to do.
 
-0.5  (IN PROGRESS, currently at RC1)
+0.5  (IN PROGRESS, currently at RC2)
 	- Add an extra back-end method,
 		byte[] toType1BER(Properties config)
 	  which generates an opaque BER-encoded PDU suitable for
 	  forwarding to Z39.50 server as a pasrt of a searchRequest
 	  APDU.  This was contributed by Ralph Levan <levan@oclc.org>
+	- Add srw.resultSet support to the toPFQ() method.
+	- Add new resultSetName() method to CQLNode and its
+	  subclasses, returning the name of the referenced result-set
+	  for a node that is just a result-set reference, and null for
+	  anything else.
 	- Change regression-test rules for Adam's compiler to use his
 	  new front-end cql2xcql instead of the old cqlparse3.
 	- Change the names of the anchoring properties in
 	  etc/pqf.properties and the CQLTermNode code that examines
 	  them, in accordance with Adam's PQF-renderer's behaviour.
 	  This gives more flexibility in terms of generating
-	  attributes for end-of-field anchoring.
-	- Fix comment in etc/pqf.properties (claimed that the Type-1
-	  "string" attribute was "phrase").  Just a documentation
-	  error.
+	  attributes for end-of-field anchoring.  Various other minor
+	  tweaks to the pqf.properties file, mostly to the comments.
 	- Change the capitalisation of the project name from
 	  "cql-java" to "CQL-Java".  That doesn't really make any
 	  difference to anything: in particular, file-names such as
 	  "cql-java.jar" remain the same.
-	- Recreate last-in-field support
-	- Add srw.resultSet support to the toPFQ() method.
 
 0.4  Thu Nov 21 10:09:26 2002
 	- Add support for the new "phonetic" relation modifier,
diff --git a/VERSION b/VERSION
index 82b97c6..245447e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.5-RC1
+0.5-RC3
diff --git a/src/org/z3950/zing/cql/CQLNode.java b/src/org/z3950/zing/cql/CQLNode.java
index cfc6e29..eccc5f2 100644
--- a/src/org/z3950/zing/cql/CQLNode.java
+++ b/src/org/z3950/zing/cql/CQLNode.java
@@ -1,4 +1,4 @@
-// $Id: CQLNode.java,v 1.21 2002-12-12 10:24:25 mike Exp $
+// $Id: CQLNode.java,v 1.22 2002-12-12 15:03:50 mike Exp $
 
 package org.z3950.zing.cql;
 import java.util.Properties;
@@ -8,7 +8,7 @@ import java.util.Vector;
 /**
  * Represents a node in a CQL parse-tree.
  *
- * @version	$Id: CQLNode.java,v 1.21 2002-12-12 10:24:25 mike Exp $
+ * @version	$Id: CQLNode.java,v 1.22 2002-12-12 15:03:50 mike Exp $
  */
 public abstract class CQLNode {
     CQLNode() {}		// prevent javadoc from documenting this
@@ -21,7 +21,9 @@ public abstract class CQLNode {
      * else, then null is returned instead.
      * @return the name of the referenced result-set
      */
-    public String getResultSetName() { return null; }
+    public String getResultSetName() {
+	return null;
+    }
 
     /**
      * Translates a parse-tree into an XCQL document.
-- 
1.7.10.4