VUFIND-1210: Use Solr JSON APIs

module/VuFind/src/VuFind/Hierarchy/TreeDataSource/Solr.php

@@ -31,7 +31,7 @@
 
 use VuFind\Hierarchy\TreeDataFormatter\PluginManager as FormatterManager;
 use VuFindSearch\Backend\Solr\Command\RawJsonSearchCommand;
-use VuFindSearch\ParamBag;
+use VuFindSearch\ParamBagBag;
 use VuFindSearch\Query\Query;
 use VuFindSearch\Service;
 
@@ -152,12 +152,14 @@ public function getXML($id, $options = [])
     protected function getDefaultSearchParams(): array
     {
         return [
-            'fq' => $this->filters,
-            'hl' => ['false'],
-            'fl' => ['title,id,hierarchy_parent_id,hierarchy_top_id,'
+            'filter' => $this->filters,
+            'fields' => ['title,id,hierarchy_parent_id,hierarchy_top_id,'
                 . 'is_hierarchy_id,hierarchy_sequence,title_in_hierarchy'],
-            'wt' => ['json'],
-            'json.nl' => ['arrarr'],
+            'params' => [
+                'hl' => ['false'],
+                'wt' => ['json'],
+                'json.nl' => ['arrarr'],
+            ],
         ];
     }
 
@@ -172,7 +174,7 @@ protected function getDefaultSearchParams(): array
      */
     protected function searchSolrLegacy(Query $query, $rows): array
     {
-        $params = new ParamBag($this->getDefaultSearchParams());
+        $params = ParamBagBag::fromArray($this->getDefaultSearchParams());
         $command = new RawJsonSearchCommand(
             $this->backendId,
             $query,
@@ -198,14 +200,16 @@ protected function searchSolrCursor(Query $query, $rows): array
         $cursorMark = '*';
         $records = [];
         while ($cursorMark !== $prevCursorMark) {
-            $params = new ParamBag(
+            $params = ParamBagBag::fromArray(
                 $this->getDefaultSearchParams() + [
                     // Sort is required
                     'sort' => ['id asc'],
-                    // Override any default timeAllowed since it cannot be used with
-                    // cursorMark
-                    'timeAllowed' => -1,
-                    'cursorMark' => $cursorMark,
+                    'params' => [
+                        // Override any default timeAllowed since it cannot be used with
+                        // cursorMark
+                        'timeAllowed' => -1,
+                        'cursorMark' => $cursorMark,
+                    ],
                 ]
             );
             $command = new RawJsonSearchCommand(

module/VuFind/src/VuFind/RecordDriver/SolrDefault.php

@@ -33,6 +33,8 @@
 namespace VuFind\RecordDriver;
 
 use VuFindSearch\Command\SearchCommand;
+use VuFindSearch\ParamBag;
+use VuFindSearch\ParamBagBag;
 
 use function count;
 use function in_array;
@@ -317,7 +319,7 @@ public function getChildRecordCount()
             'hierarchy_parent_id:"' . $safeId . '"'
         );
         // Disable highlighting for efficiency; not needed here:
-        $params = new \VuFindSearch\ParamBag(['hl' => ['false']]);
+        $params = new ParamBagBag(['params' => new ParamBag(['hl' => ['false']])]);
         $command = new SearchCommand($this->sourceIdentifier, $query, 0, 0, $params);
         return $this->searchService
             ->invoke($command)->getResult()->getTotal();

module/VuFind/src/VuFind/Search/Factory/AbstractSolrBackendFactory.php

@@ -494,16 +494,16 @@ protected function createConnector()
         $handlers = [
             'select' => [
                 'fallback' => true,
-                'defaults' => ['fl' => $defaultFields],
-                'appends'  => ['fq' => []],
+                'defaults' => ['fields' => $defaultFields],
+                'appends'  => ['filter' => []],
             ],
             'terms' => [
                 'functions' => ['terms'],
             ],
         ];
 
         foreach ($this->getHiddenFilters() as $filter) {
-            array_push($handlers['select']['appends']['fq'], $filter);
+            array_push($handlers['select']['appends']['filter'], $filter);
         }
 
         $connector = new $this->connectorClass(

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

@@ -77,10 +77,10 @@ trait FacetLimitTrait
     protected function initFacetLimitsFromConfig(?Config $config = null)
     {
         if (is_numeric($config->facet_limit ?? null)) {
-            $this->setFacetLimit($config->facet_limit);
+            $this->setFacetLimit((int)($config->facet_limit));
         }
         foreach ($config->facet_limit_by_field ?? [] as $k => $v) {
-            $this->facetLimitByField[$k] = $v;
+            $this->facetLimitByField[$k] = (int)$v;
         }
     }
 
@@ -91,7 +91,7 @@ protected function initFacetLimitsFromConfig(?Config $config = null)
      *
      * @return void
      */
-    public function setFacetLimit($l)
+    public function setFacetLimit(int $l): void
     {
         $this->facetLimit = $l;
     }
@@ -125,7 +125,7 @@ public function getHierarchicalFacetLimit()
      *
      * @return void
      */
-    public function setHierarchicalFacetLimit($limit)
+    public function setHierarchicalFacetLimit(int $limit)
     {
         $this->hierarchicalFacetLimit = $limit;
     }

module/VuFind/src/VuFind/Search/Solr/CustomFilterListener.php

@@ -74,7 +74,7 @@ class CustomFilterListener
      *
      * @var string
      */
-    protected $filterParam = 'fq';
+    protected $filterParam = 'filter';
 
     /**
      * Constructor.

module/VuFind/src/VuFind/Search/Solr/DeduplicationListener.php

@@ -154,15 +154,15 @@ public function onSearchPre(EventInterface $event)
                     $this->enabled && 'getids' !== $context
                     && !$this->hasChildFilter($params)
                 ) {
-                    $fq = '-merged_child_boolean:true';
+                    $filter = '-merged_child_boolean:true';
                     if ($context == 'similar' && $id = $event->getParam('id')) {
-                        $fq .= ' AND -local_ids_str_mv:"'
+                        $filter .= ' AND -local_ids_str_mv:"'
                             . addcslashes($id, '"') . '"';
                     }
                 } else {
-                    $fq = '-merged_boolean:true';
+                    $filter = '-merged_boolean:true';
                 }
-                $params->add('fq', $fq);
+                $params->add('filter', $filter);
             }
         }
         return $event;
@@ -177,7 +177,7 @@ public function onSearchPre(EventInterface $event)
      */
     public function hasChildFilter($params)
     {
-        $filters = $params->get('fq');
+        $filters = $params->get('filter');
         return $filters != null && in_array('merged_child_boolean:true', $filters);
     }
 

module/VuFind/src/VuFind/Search/Solr/DefaultParametersListener.php

@@ -120,6 +120,7 @@ public function onSearchPre(EventInterface $event)
                     if (!isset($parts[1])) {
                         continue;
                     }
+                    // TODO This will need some config changes to know how to nest
                     $params->add(urldecode($parts[0]), urldecode($parts[1]));
                 }
             }

module/VuFind/src/VuFind/Search/Solr/Explanation.php

@@ -32,6 +32,7 @@
 
 use VuFindSearch\Backend\Solr\Command\RawJsonSearchCommand;
 use VuFindSearch\ParamBag;
+use VuFindSearch\ParamBagBag;
 
 use function count;
 use function floatval;
@@ -249,15 +250,18 @@ public function performRequest($recordId)
 
         // prepare search params
         $params = $this->getParams()->getBackendParameters();
-        $params->set('spellcheck', 'false');
-        $explainParams = new ParamBag([
-            'fl' => 'id,score',
-            'facet' => 'true',
-            'debug' => 'true',
-            'indent' => 'true',
-            'param' => 'q',
-            'echoParams' => 'all',
-            'explainOther' => 'id:"' . addcslashes($recordId, '"') . '"',
+        $params = ParamBagBag::from($params);
+        $params->setNested('params', 'spellcheck', 'false');
+        $explainParams = new ParamBagBag([
+            'fields' => 'id,score',
+            'facet' => 'true', // This field will need an update when I do the facet API upgrade
+            'params' => new ParamBag([
+                'debug' => 'true',
+                'indent' => 'true',
+                'param' => 'query', // Is this change correct?
+                'echoParams' => 'all',
+                'explainOther' => 'id:"' . addcslashes($recordId, '"') . '"',
+            ]),
         ]);
         $params->mergeWith($explainParams);
 

module/VuFind/src/VuFind/Search/Solr/FilterFieldConversionListener.php

@@ -91,22 +91,22 @@ public function attach(SharedEventManagerInterface $manager)
     public function onSearchPre(EventInterface $event)
     {
         $params = $event->getParam('command')->getSearchParameters();
-        $fq = $params->get('fq');
-        if (is_array($fq) && !empty($fq)) {
+        $filters = $params->get('filter');
+        if (is_array($filters) && !empty($filters)) {
             // regex lookahead to ignore strings inside quotes:
             $lookahead = '(?=(?:[^\"]*+\"[^\"]*+\")*+[^\"]*+$)';
-            $new_fq = [];
-            foreach ($fq as $currentFilter) {
+            $new_filters = [];
+            foreach ($filters as $currentFilter) {
                 foreach ($this->map as $oldField => $newField) {
                     $currentFilter = preg_replace(
                         "/\b$oldField:$lookahead/",
                         "$newField:",
                         $currentFilter
                     );
                 }
-                $new_fq[] = $currentFilter;
+                $new_filters[] = $currentFilter;
             }
-            $params->set('fq', $new_fq);
+            $params->set('filter', $new_filters);
         }
 
         return $event;

module/VuFind/src/VuFind/Search/Solr/InjectConditionalFilterListener.php

@@ -147,12 +147,12 @@ public function onSearchPre(EventInterface $event)
         }
 
         $params = $command->getSearchParameters();
-        $fq = $params->get('fq');
-        if (!is_array($fq)) {
-            $fq = [];
+        $filters = $params->get('filter');
+        if (!is_array($filters)) {
+            $filters = [];
         }
-        $new_fq = array_merge($fq, $this->filterList);
-        $params->set('fq', $new_fq);
+        $new_filters = array_merge($filters, $this->filterList);
+        $params->set('filters', $new_filters);
 
         return $event;
     }

module/VuFind/src/VuFind/Search/Solr/InjectHighlightingListener.php

@@ -32,6 +32,7 @@
 use Laminas\EventManager\EventInterface;
 use Laminas\EventManager\SharedEventManagerInterface;
 use VuFindSearch\Backend\BackendInterface;
+use VuFindSearch\ParamBagBag;
 use VuFindSearch\Service;
 
 /**
@@ -120,18 +121,19 @@ public function onSearchPre(EventInterface $event)
         }
         if ($command->getTargetIdentifier() === $this->backend->getIdentifier()) {
             if ($params = $command->getSearchParameters()) {
+                $params = ParamBagBag::from($params);
                 // Set highlighting parameters unless explicitly disabled:
-                $hl = $params->get('hl');
+                $hl = $params->getNested('params', 'hl');
                 if (($hl[0] ?? 'true') != 'false') {
                     $this->active = true;
                     // Set extra parameters first so they don't override necessary
                     // core parameters:
                     foreach ($this->extraHighlightingParameters as $key => $val) {
                         $params->set($key, $val);
                     }
-                    $params->set('hl', 'true');
-                    $params->set('hl.simple.pre', '{{{{START_HILITE}}}}');
-                    $params->set('hl.simple.post', '{{{{END_HILITE}}}}');
+                    $params->setNested('params', 'hl', 'true');
+                    $params->setNested('params', 'hl.simple.pre', '{{{{START_HILITE}}}}');
+                    $params->setNested('params', 'hl.simple.post', '{{{{END_HILITE}}}}');
 
                     // Turn on hl.q generation in query builder:
                     $this->backend->getQueryBuilder()

module/VuFind/src/VuFind/Search/Solr/InjectSpellingListener.php

@@ -35,7 +35,7 @@
 use VuFind\Log\LoggerAwareTrait;
 use VuFindSearch\Backend\BackendInterface;
 use VuFindSearch\Backend\Solr\Response\Json\Spellcheck;
-use VuFindSearch\ParamBag;
+use VuFindSearch\ParamBagBag;
 use VuFindSearch\Query\Query;
 use VuFindSearch\Service;
 
@@ -128,8 +128,10 @@ public function onSearchPre(EventInterface $event)
         }
         if ($command->getTargetIdentifier() === $this->backend->getIdentifier()) {
             if ($params = $command->getSearchParameters()) {
+                $params = ParamBagBag::from($params);
+
                 // Set spelling parameters when enabled:
-                $sc = $params->get('spellcheck');
+                $sc = $params->getNested('params', 'spellcheck');
                 if (isset($sc[0]) && $sc[0] != 'false') {
                     $this->active = true;
                     if (empty($this->dictionaries)) {
@@ -140,8 +142,9 @@ public function onSearchPre(EventInterface $event)
 
                     // Set relevant Solr parameters:
                     reset($this->dictionaries);
-                    $params->set('spellcheck', 'true');
-                    $params->set(
+                    $params->setNested('params', 'spellcheck', 'true');
+                    $params->setNested(
+                        'params',
                         'spellcheck.dictionary',
                         current($this->dictionaries)
                     );
@@ -175,7 +178,8 @@ public function onSearchPost(EventInterface $event)
         if ($command->getTargetIdentifier() === $this->backend->getIdentifier()) {
             $result = $command->getResult();
             $params = $command->getSearchParameters();
-            $spellcheckQuery = $params->get('spellcheck.q');
+            $params = ParamBagBag::from($params);
+            $spellcheckQuery = $params->getNested('params', 'spellcheck.q');
             if (!empty($spellcheckQuery)) {
                 $this->aggregateSpellcheck(
                     $result->getSpellcheck(),
@@ -197,9 +201,9 @@ public function onSearchPost(EventInterface $event)
     protected function aggregateSpellcheck(Spellcheck $spellcheck, $query)
     {
         while (next($this->dictionaries) !== false) {
-            $params = new ParamBag();
-            $params->set('spellcheck', 'true');
-            $params->set('spellcheck.dictionary', current($this->dictionaries));
+            $params = new ParamBagBag();
+            $params->setNested('params', 'spellcheck', 'true');
+            $params->setNested('params', 'spellcheck.dictionary', current($this->dictionaries));
             $queryObj = new Query($query, 'AllFields');
             try {
                 $collection = $this->backend->search($queryObj, 0, 0, $params);

module/VuFind/src/VuFind/Search/Solr/MultiIndexListener.php

@@ -32,6 +32,8 @@
 use Laminas\EventManager\EventInterface;
 use Laminas\EventManager\SharedEventManagerInterface;
 use VuFindSearch\Backend\BackendInterface;
+use VuFindSearch\ParamBag;
+use VuFindSearch\ParamBagBag;
 use VuFindSearch\Service;
 
 use function in_array;
@@ -126,28 +128,37 @@ public function onSearchPre(EventInterface $event)
         $command = $event->getParam('command');
         if ($command->getTargetIdentifier() === $this->backend->getIdentifier()) {
             $params = $command->getSearchParameters();
+            $params = ParamBagBag::from($params);
             $allShardsContexts = ['retrieve', 'retrieveBatch'];
             if (in_array($command->getContext(), $allShardsContexts)) {
                 // If we're retrieving by id(s), we should pull all shards to be
                 // sure we find the right record(s).
-                $params->set('shards', implode(',', $this->shards));
+                $params->setNested('params', 'shards', implode(',', $this->shards));
             } else {
                 // In any other context, we should make sure our field values are
                 // all legal.
 
                 // Normalize array of strings containing comma-separated values to
                 // simple array of values; check if $params->get('shards') returns
                 // an array to prevent invalid argument warnings.
-                $shards = $params->get('shards');
+                $shards = $params->getNested('params', 'shards');
                 $shards = explode(
                     ',',
                     implode(',', (is_array($shards) ? $shards : []))
                 );
                 $fields = $this->getFields($shards);
                 $specs  = $this->getSearchSpecs($fields);
                 $this->backend->getQueryBuilder()->setSpecs($specs);
-                $facets = $params->get('facet.field') ?: [];
-                $params->set('facet.field', array_diff($facets, $fields));
+                if ($params->get('facet')) {
+                    $facets = $params->get('facet')[0]->getArrayCopy();
+                    $facets = array_filter(
+                        $facets,
+                        fn ($facet) =>
+                            (!($facet[0] instanceof ParamBag))
+                            || !in_array($facet[0]->getArrayCopy()['field'][0], $fields)
+                    );
+                    $params->set('facet', new ParamBag($facets));
+                }
             }
         }
         return $event;