blacklight 3.1.2 → 3.2.0pre1

data/lib/blacklight/solr_helper.rb

@@ -46,12 +46,10 @@
 
 module Blacklight::SolrHelper
   extend ActiveSupport::Concern
-
-  MaxPerPage = 100
+  include Blacklight::SearchFields
 
   included do
     if self.respond_to?(:helper_method)
-      helper_method(:facet_limit_hash)
       helper_method(:facet_limit_for)
     end
 
@@ -68,7 +66,7 @@ module Blacklight::SolrHelper
     # CatalogController.include ModuleDefiningNewMethod
     # CatalogController.solr_search_params_logic += [:new_method]
     # CatalogController.solr_search_params_logic.delete(:we_dont_want)
-    self.solr_search_params_logic = [:default_solr_parameters , :add_query_to_solr, :add_facet_fq_to_solr, :add_facetting_to_solr, :add_sorting_paging_to_solr ]
+    self.solr_search_params_logic = [:default_solr_parameters , :add_query_to_solr, :add_facet_fq_to_solr, :add_facetting_to_solr, :add_paging_to_solr, :add_sorting_to_solr ]
   end
 
   def force_to_utf8(value)
@@ -132,32 +130,63 @@ module Blacklight::SolrHelper
     # Start with general defaults from BL config. Need to use custom
     # merge to dup values, to avoid later mutating the original by mistake.
     def default_solr_parameters(solr_parameters, user_params)
-      if Blacklight.config[:default_solr_params]
-        Blacklight.config[:default_solr_params].each_pair do |key, value|
-          solr_parameters[key] = value.dup rescue value
-        end
+      blacklight_config.default_solr_params.each do |key, value|
+        solr_parameters[key] = value.dup rescue value
       end
     end
     
     ###
-    # copy paging and sorting params from BL app over to solr, with
-    # fairly little transformation. 
-    def add_sorting_paging_to_solr(solr_parameters, user_params)
-      # Omit empty strings and nil values.             
-      # Apparently RSolr takes :per_page and converts it to Solr :rows,
-      # so we let it. 
-      [:page, :per_page, :sort].each do |key|
-        solr_parameters[key] = user_params[key] unless user_params[key].blank?      
+    # 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, user_params)
+      # Deprecated behavior was to pass :per_page to RSolr, and we
+      # generated blacklight_config.default_solr_params with that
+      # value. Move it over to rows.
+      if solr_params.has_key?(:per_page)
+        $stderr.puts "DEPRECATION WARNING: Blacklight::SolrHelper#solr_search_params: magic :per_page key deprecated, use :rows instead. (Check default_solr_params in blacklight config?)"
+        per_page = solr_params.delete(:per_page)
+        solr_params[:rows] ||= per_page
       end
 
-      if solr_parameters[:sort].blank?
-        default_sort_field = Blacklight.config[:sort_fields].first || [nil, nil]
-        solr_parameters[:sort] = default_sort_field.last unless default_sort_field.last.blank?
-      end
+      # Now any over-rides from current URL?
+      solr_params[:rows] = user_params[:per_page] unless user_params[:per_page].blank?
       
+      # Do we need to translate :page to Solr :start?      
+      unless user_params[:page].blank?
+        # already set solr_params["rows"] might not be the one we just set,
+        # could have been from app defaults too. But we need one.
+        # raising is consistent with prior RSolr magic keys behavior.
+        # We could change this to default to 10, or to raise on startup
+        # from config instead of at runtime.
+        if solr_params[:rows].blank?
+          raise Exception.new("To use pagination when no :per_page is supplied in the URL, :rows must be configured in blacklight_config default_solr_params")
+        end
+        
+        solr_params[:start] = solr_params[:rows].to_i * (user_params[:page].to_i - 1)
+        
+        # Solr throws error for negative start. Existing specs say
+        # we say start at 1 in this case. 
+        solr_params[:start] = 0 if solr_params[:start].to_i < 0
+      end
+
       # limit to MaxPerPage (100). Tests want this to be a string not an integer,
       # not sure why.     
-      solr_parameters[:per_page] = solr_parameters[:per_page].to_i > self.max_per_page ? self.max_per_page.to_s : solr_parameters[:per_page]      
+      solr_params[:rows] = solr_params[:rows].to_i > blacklight_config.max_per_page ? blacklight_config.max_per_page : solr_params[:rows]      
+    end
+
+    ###
+    # copy sorting params from BL app over to solr
+    def add_sorting_to_solr(solr_parameters, user_params)
+      if user_params[:sort].blank? and sort_field = blacklight_config.default_sort_field
+        # no sort param provided, use default
+        solr_parameters[:sort] = sort_field.sort unless sort_field.sort.blank?
+      elsif sort_field = blacklight_config.sort_fields[user_params[:sort]]
+        # check for sort field key  
+        solr_parameters[:sort] = sort_field.sort unless sort_field.sort.blank?
+      else 
+        # just pass the key through
+        solr_parameters[:sort] = user_params[:sort]
+      end
     end
 
     ##
