Changes files etc. for recent tweaks.

[cql-java-moved-to-github.git] / src / org / z3950 / zing / cql / CQLNode.java

diff --git a/src/org/z3950/zing/cql/CQLNode.java b/src/org/z3950/zing/cql/CQLNode.java
index e0fba9d..eccc5f2 100644 (file)
--- 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.19 2002-12-09 16:29:44 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,12 +8,24 @@ import java.util.Vector;
 /**
  * Represents a node in a CQL parse-tree.
  *
- * @version    $Id: CQLNode.java,v 1.19 2002-12-09 16:29:44 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
 
     /**
+     * Returns the name of the result-set to which this query is a
+     * reference, if and only if the entire query consists only of a
+     * result-set reference.  If it's anything else, including a
+     * boolean combination of a result-set reference with something
+     * else, then null is returned instead.
+     * @return the name of the referenced result-set
+     */
+    public String getResultSetName() {
+       return null;
+    }
+
+    /**
      * Translates a parse-tree into an XCQL document.
      * <P>
      * @param level
@@ -112,7 +124,7 @@ public abstract class CQLNode {
      * <A href="ftp://ftp.rsasecurity.com/pub/pkcs/ascii/layman.asc"
      *         >ftp://ftp.rsasecurity.com/pub/pkcs/ascii/layman.asc</A>
      */
-    abstract public byte[] toType1(Properties config)
+    abstract public byte[] toType1BER(Properties config)
        throws PQFTranslationException;
 
     // ANS.1 classes
@@ -304,7 +316,7 @@ public abstract class CQLNode {
 
     public static final byte[] makeQuery(CQLNode root, Properties properties)
        throws PQFTranslationException {
-        byte[] rpnStructure = root.toType1(properties);
+        byte[] rpnStructure = root.toType1BER(properties);
         byte[] qry = new byte[rpnStructure.length+100];
         int offset = 0;
         offset = putTag(CONTEXT, 1, CONSTRUCTED, qry, offset);