blacklight 6.14.0 → 7.0.0

data/lib/blacklight/solr/search_builder_behavior.rb

@@ -18,12 +18,12 @@ module Blacklight::Solr
     def default_solr_parameters(solr_parameters)
       blacklight_config.default_solr_params.each do |key, value|
         solr_parameters[key] = if value.respond_to? :deep_dup
-          value.deep_dup
-        elsif value.respond_to? :dup and value.duplicable?
-          value.dup
-        else
-          value
-        end
+                                 value.deep_dup
+                               elsif value.respond_to?(:dup) && value.duplicable?
+                                 value.dup
+                               else
+                                 value
+                               end
       end
     end
 
@@ -44,7 +44,7 @@ module Blacklight::Solr
 
       if search_field
         solr_parameters[:qt] = search_field.qt
-        solr_parameters.merge!( search_field.solr_parameters) if search_field.solr_parameters
+        solr_parameters.merge!(search_field.solr_parameters) if search_field.solr_parameters
       end
 
       ##
@@ -54,7 +54,7 @@ module Blacklight::Solr
       ##
       if search_field && search_field.solr_local_parameters.present?
         local_params = search_field.solr_local_parameters.map do |key, val|
-          key.to_s + "=" + solr_param_quote(val, :quote => "'")
+          key.to_s + "=" + solr_param_quote(val, quote: "'")
         end.join(" ")
         solr_parameters[:q] = "{!#{local_params}}#{blacklight_params[:q]}"
 
@@ -66,13 +66,13 @@ module Blacklight::Solr
       elsif blacklight_params[:q].is_a? Hash
         q = blacklight_params[:q]
         solr_parameters[:q] = if q.values.any?(&:blank?)
-          # if any field parameters are empty, exclude _all_ results
-          "{!lucene}NOT *:*"
-        else
-          "{!lucene}" + q.map do |field, values|
-            "#{field}:(#{Array(values).map { |x| solr_param_quote(x) }.join(' OR ')})"
-          end.join(" AND ")
-        end
+                                # if any field parameters are empty, exclude _all_ results
+                                "{!lucene}NOT *:*"
+                              else
+                                "{!lucene}" + q.map do |field, values|
+                                  "#{field}:(#{Array(values).map { |x| solr_param_quote(x) }.join(' OR ')})"
+                                end.join(" AND ")
+                              end
 
         solr_parameters[:defType] = 'lucene'
         solr_parameters[:spellcheck] = 'false'
@@ -113,7 +113,7 @@ module Blacklight::Solr
         if facet.pivot
           solr_parameters.append_facet_pivot with_ex_local_param(facet.ex, facet.pivot.join(","))
         elsif facet.query
-          solr_parameters.append_facet_query facet.query.map { |k, x| with_ex_local_param(facet.ex, x[:fq]) }
+          solr_parameters.append_facet_query facet.query.values.map { |x| with_ex_local_param(facet.ex, x[:fq]) }
         else
           solr_parameters.append_facet_fields with_ex_local_param(facet.ex, facet.field)
         end
@@ -134,13 +134,13 @@ module Blacklight::Solr
     end
 
     def add_solr_fields_to_query solr_parameters
-      blacklight_config.show_fields.select(&method(:should_add_field_to_request?)).each do |field_name, field|
+      blacklight_config.show_fields.select(&method(:should_add_field_to_request?)).each_value do |field|
         field.solr_params.each do |k, v|
           solr_parameters[:"f.#{field.field}.#{k}"] = v
         end if field.solr_params
       end
 
-      blacklight_config.index_fields.select(&method(:should_add_field_to_request?)).each do |field_name, field|
+      blacklight_config.index_fields.select(&method(:should_add_field_to_request?)).each_value do |field|
         if field.highlight
           solr_parameters[:hl] = true
           solr_parameters.append_highlight_field field.field
@@ -171,7 +171,7 @@ module Blacklight::Solr
 
     # Remove the group parameter if we've faceted on the group field (e.g. for the full results for a group)
     def add_group_config_to_solr solr_parameters
