X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=etc%2Fpqf.properties;h=438ecb748898db3c73e6ce0c96b31a263fa4c85d;hp=d91b0c386eef52314b7320222758f6acdb3c5f52;hb=70ce06b6fcbe3a53e94111ecedf0312848647c1b;hpb=9c0500654d398012434385e07f44aa2a7545133b

diff --git a/etc/pqf.properties b/etc/pqf.properties
index d91b0c3..438ecb7 100644
--- a/etc/pqf.properties
+++ b/etc/pqf.properties
@@ -1,32 +1,28 @@
-# $Id: pqf.properties,v 1.4 2003-12-18 16:44:20 mike Exp $
-#
-# Propeties file to drive org.z3950.zing.cql.CQLNode's toPQF()
+# Properties 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 qualifiers, relations, etc. in terms
+# 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
-# qualifiers to Attribute Architecture (util, XD and BIB-2)
+# indexes 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/
+# Identifiers for prefixes used in this file. (index.*)
+set.cql		= info:srw/cql-context-set/1/cql-v1.2
+set.rec		= info:srw/cql-context-set/2/rec-1.1
+set.dc		= info:srw/cql-context-set/1/dc-v1.1
+set.bath	= http://zing.z3950.org/cql/bath/2.0/
 
-# default set (in query)
-set             = http://www.loc.gov/zing/cql/dc-indexes/v1.0/
+# 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
+# The default index when none is specified by the query
 index.cql.serverChoice			= 1=1016
-index.srw.serverChoice			= 1=1016
 	# srw.serverChoice is deprecated in favour of cql.serverChoice
 	# BIB-1 "any"
+index.cql.allRecords			= 1=_ALLRECORDS 2=103
 
 index.rec.id				= 1=12
 
@@ -68,9 +64,9 @@ relation.ge				= 2=4
 relation.>				= 2=5
 relation.<>				= 2=6
 
-### These two are not really right:
-relation.all				= 2=3
-relation.any				= 2=3
+# These two are what Zebra uses -- may not work on other servers
+relation.all				= 4=6
+relation.any				= 4=105
 
 # BIB-1 doesn't have a server choice relation, so we just make the
 # choice here, and use equality (which is clearly correct).
@@ -79,10 +75,18 @@ relation.scr				= 2=3
 # Relation modifiers.
 #
 relationModifier.relevant		= 2=102
-relationModifier.fuzzy			= 2=100
-	### 100 is "phonetic", which is not quite the same thing
+relationModifier.fuzzy			= 5=103
+	### truncation=regExpr-2 (5=103) in Zebra is "fuzzy matching"
 relationModifier.stem			= 2=101
 relationModifier.phonetic		= 2=100
+relationModifier.regexp			= 5=102
+relationModifier.unmasked		= 5=100
+relationModifier.masked			=
+
+# Non-standard extensions to provoke Zebra's inline sorting
+relationModifier.sort			= 7=1
+relationModifier.sort-desc		= 7=2
+relationModifier.numeric		= 4=109
 
 # Position attributes may be specified for anchored terms (those
 # beginning with "^", which is stripped) and unanchored (those not
@@ -109,11 +113,23 @@ structure.any				= 4=2
 structure.*				= 4=1
 	# phrase
 
+# Truncation attributes used to implement CQL wildcard patterns.  The
+# simpler forms, left, right- and both-truncation will be used for the
+# simplest patterns, so that we produce PQF queries that conform more
+# closely to the Bath Profile.  However, when a more complex pattern
+# such as "foo*bar" is used, we fall back on Z39.58-style masking.
+#
+truncation.right			= 5=1
+truncation.left				= 5=2
+truncation.both				= 5=3
+truncation.none				= 5=100
+truncation.regexp			= 5=102
+truncation.z3958			= 5=104
+
 # Finally, any additional attributes that should always be included
 # with each term can be specified in the "always" property.
 #
-always					= 5=105 6=1
-# 5=105: the not-yet-standarised CQL-like trunction attribute
+always					= 6=1
 # 6=1: completeness = incomplete subfield
 
 
@@ -133,6 +149,7 @@ 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