@@ -175,10 +204,10 @@ module Blacklight::SolrHelper
       # rspec'd. 
       solr_parameters[:qt] = user_parameters[:qt] if user_parameters[:qt]
       
-      search_field_def = Blacklight.search_field_def_for_key(user_parameters[:search_field])
+      search_field_def = search_field_def_for_key(user_parameters[:search_field])
       if (search_field_def)     
-        solr_parameters[:qt] = search_field_def[:qt] if search_field_def[:qt]      
-        solr_parameters.merge!( search_field_def[:solr_parameters]) if search_field_def[:solr_parameters]
+        solr_parameters[:qt] = search_field_def.qt
+        solr_parameters.merge!( search_field_def.solr_parameters) if search_field_def.solr_parameters
       end
       
       ##
@@ -186,7 +215,7 @@ module Blacklight::SolrHelper
       # solr LocalParams in config, using solr LocalParams syntax. 
       # http://wiki.apache.org/solr/LocalParams
       ##         
-      if (search_field_def && hash = search_field_def[:solr_local_parameters])
+      if (search_field_def && hash = search_field_def.solr_local_parameters)
         local_params = hash.collect do |key, val|
           key.to_s + "=" + solr_param_quote(val, :quote => "'")
         end.join(" ")
@@ -222,11 +251,26 @@ module Blacklight::SolrHelper
           value_list ||= []
           value_list = [value_list] unless value_list.respond_to? :each
           value_list.each do |value|
-            solr_parameters[:fq] << "{!raw f=#{facet_field}}#{value}"
+            solr_parameters[:fq] << facet_value_to_fq_string(facet_field, value)
           end              
         end      
       end
     end
+
+    ##
+    # Convert a facet/value pair into a solr fq parameter
+    def facet_value_to_fq_string(facet_field, value) 
+      case
+        when (value.is_a?(Integer) or (value.to_i.to_s == value if value.respond_to? :to_i))
+          "#{facet_field}:#{value}"
+        when (value.is_a?(Float) or (value.to_f.to_s == value if value.respond_to? :to_f))
+          "#{facet_field}:#{value}"
+        when value.is_a?(Range)
+          "#{facet_field}:[#{value.first} TO #{value.last}]"
+        else
+          "{!raw f=#{facet_field}}#{value}"
+      end
+    end
     
     ##
     # Add appropriate Solr facetting directives in, including
@@ -247,8 +291,7 @@ module Blacklight::SolrHelper
       # Support facet paging and 'more'
       # links, by sending a facet.limit one more than what we
       # want to page at, according to configured facet limits.       
-      facet_limit_hash.each_key do |field_name|
-        next if field_name.nil? # skip the 'default' key
+      blacklight_config.facet_fields.each do |field_name, facet|
         next unless (limit = facet_limit_for(field_name))
   
         solr_parameters[:"f.#{field_name}.facet.limit"] = (limit + 1)
@@ -268,7 +311,7 @@ module Blacklight::SolrHelper
     # In later versions of Rails, the #benchmark method can do timing
     # better for us. 
     bench_start = Time.now
-    
+
     solr_response = find(self.solr_search_params(user_params).merge(extra_controller_params))  
     document_list = solr_response.docs.collect {|doc| SolrDocument.new(doc, solr_response)}  
     Rails.logger.debug("Solr fetch: #{self.class}#get_search_results (#{'%.1f' % ((Time.now.to_f - bench_start.to_f)*1000)}ms)")
@@ -301,10 +344,17 @@ module Blacklight::SolrHelper
   def get_solr_response_for_field_values(field, values, extra_solr_params = {})
     values ||= []
     values = [values] unless values.respond_to? :each
