Use 4=6 and 5=105 respectively for the "all" and "any" relations.

[yaz-moved-to-github.git] / etc / pqf.properties

diff --git a/etc/pqf.properties b/etc/pqf.properties
index 22e6b9b..4f278ed 100644 (file)
--- a/etc/pqf.properties
+++ b/etc/pqf.properties
@@ -1,4 +1,4 @@
-# $Id: pqf.properties,v 1.6 2003-12-19 12:00:36 mike Exp $
+# $Id: pqf.properties,v 1.11 2006-09-12 09:25:17 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
@@ -12,19 +12,16 @@
 # attributes.
 
 # Identifiers for prefixes used in this file. (index.*)
-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/
+set.cql                = info:srw/cql-context-set/1/cql-v1.1
+set.rec                = info:srw/cql-context-set/2/rec-1.0
+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/
+set            = info:srw/cql-context-set/1/dc-v1.1
 
 # The default access point and result-set references
 index.cql.serverChoice                 = 1=1016
-index.srw.serverChoice                 = 1=1016
        # srw.serverChoice is deprecated in favour of cql.serverChoice
        # BIB-1 "any"
 
@@ -68,9 +65,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,8 +76,8 @@ 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
 
@@ -119,6 +116,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
@@ -144,6 +142,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