[Koha-patches] [PATCH] Bug Fixing : searching on mainmainentry was disabled

[Henri-Damien LAURENT]

Adding Heading-Main as new index code in order to search only on Heading-main when $a selected.
---
 C4/AuthoritiesMarc.pm                              |    2 +-
 .../marc_defs/unimarc/authorities/record.abs       |   31 +++++++------------
 2 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/C4/AuthoritiesMarc.pm b/C4/AuthoritiesMarc.pm
index 2a27c54..deda42a 100644
--- a/C4/AuthoritiesMarc.pm
+++ b/C4/AuthoritiesMarc.pm
@@ -223,7 +223,7 @@ sub SearchAuthorities {
             if (@$value[$i]){
             ##If mainentry search $a tag
                 if (@$tags[$i] eq "mainmainentry") {
-                $attr =" \@attr 1=Heading ";
+                $attr =" \@attr 1=Heading-Main ";
                 }elsif (@$tags[$i] eq "mainentry") {
                 $attr =" \@attr 1=Heading ";
                 }else{
diff --git a/etc/zebradb/marc_defs/unimarc/authorities/record.abs b/etc/zebradb/marc_defs/unimarc/authorities/record.abs
index 14bb0df..00d573c 100644
--- a/etc/zebradb/marc_defs/unimarc/authorities/record.abs
+++ b/etc/zebradb/marc_defs/unimarc/authorities/record.abs
@@ -12,60 +12,53 @@ xpath enable
 
 all any
 melm 001 Local-Number
-#melm 942$a authtype
+melm 942$a authtype
 melm 152$b authtype
 
 # Personal Name
-melm 200$a Personal-name-heading:w,Personal-name-heading:p,Personal-name-heading:s,Personal-name:w,Personal-name:p,Heading:w,Heading:p,Heading:s
+melm 200$a Personal-name-heading:w,Personal-name-heading:p,Personal-name-heading:s,Personal-name:w,Personal-name:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s
 melm 200 Personal-name:w,Personal-name:p,Heading:w,Heading:p
 melm 400 Personal-name-see:w,Personal-name-see:p,See:w,See:p
 melm 500 Personal-name-see-also:w,Personal-name-see-also:p,See-also:w,See-also:p
 melm 700$a Personal-name-parallel:w,Personal-name-parallel:p,Parallel:w,Parallel:p
 
 # Corporate Name
-melm 210$a Corporate-name-heading:w,Corporate-name-heading:p,Corporate-name-heading:s,Corporate-name:w,Corporate-name:p,Heading:w,Heading:p,Heading:s
-melm 210 Corporate-name:w,Corporate-name:p,Heading:w,Heading:p
-melm 410 Corporate-name-see:w,Corporate-name-see:p,See:w,See:p
-melm 510 Corporate-name-see-also:w,Corporate-name-see-also:p,See-also:w,See-also:p
-melm 710 Corporate-name-parallel:w,Corporate-name-parallel:p,Parallel:w,Parallel:p
-
-# Meeting Name - Same as Corporate name in UNIMARC?
-melm 210$a Conference-name-heading:w,Conference-name-heading:p,Conference-name-heading:s,Conference-name:w,Conference-name:p,Heading:w,Heading:p,Heading:s
-melm 210 Conference-name:w,Conference-name:p,Heading:w,Heading:p
-melm 410 Conference-name-see:w,Conference-name-see:p,See:w,See:p
-melm 510 Conference-name-see-also:w,Conference-name-see-also:p,See-also:w,See-also:p
+melm 210$a Corporate-name-heading:w,Corporate-name-heading:p,Corporate-name-heading:s,Corporate-name:w,Corporate-name:p,Conference-name-heading:w,Conference-name-heading:p,Conference-name-heading:s,Conference-name:w,Conference-name:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s
+melm 210 Corporate-name:w,Corporate-name:p,Conference-name:w,Conference-name:p,Heading:w,Heading:p
+melm 410 Corporate-name-see:w,Corporate-name-see:p,Conference-name-see:w,Conference-name-see:p,See:w,See:p
+melm 510 Corporate-name-see-also:w,Corporate-name-see-also:p,Conference-name-see-also:w,Conference-name-see-also:p,See-also:w,See-also:p
 melm 710 Corporate-name-parallel:w,Corporate-name-parallel:p,Parallel:w,Parallel:p
 
 # Uniform Title
-melm 230$a Title-uniform-heading:w,Title-uniform-heading:p,Title-uniform-heading:s,Title-uniform:w,Title-uniform:p,Heading:w,Heading:p,Heading:s
+melm 230$a Title-uniform-heading:w,Title-uniform-heading:p,Title-uniform-heading:s,Title-uniform:w,Title-uniform:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s
 melm 230 Title-uniform:w,Title-uniform:p,Heading:w,Heading:p
 melm 430 Title-uniform-see:w,Title-uniform-see:p,See:w,See:p
 melm 530 Title-uniform-see-also:w,Title-uniform-see-also:p,See-also:w,See-also:p
 melm 730$a Title-uniform-parallel:w,Title-uniform-parallel:p,Parallel:w,Parallel:p
 
 # Second area for uniform titles in UNIMARC?
-melm 235$a Title-uniform-heading:w,Title-uniform-heading:p,Title-uniform-heading:s,Title-uniform:w,Title-uniform:p,Heading:w,Heading:p,Heading:s
+melm 235$a Title-uniform-heading:w,Title-uniform-heading:p,Title-uniform-heading:s,Title-uniform:w,Title-uniform:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s
 melm 235 Title-uniform:w,Title-uniform:p,Heading:w,Heading:p
 melm 435 Title-uniform-see:w,Title-uniform-see:p,See:w,See:p
 melm 535 Title-uniform-see-also:w,Title-uniform-see-also:p,See-also:w,See-also:p
 melm 735$a Title-uniform-parallel:w,Title-uniform-parallel:p,Parallel:w,Parallel:p
 
 # Topical Term
-melm 250$a Subject-heading:w,Subject-heading:p,Subject-heading:s,Subject:w,Subject:p,Heading:w,Heading:p,Heading:s
-melm 250 Subject:w,Subject:p,Heading:w,Heading:p
+melm 250$a Subject-heading:w,Subject-heading:p,Subject-heading:s,Subject:w,Subject:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s
+melm 250 Subject:w,Subject:p,Heading:w,Heading:p,Subject-heading:w,Subject-heading:p,Subject-heading:s
 melm 450 Subject-see:w,Subject-see:p,See:w,See:p
 melm 550 Subject-see-also:w,Subject-see-also:p,See-also:w,See-also:p
 melm 750$a Subject-parallel:w,Subject-parallel:p,Parallel:w,Parallel:p
 
 # Geographic Name
-melm 215$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
+melm 215$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,Heading-Main:w,Heading-Main:p,Heading-Main:s
 melm 215 Name-geographic:w,Name-geographic:p,Heading:w,Heading:p
 melm 415 Name-geographic-see:w,Name-geographic-see:p,See:w,See:p
 melm 515 Name-geographic-see-also:w,Name-geographic-see-also:p,See-also:w,See-also:p
 melm 715$a Name-geographic-parallel:w,Name-geographic-parallel:p,Parallel:w,Parallel:p
 
 # Geographic Term - Not in UNIMARC?
-#melm 155$a Term-geographic-heading:w,Term-geographic-heading:p,Term-geographic-heading:s,Term-geographic:w,Term-geographic:p,Heading:w,Heading:p,Heading:s
+#melm 155$a Term-geographic-heading:w,Term-geographic-heading:p,Term-geographic-heading:s,Term-geographic:w,Term-geographic:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s
 #melm 155 Term-geographic:w,Term-geographic:p,Term-geographic:s,Heading:w,Heading:p,Heading:s
 #melm 455 Term-geographic-see:w,Term-geographic-see:p,Term-geographic-see:s,See:w,See:p,See:s
 #melm 555 Term-geographic-see-also:w,Term-geographic-see-also:p,Term-geographic-see-also:s,See-also:w,See-also:p,See-also:s
-- 
1.6.0.2