Merge branch 'update-to-core-v6-with-ES7' into development

swissbib · Jan 16, 2020 · b1e14db · b1e14db
2 parents 4c619b1 + 3e9f350
commit b1e14db
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 5 deletions.
diff --git a/local/jus/jusdev/config/vufind/searches.ini b/local/jus/jusdev/config/vufind/searches.ini
@@ -7,7 +7,7 @@ default_sort              = publishDateSort desc
 limit_options	          = 5,10,20,40,60,80,100
 default_limit             = 20
 multiValuedFRBRField      = false
-retain_filters_by_default = true
+retain_filters_by_default = false
 
 [Sorting]
 relevance		     = sort.relevance

diff --git a/local/jus/justest/config/vufind/searches.ini b/local/jus/justest/config/vufind/searches.ini
@@ -7,7 +7,7 @@ default_sort              = publishDateSort desc
 limit_options	          = 5,10,20,40,60,80,100
 default_limit             = 20
 multiValuedFRBRField      = false
-retain_filters_by_default = true
+retain_filters_by_default = false
 
 [Sorting]
 relevance		     = sort.relevance

diff --git a/local/jus/local/config/vufind/searches.ini b/local/jus/local/config/vufind/searches.ini
@@ -7,7 +7,7 @@ default_sort              = publishDateSort desc
 limit_options	          = 5,10,20,40,60,80,100
 default_limit             = 20
 multiValuedFRBRField      = false
-retain_filters_by_default = true
+retain_filters_by_default = false
 
 [Sorting]
 relevance		     = sort.relevance

diff --git a/module/Swissbib/src/Swissbib/View/Helper/DisplayNameSorter.php b/module/Swissbib/src/Swissbib/View/Helper/DisplayNameSorter.php
@@ -73,11 +73,29 @@ public function __invoke(array $facetList, string $sortIndex)
      */
     private function _sortByDisplayName($a, $b)
     {
-        $a = strtoupper($a[$this->sortIndex]);
-        $b = strtoupper($b[$this->sortIndex]);
+        $a = $this->stripDiacritics(strtoupper($a[$this->sortIndex]));
+        $b = $this->stripDiacritics(strtoupper($b[$this->sortIndex]));
         if ($a == $b) {
             return 0;
         }
         return ($a < $b) ? -1 : 1;
     }
+
+    /**
+     * Remove diacritics (accents, umlauts, etc.) from a string
+     *
+     * @param string $string The text where we would like to remove diacritics
+     *
+     * @return string The input text with diacritics removed
+     */
+    private function stripDiacritics($string)
+    {
+        // See http://userguide.icu-project.org/transforms/general for
+        // an explanation of this.
+        $transliterator = \Transliterator::createFromRules(
+            ':: NFD; :: [:Nonspacing Mark:] Remove; :: NFC;',
+            \Transliterator::FORWARD
+        );
+        return $transliterator->transliterate($string);
+    }
 }
diff --git a/module/Swissbib/src/Swissbib/VuFind/Search/MixedList/Params.php b/module/Swissbib/src/Swissbib/VuFind/Search/MixedList/Params.php
@@ -43,4 +43,12 @@
  */
 class Params extends VuFindMixedListParams
 {
+    /**
+     * Set filterList
+     *
+     * @param $filterArray
+     */
+    public function setFilterList($filterArray) {
+        $this->filterList = $filterArray;
+    }
 }
diff --git a/module/VuFind/config/module.config.php b/module/VuFind/config/module.config.php
@@ -584,6 +584,7 @@
 
 // Define record view routes -- route name => controller
 $recordRoutes = [
+    'vufindrecord' => 'Record',
     'record' => 'Record',
     'collection' => 'Collection',
     'edsrecord' => 'EdsRecord',