diff --git a/Gemfile b/Gemfile index eb613e7..289743a 100644 --- a/Gemfile +++ b/Gemfile @@ -64,7 +64,6 @@ group :test do gem "selenium-webdriver" end gem "blacklight", ">= 7.0" -gem "blacklight_advanced_search" group :development, :test do gem "dotenv" diff --git a/Gemfile.lock b/Gemfile.lock index 5a34cfb..a6ed071 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -100,9 +100,6 @@ GEM marc-fastxmlwriter rails traject (~> 3.0) - blacklight_advanced_search (8.0.0.alpha2) - blacklight (>= 7.15, < 9) - parslet bootsnap (1.18.4) msgpack (~> 1.2) bootstrap (5.3.3) @@ -286,7 +283,6 @@ GEM parser (3.3.7.1) ast (~> 2.4.1) racc - parslet (2.0.0) popper_js (2.11.8) pp (0.6.2) prettyprint @@ -521,7 +517,6 @@ PLATFORMS DEPENDENCIES blacklight (>= 7.0) blacklight-marc (~> 8.0) - blacklight_advanced_search bootsnap bootstrap (~> 5.3) brakeman diff --git a/app/controllers/catalog_controller.rb b/app/controllers/catalog_controller.rb index df2dbde..6aa0ef6 100644 --- a/app/controllers/catalog_controller.rb +++ b/app/controllers/catalog_controller.rb @@ -3,7 +3,6 @@ # Blacklight controller that handles searches and document requests class CatalogController < ApplicationController include Blacklight::Catalog - include BlacklightAdvancedSearch::Controller include Findingaids::Solr::CatalogHelpers delegate :is_collection?, to: :view_context @@ -31,18 +30,6 @@ class CatalogController < ApplicationController :timeAllowed => -1 } - # default advanced config values - config.advanced_search ||= Blacklight::OpenStructWithHashAccess.new - config.advanced_search[:enabled] = true - config.advanced_search[:qt] ||= "advanced" - config.advanced_search[:form_solr_parameters] = { - "facet" => true, - "facet.field" => advanced_facet_fields.map { |facet| solr_name(facet[:field], :facetable) }, - "facet.limit" => -1, # return all facet values - "facet.sort" => "count" # sort by byte order of values - } - config.advanced_search[:query_parser] ||= "dismax" - # solr path which will be added to solr base url before the other solr params. # config.solr_path = 'select' diff --git a/app/models/search_builder.rb b/app/models/search_builder.rb index 4052bcc..455d3cc 100644 --- a/app/models/search_builder.rb +++ b/app/models/search_builder.rb @@ -2,8 +2,6 @@ class SearchBuilder < Blacklight::SearchBuilder include Blacklight::Solr::SearchBuilderBehavior - include BlacklightAdvancedSearch::AdvancedSearchBuilder - self.default_processor_chain += [ :add_advanced_parse_q_to_solr, :add_advanced_search_to_solr ] ## # @example Adding a new step to the processor chain diff --git a/config/routes.rb b/config/routes.rb index ff7f033..d40db46 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,5 @@ Rails.application.routes.draw do mount Blacklight::Engine => "/" - mount BlacklightAdvancedSearch::Engine => "/" root to: "catalog#index" concern :searchable, Blacklight::Routes::Searchable.new