X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=etc%2Fpqf.properties;h=438ecb748898db3c73e6ce0c96b31a263fa4c85d;hp=83defcb26e0f26c7660f697a4508dfe8059974d5;hb=68bbd857190c6e29727ca1f5070fe6d8e5102bbb;hpb=00106dc85fcaa3b02f9a0d471ea90a594bf3a175

diff --git a/etc/pqf.properties b/etc/pqf.properties
index 83defcb..438ecb7 100644
--- a/etc/pqf.properties
+++ b/etc/pqf.properties
@@ -1,6 +1,4 @@
-# $Id: pqf.properties,v 1.8 2004-03-15 21:39:06 adam 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 indexes, relations, etc. in terms
 # of Type-1 query attributes.
@@ -12,18 +10,19 @@
 # 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.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)
+# 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
 	# srw.serverChoice is deprecated in favour of cql.serverChoice
 	# BIB-1 "any"
+index.cql.allRecords			= 1=_ALLRECORDS 2=103
 
 index.rec.id				= 1=12
 
@@ -65,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).
@@ -76,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
@@ -116,6 +123,7 @@ 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