-      if blacklight_params[:f] and blacklight_params[:f][grouped_key_for_results]
+      if blacklight_params[:f] && blacklight_params[:f][grouped_key_for_results]
         solr_parameters[:group] = false
       end
     end
@@ -185,11 +185,7 @@ module Blacklight::Solr
       facet_ex = facet_config.respond_to?(:ex) ? facet_config.ex : nil
       solr_params[:"facet.field"] = with_ex_local_param(facet_ex, facet_config.field)
 
-      limit = if scope.respond_to?(:facet_list_limit)
-                Deprecation.warn(self, "The use of facet_list_limit is deprecated and will be removed in 7.0. " \
-                  "Consider using the 'more_limit' option in the field configuration or 'default_more_limit' instead.")
-                scope.facet_list_limit.to_s.to_i
-              elsif solr_params["facet.limit"]
+      limit = if solr_params["facet.limit"]
                 solr_params["facet.limit"].to_i
               else
                 facet_config.fetch(:more_limit, blacklight_config.default_more_limit)
@@ -274,15 +270,15 @@ module Blacklight::Solr
     def facet_value_to_fq_string(facet_field, value)
       facet_config = blacklight_config.facet_fields[facet_field]
 
-      solr_field = facet_config.field if facet_config and !facet_config.query
+      solr_field = facet_config.field if facet_config && !facet_config.query
       solr_field ||= facet_field
 
       local_params = []
-      local_params << "tag=#{facet_config.tag}" if facet_config and facet_config.tag
+      local_params << "tag=#{facet_config.tag}" if facet_config && facet_config.tag
 
       prefix = "{!#{local_params.join(' ')}}" unless local_params.empty?
 
-      if facet_config and facet_config.query
+      if facet_config && facet_config.query
         if facet_config.query[value]
           facet_config.query[value][:fq]
         else
@@ -297,7 +293,7 @@ module Blacklight::Solr
     end
 
     def convert_to_term_value(value)
-      if value.is_a?(DateTime) or value.is_a?(Time)
+      if value.is_a?(DateTime) || value.is_a?(Time)
         value.utc.strftime("%Y-%m-%dT%H:%M:%SZ")
       elsif value.is_a?(Date)
         value.to_time(:local).strftime("%Y-%m-%dT%H:%M:%SZ")
@@ -313,7 +309,7 @@ module Blacklight::Solr
     end
 
     def facet_fields_to_include_in_request
-      blacklight_config.facet_fields.select do |field_name,facet|
+      blacklight_config.facet_fields.select do |_field_name, facet|
         facet.include_in_request || (facet.include_in_request.nil? && blacklight_config.add_facet_fields_to_solr_request)
       end
     end

data/lib/blacklight/version.rb

@@ -5,6 +5,6 @@ module Blacklight
       @version ||= File.read(File.join(File.dirname(__FILE__), '..', '..', 'VERSION')).chomp
     end
 
-    VERSION = self.version
+    VERSION = version
   end
 end

data/lib/blacklight.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 require 'kaminari'
 require 'deprecation'
-require 'blacklight/utils'
-require 'active_support/hash_with_indifferent_access'
+require 'blacklight/open_struct_with_hash_access'
+require 'blacklight/nested_open_struct_with_hash_access'
+require 'jbuilder'
 
 module Blacklight
   autoload :AbstractRepository, 'blacklight/abstract_repository'
@@ -46,6 +47,7 @@ module Blacklight
       connection_config[:adapter].constantize
     else
       raise "The value for :adapter was not found in the blacklight.yml config" unless connection_config.key? :adapter
+
       Blacklight.const_get("#{connection_config.fetch(:adapter)}/Repository".classify)
     end
   end
@@ -59,6 +61,7 @@ module Blacklight
   def self.connection_config
     Blacklight::RuntimeRegistry.connection_config ||= begin
       raise "The #{::Rails.env} environment settings were not found in the blacklight.yml config" unless blacklight_yml[::Rails.env]
+
       blacklight_yml[::Rails.env].symbolize_keys
     end
   end
@@ -83,7 +86,7 @@ module Blacklight
     end
 
     begin
