Add exclude and or-facet support to Primo. Expose exclude support. (#1437)

config/vufind/Primo.ini

@@ -130,6 +130,10 @@ top_rows = 2
 top_cols = 3
 ; Do we want any facets to be collapsed by default?
 ;collapsedFacets = *
+; Should we show "exclude" links for some or all of the facets? Set to * for
+; all facets, use a comma-separated list to show for some of the facets, set
+; to false or omit to disable "exclude" links
+;exclude = *
 
 ; These settings affect the way the facets are displayed
 [Facet_Settings]

module/VuFind/src/VuFind/Search/Primo/Params.php

@@ -71,11 +71,7 @@ class Params extends \VuFind\Search\Base\Params
         $sort = $this->getSort();
         $finalSort = ($sort == 'relevance') ? null : $sort;
         $backendParams->set('sort', $finalSort);
-        $filterList = array_merge(
-            $this->getHiddenFilters(),
-            $this->filterList
-        );
-        $backendParams->set('filterList', $filterList);
+        $backendParams->set('filterList', $this->getFilterSettings());
 
         return $backendParams;
     }
@@ -116,4 +112,31 @@ class Params extends \VuFind\Search\Base\Params
         }
         return ucwords(str_replace('_', ' ', $str));
     }
+
+    /**
+     * Return the current filters as an array
+     *
+     * @return array
+     */
+    public function getFilterSettings()
+    {
+        $result = [];
+        $filterList = array_merge(
+            $this->getHiddenFilters(),
+            $this->filterList
+        );
+        foreach ($filterList as $field => $filter) {
+            $facetOp = 'AND';
+            $prefix = substr($field, 0, 1);
+            if ('~' === $prefix || '-' === $prefix) {
+                $facetOp = '~' === $prefix ? 'OR' : 'NOT';
+                $field = substr($field, 1);
+            }
+            $result[$field] = [
+                'facetOp' => $facetOp,
+                'values' => $filter
+            ];
+        }
+        return $result;
+    }
 }

module/VuFind/src/VuFind/Search/Primo/Results.php

@@ -100,7 +100,9 @@ class Results extends \VuFind\Search\Base\Results
                             'displayText' => $displayText,
                             'isApplied' =>
                                 $this->getParams()->hasFilter("$field:" . $value),
-                            'operator' => 'AND', 'count' => $count
+                            'operator' =>
+                                $this->getParams()->getFacetOperator($field),
+                            'count' => $count
                         ];
                     }
 

module/VuFindSearch/src/VuFindSearch/Backend/Primo/Connector.php

@@ -284,10 +284,27 @@ class Connector implements \Zend\Log\LoggerAwareInterface
             //     range facet control in the interface. look for injectPubDate
             if (!empty($args["filterList"])) {
                 foreach ($args["filterList"] as $facet => $values) {
-                    foreach ($values as $value) {
-                        $thisValue = preg_replace('/,/', '+', $value);
-                        $qs[] = "query=facet_" . $facet . ",exact,"
-                            . urlencode($thisValue);
+                    $facetOp = 'AND';
+                    if (isset($values['values'])) {
+                        $facetOp = $values['facetOp'];
+                        $values = $values['values'];
+                    }
+                    array_map(
+                        function ($value) {
+                            return urlencode(preg_replace('/,/', '+', $value));
+                        },
+                        $values
+                    );
+                    if ('OR' === $facetOp) {
+                        $qs[] = "query_inc=facet_$facet,exact," .
+                            implode(',', $values);
+                    } elseif ('NOT' === $facetOp) {
+                        $qs[] = "query_exc=facet_$facet,exact," .
+                            implode(',', $values);
+                    } else {
+                        foreach ($values as $value) {
+                            $qs[] = "query_inc=facet_$facet,exact,$value";
+                        }
                     }
                 }
             }