From 17a354f5e8724942b53589ade4e468a39ddc1014 Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Thu, 23 Mar 2017 10:49:09 +0000
Subject: [PATCH] Bug 18322: Add a facet for ccode fields to Zebra

This patch adds the index definitions for zebra faceting of ccode in
koha for marc21, normarc and unimarc.

We also add lines to the templates to expose the new facet and enable
non-zebra faceting for ccode too.

Signed-off-by: David Cook <dcook@prosentient.com.au>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
---
 C4/Koha.pm                                             | 10 ++++++++++
 .../marc_defs/marc21/biblios/biblio-koha-indexdefs.xml |  3 +++
 .../normarc/biblios/biblio-koha-indexdefs.xml          |  3 +++
 .../unimarc/biblios/biblio-koha-indexdefs.xml          |  8 ++++++--
 koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc    |  2 +-
 .../opac-tmpl/bootstrap/en/includes/opac-facets.inc    |  2 +-
 6 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/C4/Koha.pm b/C4/Koha.pm
index 42c8af1d28..a15080998a 100644
--- a/C4/Koha.pm
+++ b/C4/Koha.pm
@@ -395,6 +395,11 @@ sub getFacets {
                 idx  => 'location',
                 label => 'Location',
                 tags        => [ qw/ 995e / ],
+            },
+            {
+                idx => 'ccode',
+                label => 'CollectionCodes',
+                tags => [ qw / 099t 955h / ],
             }
             ];
 
@@ -477,6 +482,11 @@ sub getFacets {
                 label => 'Location',
                 tags => [ qw / 952c / ],
             },
+            {
+                idx => 'ccode',
+                label => 'CollectionCodes',
+                tags => [ qw / 9528 / ],
+            }
             ];
 
             unless ( Koha::Libraries->search->count == 1 )
diff --git a/etc/zebradb/marc_defs/marc21/biblios/biblio-koha-indexdefs.xml b/etc/zebradb/marc_defs/marc21/biblios/biblio-koha-indexdefs.xml
index b67da4193a..b3b12a0e2b 100644
--- a/etc/zebradb/marc_defs/marc21/biblios/biblio-koha-indexdefs.xml
+++ b/etc/zebradb/marc_defs/marc21/biblios/biblio-koha-indexdefs.xml
@@ -1413,5 +1413,8 @@
   <facet tag="952" subfields="y">
     <target_index>itype:0</target_index>
   </facet>
+  <facet tag="952" subfields="8">
+    <target_index>ccode:0</target_index>
+  </facet>
 
 </kohaidx:index_defs>
diff --git a/etc/zebradb/marc_defs/normarc/biblios/biblio-koha-indexdefs.xml b/etc/zebradb/marc_defs/normarc/biblios/biblio-koha-indexdefs.xml
index 7d2cf08ef0..161ce6a9f9 100644
--- a/etc/zebradb/marc_defs/normarc/biblios/biblio-koha-indexdefs.xml
+++ b/etc/zebradb/marc_defs/normarc/biblios/biblio-koha-indexdefs.xml
@@ -1012,5 +1012,8 @@
   <facet tag="952" subfields="y">
     <target_index>itype:0</target_index>
   </facet>
+  <facet tag="952" subfields="8">
+    <target_index>ccode:0</target_index>
+  </facet>
 
 </kohaidx:index_defs>
diff --git a/etc/zebradb/marc_defs/unimarc/biblios/biblio-koha-indexdefs.xml b/etc/zebradb/marc_defs/unimarc/biblios/biblio-koha-indexdefs.xml
index 7c550f80c7..e0068f500f 100644
--- a/etc/zebradb/marc_defs/unimarc/biblios/biblio-koha-indexdefs.xml
+++ b/etc/zebradb/marc_defs/unimarc/biblios/biblio-koha-indexdefs.xml
@@ -1443,11 +1443,12 @@
     <target_index>totalissues:n</target_index>
     <target_index>totalissues:s</target_index>
   </index_subfields>
-
   <index_subfields tag="999" subfields="x">
     <target_index>not-onloan-count:n</target_index>
   </index_subfields>
-
+  <facet tag="099" subfields="t">
+    <target_index>ccode:0</target_index>
+  </facet>
   <facet tag="225" subfields="a">
     <target_index>se:0</target_index>
   </facet>
@@ -1502,5 +1503,8 @@
   <facet tag="995" subfields="e">
     <target_index>location:0</target_index>
   </facet>
+  <facet tag="995" subfields="h">
+    <target_index>ccode:0</target_index>
+  </facet>
 
 </kohaidx:index_defs>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc
index 572be95594..eeb97ac0f6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc
@@ -21,7 +21,7 @@
 [% IF ( facets_loo.type_label_HomeLibrary ) %]<span id="facet-home-libraries">Home libraries</span>[% END %]
 [% IF ( facets_loo.type_label_HoldingLibrary ) %]<span id="facet-holding-libraries">Holding libraries</span>[% END %]
 [% IF facets_loo.type_label_Location %]<span id="facet-locations">Locations</span>[% END %]
-[% IF facets_loo.type_label_CollectionCodes %]<span id="facet-locations">Collections</span>[% END %]
+[% IF facets_loo.type_label_CollectionCodes %]<span id="facet-collections">Collections</span>[% END %]
 <ul>
   [% SET url = "/cgi-bin/koha/catalogue/search.pl?" _ query_cgi _ limit_cgi %]
   [% IF ( sort_by ) %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc
index 31089ef534..fbab708d58 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc
@@ -25,7 +25,7 @@
                         [% IF facets_loo.type_label_Places %]<h5 id="facet-places">Places</h5>[% END %]
                         [% IF facets_loo.type_label_Series %]<h5 id="facet-series">Series</h5>[% END %]
                         [% IF facets_loo.type_label_ItemTypes %]<h5 id="facet-itemtypes">Item types</h5>[% END %]
-                        [% IF facets_loo.type_label_CollectionCodes %]<h5 id="facet-itemtypes">Collections</h5>[% END %]
+                        [% IF facets_loo.type_label_CollectionCodes %]<h5 id="facet-collections">Collections</h5>[% END %]
                         [% UNLESS singleBranchMode %]
                             [% IF ( facets_loo.type_label_HomeLibrary ) %]<h5 id="facet-home-libraries">Home libraries</h5>[% END %]
                             [% IF ( facets_loo.type_label_HoldingLibrary ) %]<h5 id="facet-holding-libraries">Holding libraries</h5>[% END %]
-- 
2.39.5