fixing a couple mappings for SRU CQL server

Signed-off-by: Joshua Ferraro <jmf@liblime.com>

diff --git a/etc/zebradb/biblios/etc/bib1.att b/etc/zebradb/biblios/etc/bib1.att
index 9b1fe87..eac4266 100644 (file)
--- a/etc/zebradb/biblios/etc/bib1.att
+++ b/etc/zebradb/biblios/etc/bib1.att
@@ -104,6 +104,7 @@ att 1033    Host-item
 att 1034    ctype
 att 1035    Anywhere
 att 1036    Author-Title-Subject
+att 1079    Subject-topical
 
 # Koha Local-Use Biblio Indexes
 att 9001    Control-number

diff --git a/etc/zebradb/ccl.properties b/etc/zebradb/ccl.properties
index 4fc6b09..d76e71d 100644 (file)
--- a/etc/zebradb/ccl.properties
+++ b/etc/zebradb/ccl.properties
@@ -1079,6 +1079,22 @@ sort3 7=3
 # a !n b
 # Integer n may be omitted - in which case distance is 1.
 
+###################################################
+# Rules for a few bath atts
+keyTitle         = 1=33
+possessingInstitution    = 1=1044
+name             = 1=1002
+personalName     = 1=1
+corporateName    = 1=2
+conferenceName   = 1=3
+uniformTitle     = 1=6
+isbn             = 1=7
+issn             = 1=8
+geographicName   = 1=58
+notes            = 1=63
+topicalSubject   = 1=1079
+genreForm        = 1=1075
+
 ###################################################
 # Rules for a few GILS fields
 #north  gils-attset,u=2040 r=o

diff --git a/etc/zebradb/marc_defs/marc21/authorities/record.abs b/etc/zebradb/marc_defs/marc21/authorities/record.abs
index 8f1ab67..05bc564 100644 (file)
--- a/etc/zebradb/marc_defs/marc21/authorities/record.abs
+++ b/etc/zebradb/marc_defs/marc21/authorities/record.abs
@@ -40,10 +40,10 @@ melm 431 Title-uniform-see:w,Title-uniform-see:p,Title-uniform-see:s,See:w,See:p
 melm 531 Title-uniform-see-also:w,Title-uniform-see-also:p,Title-uniform-see-also:s,See-also:w,See-also:p,See-also:s
 
 # Topical Term
-melm 150$a Subject-heading:w,Subject-heading:p,Subject-heading:s,Subject:w,Subject:p,Heading:w,Heading:p,Heading:s
-melm 150 Subject:w,Subject:p,Subject:s,Heading:w,Heading:p,Heading:s
-melm 450 Subject-see:w,Subject-see:p,Subject-see:s,See:w,See:p,See:s
-melm 550 Subject-see-also:w,Subject-see-also:p,Subject-see-also:s,See-also:w,See-also:p,See-also:s
+melm 150$a Subject-topical-heading:w,Subject-topical-heading:p,Subject-topical-heading:s,Subject-topical:w,Subject-topical:p,Heading:w,Heading:p,Heading:s
+melm 150 Subject-topical:w,Subject-topical:p,Subject-topical:s,Heading:w,Heading:p,Heading:s
+melm 450 Subject-topical-see:w,Subject-topical-see:p,Subject-topical-see:s,See:w,See:p,See:s
+melm 550 Subject-topical-see-also:w,Subject-topical-see-also:p,Subject-topical-see-also:s,See-also:w,See-also:p,See-also:s
 
 # Geographic Name
 melm 151$a Name-geographic-heading:w,Name-geographic-heading:w,Name-geographic-heading:s,Name-geographic:w,Name-geographic:p,Heading:w,Heading:p,Heading:s
@@ -59,7 +59,7 @@ melm 555 Term-geographic-see-also:w,Term-geographic-see-also:p,Term-geographic-s
 
 # NOTE: subdivisions management missing from Koha
 # General Subdivision