-      @blacklight_yml = YAML.load(blacklight_erb)
+      @blacklight_yml = YAML.safe_load(blacklight_erb)
     rescue => e
       raise("#{blacklight_config_file} was found, but could not be parsed.\n#{e.inspect}")
     end
@@ -97,7 +100,7 @@ module Blacklight
 
   def self.logger
     @logger ||= begin
-      ::Rails.logger if defined? Rails and Rails.respond_to? :logger
+      ::Rails.logger if defined? Rails && Rails.respond_to?(:logger)
     end
   end
 
@@ -105,17 +108,16 @@ module Blacklight
     @logger = logger
   end
 
-  #############  
+  #############
   # Methods for figuring out path to BL plugin, and then locate various files
   # either in the app itself or defaults in the plugin -- whether you are running
   # from the plugin itself or from an actual app using te plugin.
   # In a seperate module so it can be used by both Blacklight class, and
-  # by rake tasks without loading the whole Rails environment. 
+  # by rake tasks without loading the whole Rails environment.
   #############
-  
+
   # returns the full path the the blacklight plugin installation
   def self.root
     @root ||= File.expand_path(File.dirname(File.dirname(__FILE__)))
   end
-  
 end

data/lib/generators/blacklight/assets_generator.rb

@@ -2,40 +2,46 @@
 module Blacklight
   class Assets < Rails::Generators::Base
     source_root File.expand_path('../templates', __FILE__)
-  
+
+    # This could be skipped if you want to use webpacker
+    def add_javascript_dependencies
+      gem 'bootstrap', '~> 4.0'
+      gem 'popper_js'
+      gem 'twitter-typeahead-rails', '0.11.1.pre.corejavascript'
+    end
+
     def assets
       copy_file "blacklight.scss", "app/assets/stylesheets/blacklight.scss"
 
+      # Ensure this method is idempotent
       return if has_blacklight_assets?
 
       contents = "\n//\n// Required by Blacklight\n"
-      contents += "//= require jquery\n" if rails_5_1?
+      contents += "//= require jquery\n"
+      contents += "//= require popper\n"
+      contents += "// Twitter Typeahead for autocomplete\n"
+      contents += "//= require twitter/typeahead\n"
+      contents += "//= require bootstrap\n"
       contents += "//= require blacklight/blacklight\n"
 
       marker = if turbolinks?
                  '//= require turbolinks'
-               elsif rails_5_1?
-                 '//= require rails-ujs'
                else
-                 '//= require jquery_ujs'
+                 '//= require rails-ujs'
                end
 
-      insert_into_file "app/assets/javascripts/application.js", :after => marker do
+      insert_into_file "app/assets/javascripts/application.js", after: marker do
         contents
       end
     end
 
-    # This is not a default in Rails 5.1
+    # This is not a default in Rails 5.1+
     def add_jquery
-      gem 'jquery-rails' if rails_5_1?
+      gem 'jquery-rails'
     end
 
     private
 
-    def rails_5_1?
-      Rails.version =~ /5\.1/
-    end
-
     def turbolinks?
       @turbolinks ||= IO.read("app/assets/javascripts/application.js").include?('turbolinks')
     end

data/lib/generators/blacklight/controller_generator.rb

@@ -1,10 +1,9 @@
 # frozen_string_literal: true
 module Blacklight
   class ControllerGenerator < Rails::Generators::Base
-    
     source_root File.expand_path('../templates', __FILE__)
-    
-    argument     :controller_name  , type: :string , default: "catalog"
+
+    argument :controller_name, type: :string, default: "catalog"
 
     desc <<-EOS
       This generator makes the following changes to your application:
@@ -18,10 +17,10 @@ module Blacklight
       inject_into_class "app/controllers/application_controller.rb", "ApplicationController" do
         "  # Adds a few additional behaviors into the application controller\n" \
         "  include Blacklight::Controller\n" \
-        "  layout 'blacklight'\n\n"
+        "  layout :determine_layout if respond_to? :layout\n\n"
       end
     end
-    
+
     # Generate blacklight catalog controller
     def create_blacklight_catalog
       template "catalog_controller.rb", "app/controllers/#{controller_name}_controller.rb"

data/lib/generators/blacklight/document_generator.rb

