Remove extraneous blank line from end of XCQL output in test harness.

(Was only there so my output would diff with Rob's!)

diff --git a/Changes b/Changes
index c97c930..b51e1f2 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,4 +1,4 @@
-$Id: Changes,v 1.3 2002-11-06 22:07:51 mike Exp $
+$Id: Changes,v 1.4 2002-11-08 01:10:55 mike Exp $
 
 Revision history for "cql-java"
 
@@ -13,11 +13,11 @@ Revision history for "cql-java"
          through parse-trees and so implement its own back-end
          (e.g. to build BER-friendly data structures using whatever
          Z39.50 toolkit is preferred.)
-       - Add the toPQF(Properties p) method to CQLNode and
+       - Add the toPQF(Properties p) method to CQLNode and its
          subclasses.  This produces a query in YAZ-style Prefix Query
          Format, which can be trivially translated into a Z39.50
          Type-1 query (see, for example, JZKit's code to do so).
-       - Add etc/pqf.properties to configure to toPQF() method.
+       - Add etc/pqf.properties to configure the toPQF() method.
        - Add "-p <props-file>" option to the CQLParser test-harness,
          indicating that the parsed tree is to be rendered to PQF.
        - Add PQFTranslationException and its subclasses

diff --git a/VERSION b/VERSION
index 3b04cfb..c0f82a0 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.2
+0.3-IN-PROGRESS

diff --git a/src/org/z3950/zing/cql/CQLParser.java b/src/org/z3950/zing/cql/CQLParser.java
index 5aa861f..6117b23 100644 (file)
--- a/src/org/z3950/zing/cql/CQLParser.java
+++ b/src/org/z3950/zing/cql/CQLParser.java
@@ -1,4 +1,4 @@
-// $Id: CQLParser.java,v 1.17 2002-11-06 22:03:58 mike Exp $
+// $Id: CQLParser.java,v 1.18 2002-11-08 01:10:55 mike Exp $
 
 package org.z3950.zing.cql;
 import java.io.IOException;
@@ -12,7 +12,7 @@ import java.io.FileNotFoundException;
 /**
  * Compiles CQL strings into parse trees of CQLNode subtypes.
  *
- * @version    $Id: CQLParser.java,v 1.17 2002-11-06 22:03:58 mike Exp $
+ * @version    $Id: CQLParser.java,v 1.18 2002-11-08 01:10:55 mike Exp $
  * @see                <A href="http://zing.z3950.org/cql/index.html"
  *                     >http://zing.z3950.org/cql/index.html</A>
  */
@@ -361,8 +361,7 @@ public class CQLParser {
                f.close();
                System.out.println(root.toPQF(config));
            } else {
-               System.out.println(root.toXCQL(0));
-               // ### should be print (no ~ln)
+               System.out.print(root.toXCQL(0));
            }
        } catch (IOException ex) {
            System.err.println("Can't render query: " + ex.getMessage());