-melm 180 Subject-subdivision,Heading:w,Heading:p,Heading:s
+melm 180 Subject-topical-subdivision,Heading:w,Heading:p,Heading:s
 # Geographic Subdivision
 melm 181 Geographic-subdivision,Heading:w,Heading:p,Heading:s
 # Chronological Subdivision

diff --git a/etc/zebradb/pqf.properties b/etc/zebradb/pqf.properties
index 19a9799..412cdbc 100644 (file)
--- a/etc/zebradb/pqf.properties
+++ b/etc/zebradb/pqf.properties
@@ -11,114 +11,113 @@
 # 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.dc         = info:srw/cql-context-set/1/dc-v1.1
-set.bath       = http://zing.z3950.org/cql/bath/2.0/
+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            = info:srw/cql-context-set/1/dc-v1.1
+set     = info:srw/cql-context-set/1/dc-v1.1
 
 # The default access point and result-set references
-index.cql.serverChoice                 = 1=1016
-       # srw.serverChoice is deprecated in favour of cql.serverChoice
-       # BIB-1 "any"
-
-index.rec.id                           = 1=12
-
-index.dc.identifier                            = 1=1007          
-index.dc.title                         = 1=4
-index.dc.subject                       = 1=21
-index.dc.creator                       = 1=1003
-index.dc.author                                = 1=1003
-index.dc.itemtype                       = 1=1031
-index.dc.barcode                        = 1=1028
-index.dc.branch                         = 1=1033
-index.dc.isbn                           = 1=7
-index.dc.issn                           = 1=8
-index.dc.any                           = 1=1016
-index.dc.note                  = 1=63
+index.cql.serverChoice = 1=1016
+    # srw.serverChoice is deprecated in favour of cql.serverChoice
+    # BIB-1 "any"
+
+index.rec.id                = 1=12
+index.dc.identifier         = 1=1007          
+index.dc.title              = 1=4
+index.dc.subject            = 1=21
+index.dc.creator            = 1=1003
+index.dc.author             = 1=1003
+index.dc.itemtype           = 1=1031
+index.dc.barcode            = 1=1028
+index.dc.branch             = 1=1033
+index.dc.isbn               = 1=7
+index.dc.issn               = 1=8
+index.dc.any                = 1=1016
+index.dc.note               = 1=63
 
 # personal name experimental
 index.dc.pname  = 1=1
-       ### Unofficial synonym for "creator"
-index.dc.editor                                = 1=1020
-index.dc.publisher                     = 1=1018
-index.dc.description                   = 1=62
-       # "abstract"
-index.dc.date                          = 1=30
-index.dc.resourceType                  = 1=1031
-       # guesswork: "Material-type"
-index.dc.format                                = 1=1034
-       # guesswork: "Content-type"
-index.dc.resourceIdentifier            = 1=12
-       # "Local number"
-#index.dc.source                               = 1=1019
-       # "Record-source"
-index.dc.language                      = 1=54
-       # "Code--language"
-       
-index.dc.Place-publication             = 1=59
-       # "Place-publication"
-
-index.dc.relation                      = 1=?
-       ### No idea how to represent this
-index.dc.coverage                      = 1=?
-       ### No idea how to represent this
-index.dc.rights                                = 1=?
-       ### No idea how to represent this
+    ### Unofficial synonym for "creator"
+index.dc.editor             = 1=1020
+index.dc.publisher          = 1=1018
+index.dc.description        = 1=62
+    # "abstract"
+index.dc.date               = 1=30
+index.dc.resourceType       = 1=1031
+    # guesswork: "Material-type"
+index.dc.format             = 1=1034
+    # guesswork: "Content-type"
+index.dc.resourceIdentifier = 1=12
+    # "Local number"
+#index.dc.source                = 1=1019
+    # "Record-source"
+index.dc.language           = 1=54
+    # "Code--language"
+    
+index.dc.Place-publication  = 1=59
+    # "Place-publication"
+
+#index.dc.relation           = 1=?
+    ### No idea how to represent this
+#index.dc.coverage           = 1=?
+    ### No idea how to represent this
+#index.dc.rights             = 1=?
+    ### No idea how to represent this
 
 # Relation attributes are selected according to the CQL relation by
 # looking up the "relation.<relation>" property:
 #