@@ -7,7 +7,7 @@ module Blacklight
 
     source_root File.expand_path('../templates', __FILE__)
 
-    argument     :model_name, :type => :string , :default => "solr_document"
+    argument :model_name, type: :string, default: "solr_document"
 
     desc <<-EOS
       This generator makes the following changes to your application:

data/lib/generators/blacklight/install_generator.rb

@@ -3,16 +3,15 @@ module Blacklight
   class Install < Rails::Generators::Base
     source_root File.expand_path('../templates', __FILE__)
 
-    argument     :model_name  , type: :string , default: "user"
-    argument     :controller_name, type: :string , default: "catalog"
-    argument     :document_name, type: :string , default: "solr_document"
-    argument     :search_builder_name, type: :string , default: "search_builder"
-    argument     :solr_version, type: :string , default: "latest"
-
-    class_option :devise      , type: :boolean, default: false, aliases: "-d", desc: "Use Devise as authentication logic."
-    class_option :jettywrapper, type: :boolean, default: false, desc: "Use jettywrapper to download and control Jetty"
-    class_option :marc        , type: :boolean, default: false, aliases: "-m", desc: "Generate MARC-based demo ."
-    class_option :'skip-assets', type: :boolean, default: false, desc: "Skip generating javascript and css assets into the application"
+    argument     :model_name, type: :string, default: "user"
+    argument     :controller_name, type: :string, default: "catalog"
+    argument     :document_name, type: :string, default: "solr_document"
+    argument     :search_builder_name, type: :string, default: "search_builder"
+    argument     :solr_version, type: :string, default: "latest"
+
+    class_option :devise, type: :boolean, default: false, aliases: "-d", desc: "Use Devise as authentication logic."
+    class_option :marc, type: :boolean, default: false, aliases: "-m", desc: "Generate MARC-based demo."
+    class_option :'skip-assets', type: :boolean, default: !defined?(Sprockets), desc: "Skip generating javascript and css assets into the application"
     class_option :'skip-solr', type: :boolean, default: false, desc: "Skip generating solr configurations."
 
     desc <<-EOS
@@ -28,22 +27,7 @@ module Blacklight
     EOS
 
     def add_solr_wrapper
-      return if options[:'skip-solr']
-      generator_options = '--jettywrapper' if options[:jettywrapper]
-      solr_generator = if options[:jettywrapper]
-                         'blacklight:solr4'
-                       elsif solr_version == 'latest'
-                         'blacklight:solr5'
-                       else
-                         "blacklight:solr#{solr_version}"
-                       end
-      generate solr_generator, generator_options
-    end
-
-    def bundle_install
-      Bundler.with_clean_env do
-        run "bundle install"
-      end
+      generate 'blacklight:solr' unless options[:'skip-solr']
     end
 
     # Copy all files in templates/public/ directory to public/
@@ -53,6 +37,12 @@ module Blacklight
       generate "blacklight:assets" unless options[:'skip-assets']
     end
 
+    def bundle_install
+      Bundler.with_clean_env do
+        run "bundle install"
+      end
+    end
+
     def generate_blacklight_document
       generate 'blacklight:document', document_name
     end
@@ -83,7 +73,7 @@ module Blacklight
     end
 
     def add_sass_configuration
-      insert_into_file "config/application.rb", :after => "config.assets.enabled = true" do <<EOF
+      insert_into_file "config/application.rb", after: "config.assets.enabled = true" do <<EOF
       # Default SASS Configuration, check out https://github.com/rails/sass-rails for details
       config.assets.compress = !Rails.env.development?
 EOF
@@ -98,7 +88,7 @@ EOF
       return unless options[:marc]
 
       blacklight_marc = String.new('blacklight-marc')
-      gem blacklight_marc, '~> 6.1'
+      gem blacklight_marc, '< 8'
 
       Bundler.with_clean_env do
         run "bundle install"

data/lib/generators/blacklight/search_builder_generator.rb

@@ -7,7 +7,7 @@ module Blacklight
 
     source_root File.expand_path('../templates', __FILE__)
 
