Skip to content

Removes the Blacklight Advanced Search gem #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 0 additions & 5 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -521,7 +517,6 @@ PLATFORMS
DEPENDENCIES
blacklight (>= 7.0)
blacklight-marc (~> 8.0)
blacklight_advanced_search
bootsnap
bootstrap (~> 5.3)
brakeman
Expand Down
13 changes: 0 additions & 13 deletions app/controllers/catalog_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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'

Expand Down
2 changes: 0 additions & 2 deletions app/models/search_builder.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion config/routes.rb
Original file line number Diff line number Diff line change
@@ -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
Expand Down