Use new-style request handler configuration.

sul-dlss · Jul 17, 2024 · 2aa857a · 2aa857a
1 parent 5e48a2c
commit 2aa857a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 13 deletions.
diff --git a/app/controllers/bookmarks_controller.rb b/app/controllers/bookmarks_controller.rb
@@ -4,13 +4,6 @@ class BookmarksController < CatalogController
   include Blacklight::Bookmarks
   include SelectionsCount
 
-  configure_blacklight do |config|
-    config.default_solr_params = {
-      qt: 'document',
-      rows: 20
-    }
-  end
-
   # Overidden from Blacklight to add our tabbed interface
   def index
     @bookmarks = token_or_current_or_guest_user.bookmarks.where(record_type: 'catalog')

diff --git a/app/controllers/catalog_controller.rb b/app/controllers/catalog_controller.rb
@@ -63,7 +63,6 @@ class CatalogController < ApplicationController
 
     ## Default parameters to send to solr for all search-like requests. See also SolrHelper#solr_search_params
     config.default_solr_params = {
-      qt: 'search',
       rows: 20,
       "f.callnum_facet_hsim.facet.limit": "-1",
       "f.stanford_work_facet_hsim.facet.limit": "-1"
@@ -85,9 +84,8 @@ class CatalogController < ApplicationController
     ## Default parameters to send on single-document requests to Solr. These settings are the Blackligt defaults (see SolrHelper#solr_doc_params) or
     ## parameters included in the Blacklight-jetty document requestHandler.
     #
-    config.document_solr_path = 'select'
+    config.document_solr_path = 'document'
     config.default_document_solr_params = {
-     :qt => 'document',
     #  ## These are hard-coded in the blacklight 'document' requestHandler
     #  # :fl => '*',
     #  # :rows => 1
@@ -484,7 +482,6 @@ class CatalogController < ApplicationController
     config.view.brief(partials: [:index], icon_class: "fa-align-justify")
 
     config.index.respond_to.mobile = true
-    config.fetch_many_document_params = { qt: 'document' }
 
     config.add_show_tools_partial :citation, if: false
     config.add_show_tools_partial :sms, if: false, callback: :sms_action, validator: :validate_sms_params

diff --git a/config/solr_configs/solrconfig.xml b/config/solr_configs/solrconfig.xml
@@ -246,7 +246,7 @@
        of SearchComponents (see below) and supports distributed
        queries across multiple shards
     -->
-  <requestHandler name="search" class="solr.SearchHandler" default="true">
+  <requestHandler name="/select" class="solr.SearchHandler">
     <lst name="defaults">
       <str name="defType">edismax</str>
       <str name="echoParams">explicit</str>
@@ -1049,7 +1049,7 @@
   </requestHandler>
 
   <!-- single document requests; use id=666 instead of q=id:666 -->
-  <requestHandler name="document" class="solr.SearchHandler" >
+  <requestHandler name="/document" class="solr.SearchHandler" >
     <lst name="defaults">
       <str name="echoParams">explicit</str>
       <str name="fl">