-    argument     :model_name, :type => :string , :default => "search_builder"
+    argument :model_name, type: :string, default: "search_builder"
 
     desc <<-EOS
     This generator makes the following changes to your application:

data/lib/generators/blacklight/{solr5_generator.rb → solr_generator.rb}

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
+
 require 'rails/generators'
 
 module Blacklight
-  class Solr5Generator < Rails::Generators::Base
-    # Set source_root to grab .solr_wrapper and solr config dir
-    # from the root of the blacklight gem
-    source_root Blacklight.root
+  class SolrGenerator < Rails::Generators::Base
+    source_root ::File.expand_path('../templates', __FILE__)
 
     desc <<-EOF
       This generator makes the following changes to your application:
@@ -23,15 +23,21 @@ module Blacklight
     end
 
     def copy_solr_conf
-      directory 'solr', 'solr'
+      directory 'solr'
     end
 
     def solr_wrapper_config
-      copy_file '.solr_wrapper.yml', '.solr_wrapper.yml'
+      copy_file '.solr_wrapper.yml'
     end
 
     def add_rsolr_gem
       gem 'rsolr', '>= 1.0', '< 3'
     end
+
+    def bundle_install
+      Bundler.with_clean_env do
+        run "bundle install"
+      end
+    end
   end
 end

data/lib/generators/blacklight/templates/.solr_wrapper.yml

@@ -0,0 +1,5 @@
+# Place any default configuration for solr_wrapper here
+# port: 8983
+collection:
+  dir: solr/conf/
+  name: blacklight-core

data/lib/generators/blacklight/templates/alternate_controller.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-class AlternateController < CatalogController  
+class AlternateController < CatalogController
   configure_blacklight do |config|
     config.index.thumbnail_method = :xyz
   end
@@ -7,7 +7,7 @@ class AlternateController < CatalogController
   def xyz *args
     view_context.tag "img"
   end
-  
-  helper_method :xyz
 
-end 
+  helper_method :xyz if respond_to? :helper_method
+
+end

data/lib/generators/blacklight/templates/blacklight.scss

@@ -1,5 +1,3 @@
-@import 'bootstrap-sprockets';
-
 @import 'bootstrap';
 
 @import 'blacklight/blacklight';

data/lib/generators/blacklight/templates/catalog_controller.rb

@@ -12,6 +12,9 @@ class <%= controller_name.classify %>Controller < ApplicationController
     #
     ## Model that maps search index responses to the blacklight response model
     # config.response_model = Blacklight::Solr::Response
