- Remove the redundant and misleading etc/Grammar file.

- Fix up various Maintenance Agency web addresses that have
  moved in the great ZING-release shake-up.

diff --git a/Changes b/Changes
index 0611311..6e19590 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,4 +1,4 @@
-$Id: Changes,v 1.16 2002-11-20 01:15:14 mike Exp $
+$Id: Changes,v 1.17 2002-11-20 09:49:28 mike Exp $
 
 Revision history for "cql-java"
 See the bottom of this file for a list of things still to do.
@@ -9,13 +9,12 @@ See the bottom of this file for a list of things still to do.
        - Make prefix-maps bind loosely, so that ``>dc=x a and b''
          applies the dc=x binding to both the ``a'' and ``b''
          sub-queries.
-       - Change the XCQL output to include the nasty and redundant
-         (but official) <leftOperand> and <rightOperand> wrapper
-         elements.
+       - Change the XCQL output to include the nasty (but official)
+         <leftOperand> and <rightOperand> wrapper elements.
        - Change the XCQL output to use the nasty (but official)
          rendition of prefix-mapping: a <prefixes> element,
          containing one of more <prefix>es may appear at the top
-         level of either a <searchClause> or a <triple>.
+         of either a <searchClause> or a <triple>.
        - Change build process so that javadoc documentation is built
          by "make" in the "docs" directory.
        - Write javadoc comments for CQLRelation and ModifierSet.
@@ -26,14 +25,17 @@ See the bottom of this file for a list of things still to do.
          _equivalent_ XCQL to the what's in the regression test,
          rather than requiring byte-identical output.
        - Sort out the licence: I've settled on the LGPL.
+       - Remove the redundant and misleading etc/Grammar file.
+       - Fix up various Maintenance Agency web addresses that have
+         moved in the great ZING-release shake-up.
 
 0.3  Fri Nov 15 12:04:04 2002
        - Allow keywords to be used unquoted as search terms.
        - Add support for serverChoiceRelation (scr).
        - Add support for prefix-mapping, as in
-               >dc="http://dublincore.org/ dc.title=fish
+               >dc="http://www.loc.gov/zing/cql/dc-indexes/" dc.title=fish
          and
-               >"http://dublincore.org/ title=fish
+               >"http://www.loc.gov/zing/cql/dc-indexes/" dc.title=fish
          The XCQL generated corresponds to Adam's suggested format
          rather than Rob's, not so much because I prefer it (although
          I do) as because it's what fell out when I just Coded What

diff --git a/README b/README
index ae27147..cdfa3ee 100644 (file)
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-$Id: README,v 1.20 2002-11-18 15:05:49 mike Exp $
+$Id: README,v 1.21 2002-11-20 09:49:28 mike Exp $
 
 cql-java - a free CQL compiler, and other CQL tools, for Java
 
@@ -20,13 +20,15 @@ cql-java is a Free Software project that provides:
 
 CQL is "Common Query Language", a new query language designed under
 the umbrella of the ZING initiative (Z39.59-International Next
-Generation).  More information at
+Generation).  The official specification is at
+       http://www.loc.gov/z3950/agency/zing/cql/cql-syntax.html
+and there's more (and friendlier) information at
        http://zing.z3950.org/cql/index.html
 
 XCQL is "XML CQL", a representation of CQL-equivalent queries in XML
-which is supposed to be easier to parse.  More information at
+which is supposed to be easier to parse.  The specification is at
        http://www.loc.gov/z3950/agency/zing/cql/xcql.html
-include an XML Schema.
+and includes an XML Schema.
 
 But if you didn't know that, why are you even reading this?  :-)
 