-relation.<                             = 2=1
-relation.le                            = 2=2
-relation.eq                            = 2=3
-relation.exact                         = 2=3
-relation.ge                            = 2=4
-relation.>                             = 2=5
-relation.<>                            = 2=6
+relation.<                  = 2=1
+relation.le                 = 2=2
+relation.eq                 = 2=3
+relation.exact              = 2=3
+relation.ge                 = 2=4
+relation.>                  = 2=5
+relation.<>                 = 2=6
 
 ### These two are not really right:
-relation.all                           = 2=3
-relation.any                           = 2=3
+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
+relation.scr                = 2=3
 
 # Relation modifiers.
 #
-relationModifier.relevant              = 2=102
-relationModifier.fuzzy                  = 5=103
-       ### 100 is "phonetic", which is not quite the same thing
-relationModifier.stem                  = 2=101
-relationModifier.phonetic              = 2=100
+relationModifier.relevant   = 2=102
+relationModifier.fuzzy      = 5=103
+    ### 100 is "phonetic", which is not quite the same thing
+relationModifier.stem       = 2=101
+relationModifier.phonetic   = 2=100
 
 # Position attributes may be specified for anchored terms (those
 # beginning with "^", which is stripped) and unanchored (those not
 # beginning with "^").  This may change when we get a BIB-1 truncation
 # attribute that says "do what CQL does".
 #
-position.first                         = 3=1 6=1
-       # "first in field"
-position.any                           = 3=3 6=1
-       # "any position in field"
-position.last                          = 3=4 6=1
-       # not a standard BIB-1 attribute
-position.firstAndLast                  = 3=3 6=3
-       # search term is anchored to be complete field
+position.first              = 3=1 6=1
+    # "first in field"
+position.any                = 3=3 6=1
+    # "any position in field"
+position.last               = 3=4 6=1
+    # not a standard BIB-1 attribute
+position.firstAndLast       = 3=3 6=3
+    # search term is anchored to be complete field
 
 # Structure attributes may be specified for individual relations; a
 # default structure attribute my be specified by the pseudo-relation
 # "*", to be used whenever a relation not listed here occurs.
 #
-structure.exact                                = 4=108
-       # string
-structure.all                          = 4=2
-structure.any                          = 4=2
-structure.*                            = 4=1
-       # phrase
+structure.exact             = 4=108
+    # string
+structure.all               = 4=2
+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
@@ -126,39 +125,39 @@ structure.*                               = 4=1
 # 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.z3958                       = 5=104
+truncation.right            = 5=1
+truncation.left             = 5=2
+truncation.both             = 5=3
+truncation.none             = 5=100
+truncation.z3958            = 5=104
 
 # Finally, any additional attributes that should always be included
 # with each term can be specified in the "always" property.
 #
-always                                 = 6=1
+always                      = 6=1
 # 6=1: completeness = incomplete subfield
 
 
 # Bath Profile support, added Thu Dec 18 13:06:20 GMT 2003
 # See the Bath Profile for SRW at
-#      http://zing.z3950.org/cql/bath.html
+#   http://zing.z3950.org/cql/bath.html
 # including the Bath Context Set defined within that document.
 #
 # In this file, we only map index-names to BIB-1 use attributes, doing
 # so in accordance with the specifications of the Z39.50 Bath Profile,
 # and leaving the relations, wildcards, etc. to fend for themselves.
 
-index.bath.keyTitle                    = 1=33
-index.bath.possessingInstitution       = 1=1044
-index.bath.name                                = 1=1002
-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
-index.bath.topicalSubject              = 1=1079
-index.bath.genreForm                   = 1=1075
+index.bath.keyTitle         = 1=33
+index.bath.possessingInstitution    = 1=1044
+index.bath.name             = 1=1002
+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
+index.bath.topicalSubject   = 1=1079
+index.bath.genreForm        = 1=1075