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 83defcb..4f278ed 100644 (file)
--- a/etc/pqf.properties
+++ b/etc/pqf.properties
@@ -1,4 +1,4 @@
-# $Id: pqf.properties,v 1.8 2004-03-15 21:39:06 adam 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
@@ -65,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).
@@ -76,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
 
@@ -116,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