Support the relevant indexes (and not the irrelevant ones!)

diff --git a/zebra/pqf.properties b/zebra/pqf.properties
index 1f5b7d4..2faab79 100644 (file)
--- a/zebra/pqf.properties
+++ b/zebra/pqf.properties
@@ -1,58 +1,32 @@
-# $Id: pqf.properties,v 1.1 2006-04-13 14:53:18 mike Exp $
+# $Id: pqf.properties,v 1.2 2006-05-11 10:22:18 mike Exp $
 #
-# Propeties file to drive org.z3950.zing.cql.CQLNode's toPQF()
-# back-end and the YAZ CQL-to-PQF converter.  This specifies the
-# interpretation of various CQL indexes, 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 Dublin Core
-# indexes to Attribute Architecture (util, XD and BIB-2)
-# attributes.
+# Properties file to drive the YAZ CQL-to-PQF converter for Zebra.
+# This specifies the interpretation of various CQL indexes, relations,
+# etc. in terms of Type-1 query attributes.
 
 # Identifiers for prefixes used in this file. (index.*)
 set.cql                = info:srw/cql-context-set/1/cql-v1.1
 set.rec                = info:srw/cql-context-set/2/rec-1.0
+set.net                = http://srw.cheshire3.org/contextSets/net/1.0/
 set.dc         = info:srw/cql-context-set/1/dc-v1.1
-set.bath       = http://zing.z3950.org/cql/bath/2.0/
+set.zeerex      = info:srw/cql-context-set/2/zeerex-1.1
 
-# default set (in query)
+# The default set when an index doesn't specify one: Dublin Core
 set            = info:srw/cql-context-set/1/dc-v1.1
 
-# The default access point and result-set references
-index.cql.serverChoice                 = 1=1016
-       # srw.serverChoice is deprecated in favour of cql.serverChoice
-       # BIB-1 "any"
-
-index.rec.id                           = 1=12
+# The default index when none is specified by the query
+index.cql.serverChoice                 = 1="cql:all"
 
-index.dc.title                         = 1=4
-index.dc.subject                       = 1=21
-index.dc.creator                       = 1=1003
-index.dc.author                                = 1=1003
-       ### Unofficial synonym for "creator"
-index.dc.editor                                = 1=1020
-index.dc.publisher                     = 1=1018
-index.dc.description                   = 1=62
-       # "abstract"
-index.dc.date                          = 1=30
-index.dc.resourceType                  = 1=1031
-       # guesswork: "Material-type"
-index.dc.format                                = 1=1034
-       # guesswork: "Content-type"
-index.dc.resourceIdentifier            = 1=12
-       # "Local number"
-index.dc.source                                = 1=1019
-       # "Record-source"
-index.dc.language                      = 1=54
-       # "Code--language"
-index.dc.relation                      = 1=?
-       ### No idea how to represent this
-index.dc.coverage                      = 1=?
-       ### No idea how to represent this
-index.dc.rights                                = 1=?
-       ### No idea how to represent this
+index.cql.anywhere                     = 1=cql:all
+index.rec.id                           = 1=rec:id 4=3
+index.net.protocol                     = 1=net:protocol
+index.net.version                      = 1=net:version 4=3
+index.net.method                       = 1=net:method
+index.net.host                         = 1=net:host 4=3
+index.net.port                         = 1=net:port 4=3
+index.net.path                         = 1=net:path 4=3
+index.dc.title                         = 1=dc:title
+index.dc.creator                       = 1=dc:creator
 
 # Relation attributes are selected according to the CQL relation by
 # looking up the "relation.<relation>" property:
@@ -121,30 +95,5 @@ truncation.z3958                    = 5=104
 # Finally, any additional attributes that should always be included
 # with each term can be specified in the "always" property.
 #
-always                                 = 6=1
+#always                                        = 6=1
 # 6=1: completeness = incomplete subfield
-
-
-# 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.
-#
-# 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.
-
-index.bath.keyTitle                    = 1=33
-index.bath.possessingInstitution       = 1=1044
-index.bath.name                                = 1=1002
-index.bath.personalName                        = 1=1
-index.bath.corporateName               = 1=2
-index.bath.conferenceName              = 1=3
-index.bath.uniformTitle                        = 1=6
-index.bath.isbn                                = 1=7
-index.bath.issn                                = 1=8
-index.bath.geographicName              = 1=58
-index.bath.notes                       = 1=63
-index.bath.topicalSubject              = 1=1079
-index.bath.genreForm                   = 1=1075
-