From 7528bbf2587d1b89016fb7960bc1ec738abb9e65 Mon Sep 17 00:00:00 2001 From: Ere Maijala <ere.maijala@helsinki.fi> Date: Thu, 31 Mar 2016 11:07:56 -0400 Subject: [PATCH] Added hook (not currently used) to differentiate facet label based on value. --- module/VuFind/src/VuFind/Search/Base/Params.php | 7 +++++-- module/VuFind/src/VuFind/Search/EDS/Params.php | 5 ++++- module/VuFind/src/VuFind/Search/Summon/Params.php | 5 ++++- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/module/VuFind/src/VuFind/Search/Base/Params.php b/module/VuFind/src/VuFind/Search/Base/Params.php index e5576fd1ed1..5062e9579f5 100644 --- a/module/VuFind/src/VuFind/Search/Base/Params.php +++ b/module/VuFind/src/VuFind/Search/Base/Params.php @@ -917,10 +917,13 @@ class Params implements ServiceLocatorAwareInterface * Get a user-friendly string to describe the provided facet field. * * @param string $field Facet field name. + * @param string $value Facet value. * * @return string Human-readable description of field. + * + * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ - public function getFacetLabel($field) + public function getFacetLabel($field, $value = null) { if (!isset($this->facetConfig[$field]) && isset($this->facetAliases[$field]) @@ -987,7 +990,7 @@ class Params implements ServiceLocatorAwareInterface if (!isset($skipList[$field]) || !in_array($value, $skipList[$field]) ) { - $facetLabel = $this->getFacetLabel($field); + $facetLabel = $this->getFacetLabel($field, $value); $list[$facetLabel][] = $this->formatFilterListEntry( $field, $value, $operator, $translate ); diff --git a/module/VuFind/src/VuFind/Search/EDS/Params.php b/module/VuFind/src/VuFind/Search/EDS/Params.php index dc8db7345f2..bd13a8dde6c 100644 --- a/module/VuFind/src/VuFind/Search/EDS/Params.php +++ b/module/VuFind/src/VuFind/Search/EDS/Params.php @@ -314,10 +314,13 @@ class Params extends \VuFind\Search\Base\Params * Get a user-friendly string to describe the provided facet field. * * @param string $field Facet field name. + * @param string $value Facet value. * * @return string Human-readable description of field. + * + * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ - public function getFacetLabel($field) + public function getFacetLabel($field, $value = null) { //Also store Limiter/Search Mode IDs/Values in the config file $facetId = $field; diff --git a/module/VuFind/src/VuFind/Search/Summon/Params.php b/module/VuFind/src/VuFind/Search/Summon/Params.php index 661ff9f3be0..217fa24235a 100644 --- a/module/VuFind/src/VuFind/Search/Summon/Params.php +++ b/module/VuFind/src/VuFind/Search/Summon/Params.php @@ -107,10 +107,13 @@ class Params extends \VuFind\Search\Base\Params * Get a user-friendly string to describe the provided facet field. * * @param string $field Facet field name. + * @param string $value Facet value. * * @return string Human-readable description of field. + * + * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ - public function getFacetLabel($field) + public function getFacetLabel($field, $value = null) { // The default use of "Other" for undefined facets doesn't work well with // checkbox facets -- we'll use field names as the default within the Summon -- GitLab