X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;ds=sidebyside;f=src%2Forg%2Fz3950%2Fzing%2Fcql%2FCQLGenerator.java;h=67e70d1b5f924a15e121e4804b001d19c0188aa1;hb=caeab95a0bbe3a694746bb3244e6605c36927c1e;hp=bc732e27859065cd77ccdd9dfb8e3d76f3ceb1b7;hpb=70be8275aabe87c909bf11148bb279c3e1380bb2;p=cql-java-moved-to-github.git

diff --git a/src/org/z3950/zing/cql/CQLGenerator.java b/src/org/z3950/zing/cql/CQLGenerator.java
index bc732e2..67e70d1 100644
--- a/src/org/z3950/zing/cql/CQLGenerator.java
+++ b/src/org/z3950/zing/cql/CQLGenerator.java
@@ -1,4 +1,4 @@
-// $Id: CQLGenerator.java,v 1.1 2002-10-30 09:19:26 mike Exp $
+// $Id: CQLGenerator.java,v 1.2 2002-10-30 11:13:18 mike Exp $
 
 package org.z3950.zing.cql;
 import java.util.Properties;
@@ -22,7 +22,7 @@ import java.io.FileNotFoundException;
  * this distribution - there is a <TT>generate_<I>x</I>()</TT> method
  * for each grammar element <I>X</I>.
  *
- * @version	$Id: CQLGenerator.java,v 1.1 2002-10-30 09:19:26 mike Exp $
+ * @version	$Id: CQLGenerator.java,v 1.2 2002-10-30 11:13:18 mike Exp $
  * @see		<A href="http://zing.z3950.org/cql/index.html"
  *		        >http://zing.z3950.org/cql/index.html</A>
  */
@@ -154,8 +154,9 @@ public class CQLGenerator {
 	    return generate_cql_query();
 	}
 
+	// ### Should sometimes generate qualifier/relation-free terms
 	String qualifier = generate_qualifier();
-	String relation = generate_relation();
+	CQLRelation relation = generate_relation();
 	String term = generate_term();
 
 	return new CQLTermNode(qualifier, relation, term);
@@ -182,10 +183,11 @@ public class CQLGenerator {
 	return qualifier;
     }
 
-    // ### Representation of relations will change when we handle modifiers
-    private String generate_relation() throws ParameterMissingException {
-	return generate_base_relation();
+    private CQLRelation generate_relation() throws ParameterMissingException {
+	String base = generate_base_relation();
+	CQLRelation rel = new CQLRelation(base);
 	// ### should generate modifiers too
+	return rel;
     }
 
     private String generate_base_relation() throws ParameterMissingException {