-    value_str = "(\"" + values.to_a.join("\" OR \"") + "\")"
+
+    q = nil
+    if values.empty?
+      q = "NOT *:*"
+    else
+      q = "#{field}:(#{ values.to_a.map { |x| solr_param_quote(x)}.join(" OR ")})"
+    end
+
     solr_params = {
       :defType => "lucene",   # need boolean for OR
-      :q => "#{field}:#{value_str}",
+      :q => q,
       # not sure why fl * is neccesary, why isn't default solr_search_params
       # sufficient, like it is for any other search results solr request? 
       # But tests fail without this. I think because some functionality requires
@@ -391,10 +441,8 @@ module Blacklight::SolrHelper
   # the Blacklight app-level request params that define the search. 
   def get_single_doc_via_search(index, request_params)
     solr_params = solr_search_params(request_params)
-    # solr_params[:start] = index - 1 # start at 0 to get 1st doc, 1 to get 2nd. 
-    # FIXME: we must set page because of a  bug posted here: https://github.com/mwmitchell/rsolr-ext/issues/16
-    solr_params[:page] = index # start at 1 to get 1st 1-doc page with RSolr::Ext :page
-    solr_params[:per_page] = 1
+
+    solr_params[:start] = (index - 1) # start at 0 to get 1st doc, 1 to get 2nd.    
     solr_params[:rows] = 1
     solr_params[:fl] = '*'
     solr_response = find(solr_params)
@@ -402,13 +450,13 @@ module Blacklight::SolrHelper
   end
     
   # returns a solr params hash
-  # if field is nil, the value is fetched from Blacklight.config[:index][:show_link]
+  # if field is nil, the value is fetched from blacklight_config[:index][:show_link]
   # the :fl (solr param) is set to the "field" value.
   # per_page is set to 10
   def solr_opensearch_params(field=nil)
     solr_params = solr_search_params
     solr_params[:per_page] = 10
-    solr_params[:fl] = Blacklight.config[:index][:show_link]
+    solr_params[:fl] = blacklight_config.index.show_link
     solr_params
   end
   
@@ -434,10 +482,10 @@ module Blacklight::SolrHelper
   # available), and used in display (with @response available) to create
   # a facet paginator with the right limit. 
   def facet_limit_for(facet_field)
-    limits_hash = facet_limit_hash
-    return nil if limits_hash.blank?
+    facet = blacklight_config.facet_fields[facet_field]
+    return nil if facet.blank?
         
-    limit = limits_hash[facet_field]
+    limit = facet.limit
 
     if ( limit == true && @response && 
          @response["responseHeader"] && 
@@ -454,16 +502,4 @@ module Blacklight::SolrHelper
     return limit
   end
 
-  # Returns complete hash of key=facet_field, value=limit.
-  # Used by SolrHelper#solr_search_params to add limits to solr
-  # request for all configured facet limits.
-  def facet_limit_hash
-    Blacklight.config[:facet][:limits] || {}
-  end
-
-  def max_per_page
-    MaxPerPage
-  end
-  
-  
 end

data/lib/blacklight/utils.rb

@@ -0,0 +1,18 @@
+require 'ostruct'
+module Blacklight
+  class OpenStructWithHashAccess < OpenStruct
+    delegate :keys, :merge, :to => :to_h
+
+    def []=(key, value)
+      send "#{key}=", value
+    end
+
+    def [](key)
+      send key
+    end
+
+    def to_h
+      @table
+    end
+  end
+end

data/lib/generators/blacklight/assets_generator.rb

@@ -17,37 +17,31 @@ module Blacklight
     source_root File.expand_path('../templates', __FILE__)
   
     def assets
-      if use_asset_pipeline?
+      unless IO.read("app/assets/stylesheets/application.css").include?("Blacklight")
+        copy_file('assets/standard.css.scss', 'app/assets/stylesheets/blacklight_themes/standard.css.scss')
         insert_into_file "app/assets/stylesheets/application.css", :after => "/*" do
-%q{
- *
- * Required by Blacklight
- *= require 'yui'
+  %q{
+ * Required by Blacklight:
  *= require 'jquery/ui-lightness/jquery-ui-1.8.1.custom.css'
+ * This is the standard blacklight theme.
  *= require 'blacklight/blacklight'         
-}
+ *
+ * If you'd like to modify the default theme, please instead require 'blacklight_themes/standard', which
+ * is in your local install at app/assets/stylesheets/blacklight_themes/ }
         end
+      end
 
+      unless IO.read("app/assets/javascripts/application.js").include?('blacklight/blacklight')
         insert_into_file "app/assets/javascripts/application.js", :after => "//= require jquery_ujs" do
-%q{
+  %q{
+//
 // Required by Blacklight
 //= require jquery-ui
-//= require blacklight/blacklight          
-}          
+//= require blacklight/blacklight}          
         end
-        directory("../../../../app/assets/images/blacklight", "public/images/blacklight")
-      else
-        # directories are relative to the source_root 
-        directory("../../../../app/assets/images/blacklight", "public/images/blacklight")
-        directory("../../../../app/assets/stylesheets", "public/stylesheets") 
-        directory("../../../../app/assets/javascripts", "public/javascripts") 
       end
-    end
 
-    private
-    def use_asset_pipeline?
-      (Rails::VERSION::MAJOR >= 3 and Rails::VERSION::MINOR >= 1) and Rails.application.config.assets.enabled
+      directory("../../../../app/assets/images/blacklight", "app/assets/images/blacklight")
     end
-    
   end
 end

data/lib/generators/blacklight/blacklight_generator.rb

@@ -110,10 +110,6 @@ EOF
     better_migration_template "add_user_types_to_bookmarks_searches.rb"
   end
 
-  # Copy ocver the solr_marc.jar file
-  def copy_solr_marc 
-    copy_file "SolrMarc.jar", "lib/SolrMarc.jar"
-  end
 
   # Add Blacklight to the user model
   def inject_blacklight_user_behavior
@@ -124,7 +120,7 @@ EOF
         "\n include Blacklight::User\n"        
       end
     else
-      puts "     \e[31mFailure\e[0m  Blacklight requires a user object in order to presist bookmarks and saved searches. This generators assumes that the model is defined in the file /app/models/user.rb, which does not exist.  If you used a different name, please re-run the migration and provide that name as an argument. Such as \b  rails -g blacklight client" 
+      say_status("warning", "Blacklight authenticated user functionality not installed, as a user model could not be found at /app/models/user.rb. If you used a different name, please re-run the migration and provide that name as an argument. Such as `rails -g blacklight client`", :yellow)       
     end    
   end
 
@@ -150,6 +146,19 @@ EOF
     route('Blacklight.add_routes(self)')
   end
 
+  def add_sass_configuration
+      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?
+    config.sass.line_comments = Rails.env.development?
+
+EOF
+      end
+
+      copy_file "config/sass.rb", "config/initializers/sass.rb"
+  end
+
   private  
   
   def better_migration_template (file)
@@ -160,6 +169,5 @@ EOF
       puts "  \e[1m\e[34mMigrations\e[0m  " + $!.message
     end
   end
-
 end  
 

data/lib/generators/blacklight/jetty_generator.rb

@@ -11,7 +11,7 @@ module Blacklight
     # change this to a different download if you want to peg to a different
     # tagged version of our known-good jetty/solr.
     OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE # (Required by jruby)
-    class_option :download_url, :aliases => "-u", :type=>"string", :default =>"https://github.com/projectblacklight/blacklight-jetty/zipball/v1.4.1-1" , :desc=>"location of zip file including a jetty with solr setup for blacklight."
+    class_option :download_url, :aliases => "-u", :type=>"string", :default =>"https://github.com/projectblacklight/blacklight-jetty/zipball/v3.5.0" , :desc=>"location of zip file including a jetty with solr setup for blacklight."
     class_option :downloaded_package, :aliases => "-d", :type=>"string", :desc => "manual download of BL-jetty zip file"
      
     

data/lib/generators/blacklight/templates/assets/standard.css.scss

@@ -0,0 +1,51 @@
+
+/* Grid parameters */
+/* changing total cols is not recommended unless you're going to redo blacklight/_layout.css.sass */
+$total-cols: 24;
+
+/* But the widths are changeable to px, em. */
+$col-width: 2.5em;
+$gutter-width: .5em;
+$side-gutter-width: 2em;
+
+
+$logo_url: 'blacklight/logo.png';
+
+/* Various elements of search customization share these colors */
+
+$search_ui_border_color: #AAAAAA;
+$search_ui_bg_color: #F0F0F0;
+
+/* separates documents, facets */
+$dotted_border_color: #CCC;
+
+/* background color of page */
+$page_bg_color: #2E4F81;
+
+
+/* label (field names) */
+$field_name_color: #888;
+
+
+/* constraint (you searched for:) details: */
+
+$constraint_bg_color: #E2EDFE;
+
+$constraint_border_color: #C4DAFE;
+$constraint_border_active_color: #FFD27A;
+
+/* dialog that pops up when you pick more on facets */
+$facet_extended_button_bg_color: #F6F6F6;
+$facet_extended_button_border_color: #CCC;
+$facet_extended_disabled_button_bg_color: #E2EDFE;
+$facet_extended_disabled_border_color: #C4DAFE;
+$facet_extended_button_hover_bg_color: #DADADA;
+$facet_extended_button_hover_border_color: #999;
+$facet_extended_button_hover_color: #212121;
+
+/* border between items on marc view */
+$marc_item_separator: 1px solid #CCC;
+
+/* uses these variables in the blacklight stylesheet */
+@import 'blacklight/blacklight';
+

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

@@ -5,4 +5,152 @@ class CatalogController < ApplicationController
 
   include Blacklight::Catalog
 
+  configure_blacklight do |config|
+    config.default_solr_params = { 
+      :qt => 'search',
+      :rows => 10 
+    }
+
+    # solr field configuration for search results/index views
+    config.index.show_link = 'title_display'
+    config.index.record_display_type = 'format'
+
+    # solr field configuration for document/show views
+    config.show.html_title = 'title_display'
+    config.show.heading = 'title_display'
+    config.show.display_type = 'format'
+
+    # solr fields that will be treated as facets by the blacklight application
+    #   The ordering of the field names is the order of the display
+    #
+    # Setting a limit will trigger Blacklight's 'more' facet values link.
+    # * If left unset, then all facet values returned by solr will be displayed.
+    # * If set to an integer, then "f.somefield.facet.limit" will be added to
+    # solr request, with actual solr request being +1 your configured limit --
+    # you configure the number of items you actually want _displayed_ in a page.    
+    # * If set to 'true', then no additional parameters will be sent to solr,
+    # but any 'sniffed' request limit parameters will be used for paging, with
+    # paging at requested limit -1. Can sniff from facet.limit or 
+    # f.specific_field.facet.limit solr request params. This 'true' config
+    # can be used if you set limits in :default_solr_params, or as defaults
+    # on the solr side in the request handler itself. Request handler defaults
+    # sniffing requires solr requests to be made with "echoParams=all", for
+    # app code to actually have it echo'd back to see it.  
+    config.add_facet_field 'format', :label => 'Format' 
+    config.add_facet_field 'pub_date', :label => 'Publication Year' 
+    config.add_facet_field 'subject_topic_facet', :label => 'Topic', :limit => 20 
+    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'  
+
+    # Have BL send all facet field names to Solr, which has been the default
+    # previously. Simply remove these lines if you'd rather use Solr request
+    # handler defaults, or have no facets.
+    config.default_solr_params[:'facet.field'] = config.facet_fields.keys
+
+    # 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 '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:'
+
+    # 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 '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:'
+
+    # "fielded" search configuration. Used by pulldown among other places.
+    # For supported keys in hash, see rdoc for Blacklight::SearchFields
+    #
+    # Search fields will inherit the :qt solr request handler from
+    # config[:default_solr_parameters], OR can specify a different one
+    # with a :qt key/value. Below examples inherit, except for subject
+    # that specifies the same :qt as default for our own internal
+    # testing purposes.
+    #
+    # The :key is what will be used to identify this BL search field internally,
+    # as well as in URLs -- so changing it after deployment may break bookmarked
+    # urls.  A display label will be automatically calculated from the :key,
+    # or can be specified manually to be different. 
+
+    # This one uses all the defaults set by the solr request handler. Which
+    # solr request handler? The one set in config[:default_solr_parameters][:qt],
+    # since we aren't specifying it otherwise. 
+    
+    config.add_search_field 'all_fields', :label => 'All Fields'
+    
+
+    # Now we see how to over-ride Solr request handler defaults, in this
+    # case for a BL "search field", which is really a dismax aggregate
+    # of Solr search fields. 
+    
+    config.add_search_field('title') do |field|
+      # solr_parameters hash are sent to Solr as ordinary url query params. 
+      field.solr_parameters = { :'spellcheck.dictionary' => 'title' }
+
+      # :solr_local_parameters will be sent using Solr LocalParams
+      # syntax, as eg {! qf=$title_qf }. This is neccesary to use
+      # Solr parameter de-referencing like $title_qf.
+      # See: http://wiki.apache.org/solr/LocalParams
+      field.solr_local_parameters = { 
+        :qf => '$title_qf',
+        :pf => '$title_pf'
+      }
+    end
+    
+    config.add_search_field('author') do |field|
+      field.solr_parameters = { :'spellcheck.dictionary' => 'author' }
+      field.solr_local_parameters = { 
+        :qf => '$author_qf',
+        :pf => '$author_pf'
+      }
+    end
+    
+    # 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.add_search_field('subject') do |field|
+      field.solr_parameters = { :'spellcheck.dictionary' => 'subject' }
+      field.qt = 'search'
+      field.solr_local_parameters = { 
+        :qf => '$subject_qf',
+        :pf => '$subject_pf'
+      }
+    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
+    # 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'
+
+    # If there are more than this many search results, no spelling ("did you 
+    # mean") suggestion is offered.
+    config.spell_max = 5
+  end
+
+
+
 end