blacklight 9.0.0.beta7 → 9.0.0

data/lib/blacklight/configuration.rb

@@ -47,7 +47,6 @@ module Blacklight
       property :header_component, default: Blacklight::HeaderComponent
       property :full_width_layout, default: false
 
-      # bootstrap_version may be set to 4 or 5
       bootstrap_version = ENV['BOOTSTRAP_VERSION'].presence || "5"
       property :bootstrap_version, default: /(\d)(?:\.\d){0,2}/.match(bootstrap_version)[1].to_i
 
@@ -73,7 +72,8 @@ module Blacklight
       # @!attribute json_solr_path
       # @since v7.34.0
       # @return [String] The url path (relative to the solr base url) to use when using Solr's JSON Query DSL (as with the advanced search)
-      property :json_solr_path, default: 'advanced'
+      # @note You can configure a separate custom 'advanced' requestHandler in solrconfig.xml if desired, but it isn't necessary; the default 'select' handler will work.
+      property :json_solr_path, default: 'select'
       # @!attribute document_unique_id_param
       # @since v5.2.0
       # @return [Symbol] The solr query parameter used for sending the unique identifiers for one or more documents
@@ -103,9 +103,6 @@ module Blacklight
       # @!attribute search_builder_class
       # @return [Class] class for converting Blacklight parameters to request parameters for the repository_class
       property :search_builder_class, default: ::SearchBuilder
-      # @!attribute search_builder_class
-      # @return [Class] class for converting Blacklight parameters to request parameters for the repository_class
-      property :facet_search_builder_class, default: ::FacetSearchBuilder
       # @!attribute response_model
       # model that maps index responses to the blacklight response model
       # @return [Class]
