Merge branch 'master' of https://github.com/vufind-org/vufind

module/VuFind/src/VuFind/View/Helper/Root/SearchBox.php

@@ -128,25 +128,31 @@ class SearchBox extends \Zend\View\Helper\AbstractHelper
     public function getFilterDetails($filterList, $checkboxFilters)
     {
         $results = array();
-        $i = 0;
         foreach ($filterList as $field => $data) {
             foreach ($data as $value) {
-                $results[] = array(
-                    'id' => 'applied_filter_' . ++$i,
-                    'value' => "$field:\"$value\""
-                );
+                $results[] = "$field:\"$value\"";
             }
         }
-        $i = 0;
         foreach ($checkboxFilters as $current) {
-            if ($current['selected']) {
-                $results[] = array(
-                    'id' => 'applied_checkbox_filter_' . ++$i,
-                    'value' => $current['filter']
-                );
+            // Check a normalized version of the checkbox facet against the existing
+            // filter list to avoid unnecessary duplication. Note that we don't
+            // actually use this normalized version for anything beyond dupe-checking
+            // in case it breaks advanced syntax.
+            $regex = '/^([^:]*):([^"].*[^"]|[^"]{1,2})$/';
+            $normalized
+                = preg_match($regex, $current['filter'], $match)
+                ? "{$match[1]}:\"{$match[2]}\"" : $current['filter'];
+            if ($current['selected'] && !in_array($normalized, $results)
+                && !in_array($current['filter'], $results)
+            ) {
+                $results[] = $current['filter'];
             }
         }
-        return $results;
+        $final = array();
+        foreach ($results as $i => $val) {
+            $final[] = array('id' => 'applied_filter_' . ($i + 1), 'value' => $val);
+        }
+        return $final;
     }
 
     /**