Bug 3072: Search for Heading-Main in authorities

Includes Heading-Main in authorities bib1 attribute set.
Also includes Any in authorities bib1 (was still missing).
Also removes temporary fix in AuthoritiesMarc.pm.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Rebased after pushed fix for #5924.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 6e58529bdd78f0593c9ad8b767715ff2d32e8ba8)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

diff --git a/C4/AuthoritiesMarc.pm b/C4/AuthoritiesMarc.pm
index 9710568..8f14ce0 100644 (file)
--- a/C4/AuthoritiesMarc.pm
+++ b/C4/AuthoritiesMarc.pm
@@ -223,11 +223,8 @@ sub SearchAuthorities {
         for(my $i = 0 ; $i <= $#{$value} ; $i++)
         {
             if (@$value[$i]){
-            ##If mainentry search $a tag
                 if (@$tags[$i] eq "mainmainentry") {
 
-# FIXME: 'Heading-Main' index not yet defined in zebra
-#                $attr =" \@attr 1=Heading-Main "; 
                 $attr =" \@attr 1=Heading-Main ";
 
                 }elsif (@$tags[$i] eq "mainentry") {

diff --git a/etc/zebradb/authorities/etc/bib1.att b/etc/zebradb/authorities/etc/bib1.att
index c41a5e6..b34e6b5 100644 (file)
--- a/etc/zebradb/authorities/etc/bib1.att
+++ b/etc/zebradb/authorities/etc/bib1.att
@@ -2,6 +2,7 @@
 name bib1
 reference Bib-1
 
+att 1016    Any
 att 9000    authtype
 att 12      Local-Number
 att 9038    Descriptive-cataloging-rules
@@ -65,6 +66,7 @@ att 9029    Term-genre-form-see-also-from
 att 8001    Heading
 att 8002    See-from
 att 8003    See-also-from
+att 8004    Heading-Main
 att 8804    Match-heading
 att 8805    Match-subdivision
 att 8806    Subdivision