Up-to-date identifier URIs for rec and net context sets.

Remove extraneous quotes from serverChoice back-end index name.
Remove incorrect mappings for "all" and "any" relations.

diff --git a/zebra/pqf.properties b/zebra/pqf.properties
index b3726fd..32b1553 100644 (file)
--- a/zebra/pqf.properties
+++ b/zebra/pqf.properties
@@ -1,4 +1,4 @@
-# $Id: pqf.properties,v 1.4 2006-05-17 16:14:05 mike Exp $
+# $Id: pqf.properties,v 1.5 2006-06-20 10:59:47 mike Exp $
 #
 # Properties file to drive the YAZ CQL-to-PQF converter for Zebra.
 # This specifies the interpretation of various CQL indexes, relations,
@@ -6,8 +6,8 @@
 
 # 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.rec                = info:srw/cql-context-set/2/rec-1.1
+set.net                = info:srw/cql-context-set/2/net-1.0
 set.dc         = info:srw/cql-context-set/1/dc-v1.1
 set.zeerex      = info:srw/cql-context-set/2/zeerex-1.1
 
@@ -15,7 +15,7 @@ set.zeerex      = info:srw/cql-context-set/2/zeerex-1.1
 set            = http://srw.cheshire3.org/contextSets/net/1.0/
 
 # The default index when none is specified by the query
-index.cql.serverChoice                 = 1="cql:all"
+index.cql.serverChoice                 = 1=cql:all
 
 index.cql.anywhere                     = 1=cql:all
 index.rec.id                           = 1=rec:id 4=3
@@ -39,10 +39,6 @@ relation.ge                          = 2=4
 relation.>                             = 2=5
 relation.<>                            = 2=6
 
-### These two are not really right:
-relation.all                           = 2=3
-relation.any                           = 2=3
-
 # BIB-1 doesn't have a server choice relation, so we just make the
 # choice here, and use equality (which is clearly correct).
 relation.scr                           = 2=3