@@ -147,11 +144,15 @@ module Blacklight
       # @return [Blacklight::Configuration::ViewConfig::Index]
       property :index, default: ViewConfig::Index.new(
         # document presenter class used by helpers and views
-        document_presenter_class: nil,
+        document_presenter_class: Blacklight::IndexPresenter,
         # document presenter used for json responses
         json_presenter_class: Blacklight::JsonPresenter,
         # component class used to render a document
         document_component: Blacklight::DocumentComponent,
+        document_embed_component: nil,
+        document_metadata_component: Blacklight::DocumentMetadataComponent,
+        document_thumbnail_component: Blacklight::Document::ThumbnailComponent,
+        document_title_component: Blacklight::DocumentTitleComponent,
         sidebar_component: Blacklight::Search::SidebarComponent,
         dropdown_component: Blacklight::System::DropdownComponent,
         # solr field to use to render a document title
@@ -187,8 +188,9 @@ module Blacklight
       # @return [Blacklight::Configuration::ViewConfig::Show]
       property :show, default: ViewConfig::Show.new(
         # document presenter class used by helpers and views
-        document_presenter_class: nil,
+        document_presenter_class: Blacklight::ShowPresenter,
         document_component: Blacklight::DocumentComponent,
+        document_thumbnail_component: nil,
         show_tools_component: Blacklight::Document::ShowToolsComponent,
         show_header_tools_component: nil,
         document_header_component: Blacklight::Document::PageHeaderComponent,
@@ -269,6 +271,10 @@ module Blacklight
       # @since v5.10.0
       # @return [Integer]
       property :default_facet_limit, default: 10
+      # @!attribute default_facet_suggest
+      # @since v9.0.0
+      # @return [Boolean]
+      property :default_facet_suggest, default: true
       # @!attribute default_more_limit
       # @since v7.0.0
       # @return [Integer]
@@ -299,8 +305,13 @@ module Blacklight
 
       # @!attribute advanced_search
       # @since v7.15.0
-      # @return [#enabled]
-      property :advanced_search, default: OpenStruct.new(enabled: false)
+      # @return [OpenStructWithHashAccess] Configuration for advanced search, including:
+      #   enabled: (Boolean) whether advanced search is enabled
+      #   form_solr_parameters: (Hash) optional parameters to send to Solr for the advanced search
+      #                                form; can override values that are set automatically via the
+      #                                #copy_facet_field_config_to_advanced! method
+      property :advanced_search, default: OpenStructWithHashAccess.new(enabled: true,
+                                                                       form_solr_parameters: {})
 
       # @!attribute enable_search_bar_autofocus
       # @since v7.2.0
@@ -457,6 +468,42 @@ module Blacklight
       facet_fields.map { |_facet, opts| opts[:group] }.uniq
     end
 
+    # Use existing search field configs to automatically prepare fields for use
+    # by the advanced search form.
+    def copy_search_field_config_to_advanced!
+      search_fields.each_value do |field|
+        next if field.include_in_advanced_search == false
+        next if field.clause_params
+
+        field.clause_params = {}
+        field.clause_params[:edismax] = field.solr_parameters.dup || {}
+      end
+    end
+
+    # Use existing facet field configs to automatically prepare fields for use
+    # by the advanced search form. If more specific config is needed, e.g., to
+    # set the facet limit for one field to a value other than -1, it can be
+    # expressed in the configuration in advanced_search.form_solr_parameters
+    def copy_facet_field_config_to_advanced!
+      advanced_search.form_solr_parameters ||= {}
+      advanced_search.form_solr_parameters['facet.sort'] ||= 'count'
+      advanced_search.form_solr_parameters['facet.field'] ||= []
+
+      facet_fields.each_value do |field|
+        next if field.include_in_advanced_search == false
+        # Skip query-type and pivot facets that can't be requested via facet.field
+        next if field.query || field.pivot || field.range
+
+        # Add the facet field to the advanced search configuration
+        advanced_search.form_solr_parameters['facet.field'] << field.field unless
+          advanced_search.form_solr_parameters['facet.field'].include?(field.field)
+
+        # Set the facet field's limit to -1 to show ALL values in advanced search
+        advanced_search.form_solr_parameters["f.#{field.field}.facet.limit"] = -1 unless
+          advanced_search.form_solr_parameters["f.#{field.field}.facet.limit"]
+      end
+    end
+
     # Add any configured facet fields to the default solr parameters hash
     # @overload add_facet_fields_to_solr_request!
     #    add all facet fields to the solr request

data/lib/blacklight/routes/searchable.rb

@@ -18,7 +18,7 @@ module Blacklight
         mapper.get "opensearch"
         mapper.get 'suggest', as: 'suggest_index'
         mapper.get "facet/:id", action: 'facet', as: 'facet'
-        mapper.get "facet_suggest/:id/(:query_fragment)", action: 'facet', as: 'facet_suggest', defaults: { only_values: true }
+        mapper.get "facet_suggest/:id", action: 'facet', as: 'facet_suggest', defaults: { only_values: true }
       end
     end
   end

data/lib/blacklight/search_builder.rb

@@ -5,7 +5,45 @@ module Blacklight
   # Blacklight's SearchBuilder converts blacklight request parameters into
   # query parameters appropriate for search index. It does so by evaluating a
   # chain of processing methods to populate a result hash (see {#to_hash}).
-  class SearchBuilder < AbstractSearchBuilder
+  class SearchBuilder
+    class_attribute :default_processor_chain
+    self.default_processor_chain = []
+
+    attr_reader :processor_chain, :search_state, :blacklight_params
+
+    # @overload initialize(scope)
+    #   @param [Object] scope the scope where the filter methods reside in.
+    # @overload initialize(processor_chain, scope)
+    #   @param [List<Symbol>,TrueClass] processor_chain options a list of filter methods to run or true, to use the default methods
+    #   @param [Object] scope the scope where the filter methods reside in.
+    def initialize(*options)
+      case options.size
+      when 1
+        @processor_chain = default_processor_chain.dup
+        @scope = options.first
+      when 2
+        @processor_chain, @scope = options
+      else
+        raise ArgumentError, "wrong number of arguments. (#{options.size} for 1..2)"
+      end
+
+      @blacklight_params = {}
+      search_state_class = @scope.try(:search_state_class) || Blacklight::SearchState
+      @search_state = search_state_class.new(@blacklight_params, @scope&.blacklight_config, @scope)
+      @additional_filters = {}
+      @merged_params = {}
+      @reverse_merged_params = {}
+    end
+
+    ##
+    # Set the parameters to pass through the processor chain
+    def with(blacklight_params_or_search_state = {})
+      params_will_change!
+      @search_state = blacklight_params_or_search_state.is_a?(Blacklight::SearchState) ? blacklight_params_or_search_state : @search_state.reset(blacklight_params_or_search_state)
+      @blacklight_params = @search_state.params.dup
+      self
+    end
+
     ##
     # Update the :q (query) parameter
     # @param [Hash<Symbol,Object>] conditions the field and values to query on
@@ -21,6 +59,7 @@ module Blacklight
 
     ##
     # Append additional processor chain directives
+    # This is used in blacklight_range_limit
     def append(*addl_processor_chain)
       params_will_change!
       builder = self.class.new(processor_chain + addl_processor_chain, scope)
@@ -55,6 +94,68 @@ module Blacklight
       builder
     end
 
+    ##
+    # Merge additional, repository-specific parameters
+    def merge(extra_params, &)
+      if extra_params
+        params_will_change!
+        @merged_params.merge!(extra_params.to_hash, &)
+      end
+      self
+    end
+
+    ##
+    # "Reverse merge" additional, repository-specific parameters
+    def reverse_merge(extra_params, &)
+      if extra_params
+        params_will_change!
+        @reverse_merged_params.reverse_merge!(extra_params.to_hash, &)
+      end
+      self
+    end
+
+    delegate :[], :key?, to: :to_hash
+
+    # a solr query method
+    # @return [Blacklight::Solr::Response] the solr response object
+    def to_hash
+      return @params unless params_need_update?
+
+      @params = processed_parameters
+                .reverse_merge(@reverse_merged_params)
+                .merge(@merged_params)
+                .tap { clear_changes }
+    end
+
+    alias_method :query, :to_hash
+    alias_method :to_h, :to_hash
+
+    # The CatalogController #index action uses this.
+    # Solr parameters can come from a number of places. From lowest
+    # precedence to highest:
+    #  1. General defaults in blacklight config (are trumped by)
+    #  2. defaults for the particular search field identified by  params[:search_field] (are trumped by)
+    #  3. certain parameters directly on input HTTP query params
+    #     * not just any parameter is grabbed willy nilly, only certain ones are allowed by HTTP input)
+    #     * for legacy reasons, qt in http query does not over-ride qt in search field definition default.
+    #  4.  extra parameters passed in as argument.
+    #
+    # spellcheck.q will be supplied with the [:q] value unless specifically
+    # specified otherwise.
+    #
+    # Incoming parameter :f is mapped to :fq solr parameter.
+    #
+    # @return a params hash for searching solr.
+    def processed_parameters
+      request.tap do |request_parameters|
+        processor_chain.each do |method_name|
+          send(method_name, request_parameters)
+        end
+      end
+    end
+
+    delegate :blacklight_config, to: :scope
+
     def start=(value)
       params_will_change!
       @start = value.to_i
@@ -109,6 +210,34 @@ module Blacklight
 
     alias per rows
 
+    # sets the facet that this query pertains to, for the purpose of facet pagination
+    def facet=(value)
+      params_will_change!
+      @facet = value
+    end
+
+    # @param [Object] value
+    def facet(value = nil)
+      if value
+        self.facet = value
+        return self
+      end
+      @facet
+    end
+
+    def facet_suggestion_query=(value)
+      params_will_change!
+      @facet_suggestion_query = value
+    end
+
+    def facet_suggestion_query(value = nil)
+      if value
+        self.facet_suggestion_query = value
+        return self
+      end
+      @facet_suggestion_query
+    end
+
     # Decode the user provided 'sort' parameter into a sort string that can be
     # passed to the search.  This sanitizes the input by ensuring only
     # configured search values are passed through to the search.
@@ -116,5 +245,35 @@ module Blacklight
     def sort
       search_state.sort_field&.sort
     end
+
+    delegate :search_field, to: :search_state
+
+    private
+
+    def request
+      Blacklight::Solr::Request.new
+    end
+
+    def should_add_field_to_request? _field_name, field
+      field.include_in_request || (field.include_in_request.nil? && blacklight_config.add_field_configuration_to_solr_request)
+    end
+
+    attr_reader :scope
+
+    def params_will_change!
+      @dirty = true
+    end
+
+    def params_changed?
+      !!@dirty
+    end
+
+    def params_need_update?
+      params_changed? || @params.nil?
+    end
+
+    def clear_changes
+      @dirty = false
+    end
   end
 end

data/lib/blacklight/search_state/pivot_filter_field.rb

@@ -102,7 +102,7 @@ module Blacklight
             end
             queries.uniq!
           end
-          [(queries - existing)]
+          [queries - existing]
         end
       end
 

data/lib/blacklight/solr/field_reflection_search_builder.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Blacklight::Solr
+  class FieldReflectionSearchBuilder < SearchBuilder
+    self.default_processor_chain = [:add_params]
+
+    def add_params(request)
+      request.reverse_merge!({ fl: '*', 'json.nl' => 'map' })
+    end
+  end
+end

data/lib/blacklight/solr/repository.rb

@@ -7,8 +7,7 @@ module Blacklight::Solr
     # @param [String] id document's unique key value
     # @param [Hash] params additional solr query parameters
     def find id, params = {}
-      doc_params = params.reverse_merge(blacklight_config.default_document_solr_params)
-                         .merge(blacklight_config.document_unique_id_param => id)
+      doc_params = SingleDocSearchBuilder.new(self, id, params)
 
       solr_response = send_and_receive blacklight_config.document_solr_path || blacklight_config.solr_path, doc_params
       raise Blacklight::Exceptions::RecordNotFound if solr_response.documents.empty?
@@ -24,14 +23,14 @@ module Blacklight::Solr
 
     ##
     # Execute a search query against solr
-    # @param [Hash] params solr query parameters
+    # @param [Hash,Blacklight::SearchBuilder] params solr query parameters
     # @param [String] path solr request handler path
     def search pos_params = nil, path: nil, params: nil, **kwargs
       if pos_params
         Blacklight.deprecation.warn("Passing positional arguments to search() is deprecated. Use the params kwarg instead.")
       end
 
-      request_params = (params || pos_params).reverse_merge(kwargs).reverse_merge({ qt: blacklight_config.qt })
+      request_params = (params || pos_params || {}).reverse_merge(kwargs).reverse_merge({ qt: blacklight_config.qt })
 
       send_and_receive(path || default_search_path(request_params), request_params)
     end
@@ -47,7 +46,8 @@ module Blacklight::Solr
     # Gets a list of available fields
     # @return [Hash]
     def reflect_fields
-      send_and_receive('admin/luke', params: { fl: '*', 'json.nl' => 'map' })['fields']
+      doc_params = FieldReflectionSearchBuilder.new(self)
+      send_and_receive('admin/luke', doc_params)['fields']
     end
 
     ##

data/lib/blacklight/solr/search_builder_behavior.rb

@@ -1,16 +1,25 @@
 # frozen_string_literal: true
 
 module Blacklight::Solr
+  # This depends on being imported into a class that extends AbstractSearchBuilder
   module SearchBuilderBehavior
     extend ActiveSupport::Concern
 
     included do
       self.default_processor_chain = [
-        :default_solr_parameters, :add_search_field_default_parameters,
-        :add_query_to_solr, :add_facet_fq_to_solr,
-        :add_facetting_to_solr, :add_solr_fields_to_query, :add_paging_to_solr,
-        :add_sorting_to_solr, :add_group_config_to_solr,
+        :default_solr_parameters,
+        :add_search_field_default_parameters,
+        :add_query_to_solr,
+        :add_facet_fq_to_solr,
+        :add_facetting_to_solr,
+        :add_solr_fields_to_query,
+        :add_paging_to_solr,
+        :add_sorting_to_solr,
+        :add_group_config_to_solr,
         :add_adv_search_clauses,
+        :add_facets_for_advanced_search_form,
+        :add_facet_paging_to_solr,
+        :add_facet_suggestion_parameters,
         :add_additional_filters
       ]
     end
@@ -95,6 +104,13 @@ module Blacklight::Solr
     def add_adv_search_clauses(solr_parameters)
       return if search_state.clause_params.blank?
 
+      # We need to specify lucene as the top-level defType when using JSON Query DSL in Solr versions
+      # between 7.2.0 & 9.4.0. After 9.4.0 this is no longer necessary, but also not harmful to include.
+      solr_parameters[:defType] = 'lucene'
+
+      # Disable spellcheck, which doesn't work when using JSON Query DSL
+      solr_parameters[:spellcheck] = 'false'
+
       defaults = { must: [], must_not: [], should: [] }
       default_op = blacklight_params[:op]&.to_sym || :must
       solr_parameters[:mm] = 1 if default_op == :should && search_state.clause_params.values.any? { |clause| }
@@ -117,6 +133,16 @@ module Blacklight::Solr
       [op, field.clause_params.transform_values { |v| v.merge(query: clause[:query]) }]
     end
 
+    # Merge the advanced search form parameters into the solr parameters
+    # @param [Hash] solr_parameters the current solr parameters
+    # @return [Hash] the solr parameters with the additional advanced search form parameters
+    def add_facets_for_advanced_search_form(solr_parameters)
+      return unless search_state.controller&.action_name == 'advanced_search' &&
+                    blacklight_config.advanced_search[:form_solr_parameters]
+
+      solr_parameters.merge!(blacklight_config.advanced_search[:form_solr_parameters])
+    end
+
     ##
     # Add any existing facet limits, stored in app-level HTTP query
     # as :f, to solr as appropriate :fq query.
@@ -215,8 +241,6 @@ module Blacklight::Solr
     # copy paging params from BL app over to solr, changing
     # app level per_page and page to Solr rows and start.
     def add_paging_to_solr(solr_params)
-      rows(solr_params[:rows] || 10) if rows.nil?
-
       solr_params[:rows] = rows
 
       solr_params[:start] = start if start.nonzero?
@@ -233,6 +257,48 @@ module Blacklight::Solr
       solr_parameters[:group] = false if search_state.filter(grouped_key_for_results).any?
     end
 
+    def add_facet_paging_to_solr(solr_params)
+      return if facet.blank?
+
+      facet_config = blacklight_config.facet_fields[facet]
+
+      solr_params[:rows] = 0
+
+      limit = if solr_params["facet.limit"]
+                solr_params["facet.limit"].to_i
+              else
+                facet_config.fetch(:more_limit, blacklight_config.default_more_limit)
+              end
+
+      page = search_state.facet_page
+      sort = search_state.facet_sort
+      prefix = search_state.facet_prefix
+      offset = (page - 1) * limit
+
+      if facet_config.json
+        add_solr_facet_json_params(solr_parameters, facet, facet_config, limit: limit + 1, offset: offset, sort: sort, prefix: prefix)
+        return
+      end
+
+      # Now override with our specific things for fetching facet values
+      facet_ex = facet_config.respond_to?(:ex) ? facet_config.ex : nil
+      solr_params[:'facet.field'] = with_ex_local_param(facet_ex, facet_config.field)
+
+      # Need to set as f.facet_field.facet.* to make sure we
+      # override any field-specific default in the solr request handler.
+      solr_params[:"f.#{facet_config.field}.facet.limit"] = limit + 1
+      solr_params[:"f.#{facet_config.field}.facet.offset"] = offset
+      solr_params[:"f.#{facet_config.field}.facet.sort"] = sort if sort
+      solr_params[:"f.#{facet_config.field}.facet.prefix"] = prefix if prefix
+    end
+
+    def add_facet_suggestion_parameters(solr_params)
+      return if facet.blank? || facet_suggestion_query.blank?
+
+      solr_params[:'facet.contains'] = facet_suggestion_query[0..50]
+      solr_params[:'facet.contains.ignoreCase'] = true
+    end
+
     def with_ex_local_param(ex, value)
       if ex
         "{!ex=#{ex}}#{value}"
@@ -243,7 +309,7 @@ module Blacklight::Solr
 
     # Look up facet limit for given facet_field. Will look at config, and
     # if config is 'true' will look up from Solr @response if available. If
-    # no limit is avaialble, returns nil. Used from #add_facetting_to_solr
+    # no limit is available, returns nil. Used from #add_facetting_to_solr
     # to supply f.fieldname.facet.limit values in solr request (no @response
     # available), and used in display (with @response available) to create
     # a facet paginator with the right limit.

data/lib/blacklight/solr/single_doc_search_builder.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Blacklight::Solr
+  class SingleDocSearchBuilder < SearchBuilder
+    self.default_processor_chain = [:add_defaults, :add_qt, :add_unique_id]
+
+    def initialize(scope, id, other_params)
+      @other_params = other_params
+      @id = id
+      super(scope)
+    end
+
+    def add_defaults(request)
+      request.reverse_merge!(blacklight_config.default_document_solr_params).reverse_merge!(@other_params)
+    end
+
+    def add_qt(request)
+      request[:qt] ||= blacklight_config.document_solr_request_handler if blacklight_config.document_solr_request_handler
+    end
+
+    def add_unique_id(request)
+      request[blacklight_config.document_unique_id_param] = @id
+    end
+  end
+end

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

@@ -12,7 +12,7 @@ class <%= controller_name.classify %>Controller < ApplicationController
   # rescue_from Blacklight::Exceptions::InvalidRequest, with: :my_handling_method
 
   configure_blacklight do |config|
-    ## Specify the style of markup to be generated (may be 4 or 5)
+    ## Specify the style of markup to be generated
     # config.bootstrap_version = 5
     #
     ## Class for sending and receiving requests from a search index
@@ -29,6 +29,13 @@ class <%= controller_name.classify %>Controller < ApplicationController
     #
     ## Should the raw solr document endpoint (e.g. /catalog/:id/raw) be enabled
     # config.raw_endpoint.enabled = false
+    #
+    ## Should advanced search be enabled
+    # config.advanced_search.enabled = true
+    #
+    ## Optional fine-tuning for advanced search, e.g., set different limits for
+    ## different facets.
+    # config.advanced_search.form_solr_parameters = {}
 
     ## Default parameters to send to solr for all search-like requests. See also SearchBuilder#processed_parameters
     config.default_solr_params = {
@@ -38,7 +45,7 @@ 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'
-    #config.json_solr_path = 'advanced'
+    #config.json_solr_path = 'select'
 
     # items to show per page, each number in the array represent another option to choose from.
     #config.per_page = [10,20,50,100]
@@ -105,6 +112,12 @@ class <%= controller_name.classify %>Controller < ApplicationController
     # :show may be set to false if you don't want the facet to be drawn in the
     # facet bar
     #
+    # Set :include_in_advanced_search to false for any search field or facet field
+    # that you want to exclude from appearing in the advanced search page.
+    #
+    # Set :include_in_simple_select to false for any search field you want to render
+    # in the Advanced Search page but exclude from the main search box scope selector.
+    #
     # Set :index_range to true if you want the facet pagination view to have facet prefix-based navigation.
     #  (useful when user clicks "more" on a large facet and wants to navigate alphabetically across a large set of results)
     # :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)
@@ -121,7 +134,9 @@ class <%= controller_name.classify %>Controller < ApplicationController
 
     config.add_facet_field 'example_pivot_field',
                            label: 'Pivot Field',
-                           pivot: ['language_ssim', 'subject_geo_ssim', 'subject_ssim'], collapsing: true
+                           pivot: ['language_ssim', 'subject_geo_ssim', 'subject_ssim'],
+                           collapsing: true,
+                           include_in_advanced_search: false
 
     config.add_facet_field 'example_query_facet_field', label: 'Publish Date', :query => {
        :years_5 => { label: 'within 5 Years', fq: "pub_date_ssim:[#{Time.zone.now.year - 5 } TO *]" },
@@ -165,7 +180,7 @@ class <%= controller_name.classify %>Controller < ApplicationController
     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
+    # For supported keys in hash, see rdoc for Blacklight::Configuration::SearchField
     #
     # Search fields will inherit the :qt solr request handler from
     # config[:default_solr_parameters], OR can specify a different one
@@ -208,7 +223,7 @@ class <%= controller_name.classify %>Controller < ApplicationController
 
     # Specifying a :qt only to show it's possible, and so our internal automated
     # tests can test it. In this case it's the same as
-    # config[:default_solr_parameters][:qt], so isn't actually neccesary.
+    # config[:default_solr_parameters][:qt], so isn't actually necessary.
     config.add_search_field('subject') do |field|
       field.qt = 'search'
       field.solr_parameters = {
@@ -218,6 +233,13 @@ class <%= controller_name.classify %>Controller < ApplicationController
       }
     end
 
+    # Set up a default advanced search configuration by using the current
+    # search_fields and facet_fields configs.
+    if config.advanced_search.enabled
+      config.copy_search_field_config_to_advanced!
+      config.copy_facet_field_config_to_advanced!
+    end
+
     # "sort results by" select (pulldown)
     # 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