diff --git a/etc/Grammar b/etc/Grammar
deleted file mode 100644 (file)
index ea1ad0e..0000000
--- a/etc/Grammar
+++ /dev/null
@@ -1,35 +0,0 @@
-$Id: Grammar,v 1.1 2002-10-31 22:22:01 mike Exp $
-
-This is the CQL grammar, more or less as on the official Maintenance
-Agency page (http://lcweb.loc.gov/z3950/agency/zing/srwu/cql.html) but
-with a few tweaks described in my message of Tue, 29 Oct 2002 14:11:48
-which I hope will be integrated into the official grammar.
-
---
-
-cql-query         ::= cql-query boolean search-clause
-                   |  search-clause
-boolean           ::= "and" | "or" | "not" | prox
-search-clause     ::= "(" cql-query ")"
-                   |  [ qualifier relation ] term
-
-relation          ::= base-relation { "/" relation-modifier }
-base-relation     ::= numeric-relation | "exact" | "all" | "any"
-relation-modifier ::= "relevant" | "fuzzy" | "stem"
-numeric-relation  ::= "<" | ">" | "<=" | ">=" | "<>" | "="
-
-prox              ::= "prox" [ "/" prox-parameters ]
-prox-parameters   ::= [ numeric-relation ] "/" [ distance ] "/" [ unit ] "/" ordering
-                   |  [ numeric-relation ] "/" [ distance ] "/" unit
-                   |  [ numeric-relation ] "/" distance
-                   |  numeric-relation
-unit              ::= "word" | "sentence" | "paragraph" | "element"
-ordering          ::= "ordered" | "unordered"
-distance          ::= non-negative-integer
-
-qualifier         ::= [ qualifier-prefix "." ] qualifier-name
-qualifier-prefix  ::= identifier
-qualifier-name    ::= identifier
-identifer         ::= string
-term              ::= string | ""string""
-string            ::= a character string

diff --git a/etc/pqf.properties b/etc/pqf.properties
index fd857aa..db6caf0 100644 (file)
--- a/etc/pqf.properties
+++ b/etc/pqf.properties
@@ -1,10 +1,10 @@
-# $Id: pqf.properties,v 1.4 2002-11-17 23:29:02 mike Exp $
+# $Id: pqf.properties,v 1.5 2002-11-20 09:49:28 mike Exp $
 #
 # Propeties file to drive org.z3950.zing.cql.CQLNode's toPQF()
 # back-end.  This specifies the interpretation of various CQL
 # qualifiers, relations, etc. in terms of Type-1 query attributes.
 #
-# See http://www.loc.gov/z3950/agency/zing/srwu/dc-indexes.html
+# See http://www.loc.gov/z3950/agency/zing/cql/dc-indexes.html
 # for the Maintenance Agency's work-in-progress mapping of Dublic Core
 # qualifiers to Attribute Architecture (util, XD and BIB-2)
 # attributes.

diff --git a/src/org/z3950/zing/cql/CQLPrefix.java b/src/org/z3950/zing/cql/CQLPrefix.java
index cdb3b3a..fd751a7 100644 (file)
--- a/src/org/z3950/zing/cql/CQLPrefix.java
+++ b/src/org/z3950/zing/cql/CQLPrefix.java
@@ -1,4 +1,4 @@
-// $Id: CQLPrefix.java,v 1.3 2002-11-15 12:08:56 mike Exp $
+// $Id: CQLPrefix.java,v 1.4 2002-11-20 09:49:29 mike Exp $
 
 package org.z3950.zing.cql;
 import java.lang.String;
@@ -6,7 +6,7 @@ import java.lang.String;
 /**
  * Represents a CQL prefix mapping from short name to long identifier.
  *
- * @version    $Id: CQLPrefix.java,v 1.3 2002-11-15 12:08:56 mike Exp $
+ * @version    $Id: CQLPrefix.java,v 1.4 2002-11-20 09:49:29 mike Exp $
  */
 public class CQLPrefix {
     /**
@@ -19,7 +19,7 @@ public class CQLPrefix {
     /**
      * The full identifier name of the prefix mapping.  That is,
      * typically, a URI permanently allocated to a specific qualifier
-     * set, such as <TT>http://zthes.z3950.org/cql/<TT>.
+     * set, such as <TT>http://zthes.z3950.org/cql/1.0<TT>.
      */
     public String identifier;