From: mike <mike>
Date: Fri, 25 Oct 2002 16:11:05 +0000 (+0000)
Subject: Fix inheritance
X-Git-Tag: v1.5~261
X-Git-Url: http://git.indexdata.com/cgi-bin?a=commitdiff_plain;h=069f263b3422968c95d2b2a74291f04dfcdb15ac;p=cql-java-moved-to-github.git

Fix inheritance
---

diff --git a/src/org/z3950/zing/cql/CQLBooleanNode.java b/src/org/z3950/zing/cql/CQLBooleanNode.java
index 23a32ea..c56aac4 100644
--- a/src/org/z3950/zing/cql/CQLBooleanNode.java
+++ b/src/org/z3950/zing/cql/CQLBooleanNode.java
@@ -1,4 +1,4 @@
-// $Id: CQLBooleanNode.java,v 1.1 2002-10-25 16:04:44 mike Exp $
+// $Id: CQLBooleanNode.java,v 1.2 2002-10-25 16:11:05 mike Exp $
 
 package org.z3950.zing.cql;
 
@@ -7,9 +7,9 @@ package org.z3950.zing.cql;
  * Represents a boolean node in a CQL parse-tree ...
  * ###
  *
- * @version	$Id: CQLBooleanNode.java,v 1.1 2002-10-25 16:04:44 mike Exp $
+ * @version	$Id: CQLBooleanNode.java,v 1.2 2002-10-25 16:11:05 mike Exp $
  */
-public abstract class CQLBooleanNode {
+public abstract class CQLBooleanNode extends CQLNode {
     protected CQLNode left;
     protected CQLNode right;
 }
diff --git a/src/org/z3950/zing/cql/CQLNode.java b/src/org/z3950/zing/cql/CQLNode.java
index b619bbb..3897c45 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.3 2002-10-25 16:04:44 mike Exp $
+// $Id: CQLNode.java,v 1.4 2002-10-25 16:11:05 mike Exp $
 
 package org.z3950.zing.cql;
 
@@ -7,7 +7,7 @@ package org.z3950.zing.cql;
  * Represents a node in a CQL parse-tree ...
  * ###
  *
- * @version	$Id: CQLNode.java,v 1.3 2002-10-25 16:04:44 mike Exp $
+ * @version	$Id: CQLNode.java,v 1.4 2002-10-25 16:11:05 mike Exp $
  */
 public abstract class CQLNode {
     abstract String toXCQL(int level);
@@ -26,6 +26,6 @@ public abstract class CQLNode {
 	CQLNode n1 = new CQLTermNode("dc.author", "=", "kernighan");
 	CQLNode n2 = new CQLTermNode("dc.title", "all", "elements style");
 	CQLNode root = new CQLAndNode(n1, n2);
-	System.out.println(root.toXCQL(3));
+	System.out.println(root.toXCQL(0));
     }
 }
diff --git a/src/org/z3950/zing/cql/CQLParser.java b/src/org/z3950/zing/cql/CQLParser.java
index 0684993..7a3df72 100644
--- 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.5 2002-10-25 16:01:26 mike Exp $
+// $Id: CQLParser.java,v 1.6 2002-10-25 16:11:05 mike Exp $
 
 package org.z3950.zing.cql;
 import java.util.Properties;
@@ -13,7 +13,7 @@ import java.io.StreamTokenizer;
  * Compiles a CQL string into a parse tree ...
  * ###
  *
- * @version	$Id: CQLParser.java,v 1.5 2002-10-25 16:01:26 mike Exp $
+ * @version	$Id: CQLParser.java,v 1.6 2002-10-25 16:11:05 mike Exp $
  * @see		<A href="http://zing.z3950.org/cql/index.html"
  *		        >http://zing.z3950.org/cql/index.html</A>
  */
@@ -156,9 +156,15 @@ public class CQLParser {
 	    System.err.println("Can't read query: " + ex);
 	    System.exit(2);
 	}
-	String cql = String(bytes);
+	String cql = new String(bytes);
 	CQLParser parser = new CQLParser();
-	CQLNode root = parser.parse(cql);
-	System.out.println(root.toXCQL());
+	CQLNode root;
+	try {
+	    root = parser.parse(cql);
+	    System.out.println(root.toXCQL(0));
+	} catch (java.io.IOException ex) {
+	    System.err.println("Can't compile query: " + ex);
+	    System.exit(3);
+	}
     }
 }