+    #
+    ## Should the raw solr document endpoint (e.g. /catalog/:id/raw) be enabled
+    # config.raw_endpoint.enabled = false
 
     ## Default parameters to send to solr for all search-like requests. See also SearchBuilder#processed_parameters
     config.default_solr_params = {
@@ -20,28 +23,32 @@ class <%= controller_name.classify %>Controller < ApplicationController
 
     # solr path which will be added to solr base url before the other solr params.
     #config.solr_path = 'select'
+    #config.document_solr_path = 'get'
 
     # items to show per page, each number in the array represent another option to choose from.
     #config.per_page = [10,20,50,100]
 
-    ## Default parameters to send on single-document requests to Solr. These settings are the Blackligt defaults (see SearchHelper#solr_doc_params) or
-    ## parameters included in the Blacklight-jetty document requestHandler.
-    #
-    #config.default_document_solr_params = {
-    #  qt: 'document',
-    #  ## These are hard-coded in the blacklight 'document' requestHandler
-    #  # fl: '*',
-    #  # rows: 1,
-    #  # q: '{!term f=id v=$id}'
-    #}
-
     # solr field configuration for search results/index views
-    config.index.title_field = 'title_display'
-    config.index.display_type_field = 'format'
+    config.index.title_field = 'title_tsim'
+    #config.index.display_type_field = 'format'
     #config.index.thumbnail_field = 'thumbnail_path_ss'
 
+    config.add_results_document_tool(:bookmark, partial: 'bookmark_control', if: :render_bookmarks_control?)
+
+    config.add_results_collection_tool(:sort_widget)
+    config.add_results_collection_tool(:per_page_widget)
+    config.add_results_collection_tool(:view_type_group)
+
+    config.add_show_tools_partial(:bookmark, partial: 'bookmark_control', if: :render_bookmarks_control?)
+    config.add_show_tools_partial(:email, callback: :email_action, validator: :validate_email_params)
+    config.add_show_tools_partial(:sms, if: :render_sms_action?, callback: :sms_action, validator: :validate_sms_params)
+    config.add_show_tools_partial(:citation)
+
+    config.add_nav_action(:bookmark, partial: 'blacklight/nav/bookmark', if: :render_bookmarks_control?)
+    config.add_nav_action(:search_history, partial: 'blacklight/nav/search_history')
+
     # solr field configuration for document/show views
-    #config.show.title_field = 'title_display'
+    #config.show.title_field = 'title_tsim'
     #config.show.display_type_field = 'format'
     #config.show.thumbnail_field = 'thumbnail_path_ss'
 
@@ -70,19 +77,19 @@ class <%= controller_name.classify %>Controller < ApplicationController
     # :index_range can be an array or range of prefixes that will be used to create the navigation (note: It is case sensitive when searching values)
 
     config.add_facet_field 'format', label: 'Format'
-    config.add_facet_field 'pub_date', label: 'Publication Year', single: true
-    config.add_facet_field 'subject_topic_facet', label: 'Topic', limit: 20, index_range: 'A'..'Z'
-    config.add_facet_field 'language_facet', label: 'Language', limit: true
-    config.add_facet_field 'lc_1letter_facet', label: 'Call Number'
-    config.add_facet_field 'subject_geo_facet', label: 'Region'
-    config.add_facet_field 'subject_era_facet', label: 'Era'
+    config.add_facet_field 'pub_date_ssim', label: 'Publication Year', single: true
+    config.add_facet_field 'subject_ssim', label: 'Topic', limit: 20, index_range: 'A'..'Z'
+    config.add_facet_field 'language_ssim', label: 'Language', limit: true
+    config.add_facet_field 'lc_1letter_ssim', label: 'Call Number'
+    config.add_facet_field 'subject_geo_ssim', label: 'Region'
+    config.add_facet_field 'subject_era_ssim', label: 'Era'
 
-    config.add_facet_field 'example_pivot_field', label: 'Pivot Field', :pivot => ['format', 'language_facet']
+    config.add_facet_field 'example_pivot_field', label: 'Pivot Field', :pivot => ['format', 'language_ssim']
 
     config.add_facet_field 'example_query_facet_field', label: 'Publish Date', :query => {
-       :years_5 => { label: 'within 5 Years', fq: "pub_date:[#{Time.zone.now.year - 5 } TO *]" },
-       :years_10 => { label: 'within 10 Years', fq: "pub_date:[#{Time.zone.now.year - 10 } TO *]" },
-       :years_25 => { label: 'within 25 Years', fq: "pub_date:[#{Time.zone.now.year - 25 } TO *]" }
+       :years_5 => { label: 'within 5 Years', fq: "pub_date_ssim:[#{Time.zone.now.year - 5 } TO *]" },
+       :years_10 => { label: 'within 10 Years', fq: "pub_date_ssim:[#{Time.zone.now.year - 10 } TO *]" },
+       :years_25 => { label: 'within 25 Years', fq: "pub_date_ssim:[#{Time.zone.now.year - 25 } TO *]" }
     }
 
 
@@ -93,32 +100,32 @@ class <%= controller_name.classify %>Controller < ApplicationController
 
     # solr fields to be displayed in the index (search results) view
     #   The ordering of the field names is the order of the display
-    config.add_index_field 'title_display', label: 'Title'
-    config.add_index_field 'title_vern_display', label: 'Title'
-    config.add_index_field 'author_display', label: 'Author'
-    config.add_index_field 'author_vern_display', label: 'Author'
+    config.add_index_field 'title_tsim', label: 'Title'
+    config.add_index_field 'title_vern_ssim', label: 'Title'
+    config.add_index_field 'author_tsim', label: 'Author'
+    config.add_index_field 'author_vern_ssim', label: 'Author'
     config.add_index_field 'format', label: 'Format'
-    config.add_index_field 'language_facet', label: 'Language'
-    config.add_index_field 'published_display', label: 'Published'
-    config.add_index_field 'published_vern_display', label: 'Published'
-    config.add_index_field 'lc_callnum_display', label: 'Call number'
+    config.add_index_field 'language_ssim', label: 'Language'
+    config.add_index_field 'published_ssim', label: 'Published'
+    config.add_index_field 'published_vern_ssim', label: 'Published'
+    config.add_index_field 'lc_callnum_ssim', label: 'Call number'
 
     # solr fields to be displayed in the show (single result) view
     #   The ordering of the field names is the order of the display
-    config.add_show_field 'title_display', label: 'Title'
-    config.add_show_field 'title_vern_display', label: 'Title'
-    config.add_show_field 'subtitle_display', label: 'Subtitle'
-    config.add_show_field 'subtitle_vern_display', label: 'Subtitle'
-    config.add_show_field 'author_display', label: 'Author'
-    config.add_show_field 'author_vern_display', label: 'Author'
+    config.add_show_field 'title_tsim', label: 'Title'
+    config.add_show_field 'title_vern_ssim', label: 'Title'
+    config.add_show_field 'subtitle_tsim', label: 'Subtitle'
+    config.add_show_field 'subtitle_vern_ssim', label: 'Subtitle'
+    config.add_show_field 'author_tsim', label: 'Author'
+    config.add_show_field 'author_vern_ssim', label: 'Author'
     config.add_show_field 'format', label: 'Format'
-    config.add_show_field 'url_fulltext_display', label: 'URL'
-    config.add_show_field 'url_suppl_display', label: 'More Information'
-    config.add_show_field 'language_facet', label: 'Language'
-    config.add_show_field 'published_display', label: 'Published'
-    config.add_show_field 'published_vern_display', label: 'Published'
-    config.add_show_field 'lc_callnum_display', label: 'Call number'
-    config.add_show_field 'isbn_t', label: 'ISBN'
+    config.add_show_field 'url_fulltext_ssim', label: 'URL'
+    config.add_show_field 'url_suppl_ssim', label: 'More Information'
+    config.add_show_field 'language_ssim', label: 'Language'
+    config.add_show_field 'published_ssim', label: 'Published'
+    config.add_show_field 'published_vern_ssim', label: 'Published'
+    config.add_show_field 'lc_callnum_ssim', label: 'Call number'
+    config.add_show_field 'isbn_ssim', label: 'ISBN'
 
     # "fielded" search configuration. Used by pulldown among other places.
     # For supported keys in hash, see rdoc for Blacklight::SearchFields
@@ -178,10 +185,10 @@ class <%= controller_name.classify %>Controller < ApplicationController
     # label in pulldown is followed by the name of the SOLR field to sort by and
     # whether the sort is ascending or descending (it must be asc or desc
     # except in the relevancy case).
-    config.add_sort_field 'score desc, pub_date_sort desc, title_sort asc', label: 'relevance'
-    config.add_sort_field 'pub_date_sort desc, title_sort asc', label: 'year'
-    config.add_sort_field 'author_sort asc, title_sort asc', label: 'author'
-    config.add_sort_field 'title_sort asc, pub_date_sort desc', label: 'title'
+    config.add_sort_field 'score desc, pub_date_si desc, title_si asc', label: 'relevance'
+    config.add_sort_field 'pub_date_si desc, title_si asc', label: 'year'
+    config.add_sort_field 'author_si asc, title_si asc', label: 'author'
+    config.add_sort_field 'title_si asc, pub_date_si desc', label: 'title'
 
     # If there are more than this many search results, no spelling ("did you
     # mean") suggestion is offered.
@@ -190,5 +197,8 @@ class <%= controller_name.classify %>Controller < ApplicationController
     # Configuration for autocomplete suggestor
     config.autocomplete_enabled = true
     config.autocomplete_path = 'suggest'
+    # if the name of the solr.SuggestComponent provided in your solrcongig.xml is not the
+    # default 'mySuggester', uncomment and provide it below
+    # config.autocomplete_suggester = 'mySuggester'
   end
 end