More considered Bath Profile support. May need changes to the

software to generate more Bath-friendly queries.
Add support for "cql" set (replaces "srw" which is retained but deprecated)
Add support for "rec" set (required by Bath)
Add support for the "bath" set.
Remove some old qualifiers that shouldn't be there at all.
Remove qualifier.bath.remoteSystemRecordNumber (use rec.id instead)

diff --git a/etc/pqf.properties b/etc/pqf.properties
index 0d59969..55804f1 100644 (file)
--- a/etc/pqf.properties
+++ b/etc/pqf.properties
@@ -1,23 +1,34 @@
-# $Id: pqf.properties,v 1.2 2003-12-18 13:44:59 mike Exp $
+# $Id: pqf.properties,v 1.3 2003-12-18 14:40:20 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.
+# back-end and the YAZ CQL-to-PQF converter.  This specifies the
+# interpretation of various CQL qualifiers, relations, etc. in terms
+# of Type-1 query attributes.
 #
+# This configuration file generates queries using BIB-1 attributes.
 # See http://www.loc.gov/z3950/agency/zing/cql/dc-indexes.html
-# for the Maintenance Agency's work-in-progress mapping of Dublic Core
+# for the Maintenance Agency's work-in-progress mapping of Dublin Core
 # qualifiers to Attribute Architecture (util, XD and BIB-2)
 # attributes.
 
 # Identifiers for prefixes used in this file. (qualifier.*)
+set.cql                = http://www.loc.gov/zing/cql/context-sets/cql/v1.1/
 set.srw                = http://www.loc.gov/zing/cql/srw-indexes/v1.0/
+       # The "srw" set is deprecated in favour of the "cql" set.
+set.rec                = http://srw.o-r-g.org/indexSets/rec/1.0/
 set.dc         = http://www.loc.gov/zing/cql/dc-indexes/v1.0/
+set.bath       = http://www.loc.gov/zing/cql/context-sets/bath/v1.1/
+
 # default set (in query)
 set             = http://www.loc.gov/zing/cql/dc-indexes/v1.0/
 
 # The default access point and result-set references
+qualifier.cql.serverChoice             = 1=1016
 qualifier.srw.serverChoice             = 1=1016
-       # "any"
+       # srw.serverChoice is deprecated in favour of cql.serverChoice
+       # BIB-1 "any"
+
+qualifier.rec.id                       = 1=12
 
 qualifier.dc.title                     = 1=4
 qualifier.dc.subject                   = 1=21
@@ -46,11 +57,6 @@ qualifier.dc.coverage                        = 1=?
 qualifier.dc.rights                    = 1=?
        ### No idea how to represent this
 
-### These aren't right: I've just put them here for the Generator
-qualifier.bath.subject                 = 1=21
-qualifier.bath.author                  = 1=1003
-qualifier.foo>bar                      = 1=2000
-
 # Relation attributes are selected according to the CQL relation by
 # looking up the "relation.<relation>" property:
 #
@@ -114,7 +120,11 @@ always                                     = 5=105 6=1
 # Bath Profile support, added Thu Dec 18 13:06:20 GMT 2003
 # See the Bath Profile for SRW at
 #      http://zing.z3950.org/cql/bath.html
-# Including the Bath Context Set defined within that document.
+# including the Bath Context Set defined within that document.
+#
+# In this file, we only map index-names to BIB-1 use attributes, doing
+# so in accordance with the specifications of the Z39.50 Bath Profile,
+# and leaving the relations, wildcards, etc. to fend for themselves.
 
 qualifier.bath.keyTitle                        = 1=33
 qualifier.bath.possessingInstitution   = 1=1044
@@ -124,7 +134,6 @@ qualifier.bath.corporateName                = 1=2
 qualifier.bath.conferenceName          = 1=3
 qualifier.bath.uniformTitle            = 1=6
 qualifier.bath.issn                    = 1=8
-qualifier.bath.remoteSystemRecordNumber        = 1=12 ### rec.id
 qualifier.bath.geographicName          = 1=58
 qualifier.bath.notes                   = 1=63
 qualifier.bath.topicalSubject          = 1=1079