sufia 4.0.0.beta2 → 4.0.0.beta3

data/app/views/users/index.html.erb

@@ -1,5 +1,5 @@
 <div id="search" class="row">
-<%= render :partial => 'search_form' %>
+<%= render partial: 'search_form' %>
 <h1><%= t('sufia.product_name') %> Users</h1>
 </div>
 <div id="Data">
@@ -16,7 +16,7 @@
         <tbody> 
             <% @users.each do |user| %> 
                 <tr class="<%= cycle("","zebra") %>"> 
-                   <td><a href="<%= sufia.profile_path(user) %>" class="btn btn-small " ><%= image_tag user.avatar.url(:thumb), :width => 30 %></a></td> 
+                   <td><a href="<%= sufia.profile_path(user) %>" class="btn btn-small " ><%= image_tag user.avatar.url(:thumb), width: 30 %></a></td> 
                    <td ><a href="<%= sufia.profile_path(user) %>"  ><%= user.name %><a></td> 
                    <td><a href="<%= sufia.profile_path(user) %>"  ><%= user.user_key %><a></td>
                    <td><%= user.department %> </td> 
@@ -26,6 +26,6 @@
         </tbody> 
     </table> 
     <div class="pager">
-      <%= paginate @users,  :theme => 'blacklight', :route_set=> sufia%>
+      <%= paginate @users,  theme: 'blacklight', route_set: sufia%>
     </div>
 </div> 

data/app/views/users/notifications_number.js.erb

@@ -1,4 +1,4 @@
-$("#notify_link").html("<%= escape_javascript(render :partial => "notify_number")  %>");
+$("#notify_link").html("<%= escape_javascript(render partial: "notify_number")  %>");
 <% @batches.each do |batch|%>
   $(".<%=batch%>").attr('class', '');;
 <% end %>

data/config/locales/sufia.en.yml

@@ -9,8 +9,15 @@ en:
     search:
       form:
         q:
-          label:        "Search Sufia"
-          placeholder:  "Type keywords in here"
+          label:          "Search Sufia"
+          placeholder:    "Enter search terms"
+        option:
+          all:
+            label_short:  "All"
+            label_long:   "All of Sufia"
+          mine:
+            label_short:  "My Files" 
+            label_long:   "My Files"
     upload:
       my_computer:
         tab_label: "My Computer"
@@ -43,3 +50,7 @@ en:
       publisher: "The person or group making the file available. Generally this is the institution."
       rights: "Licensing and distribution information governing access to the file. Select from the provided drop-down list. <em>This is a required field</em>."
     background_attribution: "Background image courtesy of Penn State University"
+    bread_crumb:
+      file_list: "Your File Listing"
+      previous:  "Back to Previous"
+      search_results: "Back to search results"

data/config/routes.rb

@@ -1,16 +1,20 @@
 Sufia::Engine.routes.draw do
-  get 'single_use_link/generate_download/:id' => 'single_use_links#new_download', :as => :generate_download_single_use_link
-  get 'single_use_link/generate_show/:id' => 'single_use_links#new_show', :as => :generate_show_single_use_link
-  get 'single_use_link/show/:id' => 'single_use_links_viewer#show', :as => :show_single_use_link
-  get 'single_use_link/download/:id' => 'single_use_links_viewer#download', :as => :download_single_use_link
 
-  match 'batch_edits/clear' => 'batch_edits#clear', :as => :batch_edits_clear, via: [:get, :post]
+  # Downloads controller route
+  resources :homepage, only: "index"
+
+  # Route the home page as the root
+  root to: "homepage#index"
 
-  # Route path-less requests to the index view of catalog
-  root :to => "catalog#index"
+  get 'single_use_link/generate_download/:id' => 'single_use_links#new_download', as: :generate_download_single_use_link
+  get 'single_use_link/generate_show/:id' => 'single_use_links#new_show', as: :generate_show_single_use_link
+  get 'single_use_link/show/:id' => 'single_use_links_viewer#show', as: :show_single_use_link
+  get 'single_use_link/download/:id' => 'single_use_links_viewer#download', as: :download_single_use_link
+
+  match 'batch_edits/clear' => 'batch_edits#clear', as: :batch_edits_clear, via: [:get, :post]
 
   # "Notifications" route for catalog index view
-  get "users/notifications_number" => "users#notifications_number", :as => :user_notify
+  get "users/notifications_number" => "users#notifications_number", as: :user_notify
 
   # Generic file routes
   resources :generic_files, path: :files, except: :index do
@@ -25,7 +29,7 @@ Sufia::Engine.routes.draw do
   resources :featured_work_lists, path: 'featured_works', only: :create
 
   # Downloads controller route
-  resources :downloads, :only => "show"
+  resources :downloads, only: "show"
 
   # Messages
   resources :notifications, only: [:destroy, :index], controller: :mailbox do
@@ -44,16 +48,46 @@ Sufia::Engine.routes.draw do
   end
 
   # Dashboard routes (based partly on catalog routes)
-  resources 'dashboard', :only=>:index do
+  resources 'dashboard', only: :index do
     collection do
-      get 'page/:page', :action => :index
-      get 'activity', :action => :activity, :as => :dashboard_activity
-      get 'facet/:id', :action => :facet, :as => :dashboard_facet
+      get 'page/:page', action: :index
+      get 'activity', action: :activity, as: :dashboard_activity
+      get 'facet/:id', action: :facet, as: :dashboard_facet
+    end
+  end
+  namespace :dashboard do
+    resources :files, only: :index do
+      collection do
+        get 'page/:page', action: :index
+        get 'activity', action: :activity, as: :dashboard_activity
+        get 'facet/:id', action: :facet, as: :dashboard_facet
+      end
+    end
+    resources :collections, only: :index do
+      collection do
+        get 'page/:page', action: :index
+        get 'activity', action: :activity, as: :dashboard_activity
+        get 'facet/:id', action: :facet, as: :dashboard_facet
+      end
+    end
+    resources :highlights, only: :index do
+      collection do
+        get 'page/:page', action: :index
+        get 'activity', action: :activity, as: :dashboard_activity
+        get 'facet/:id', action: :facet, as: :dashboard_facet
+      end
+    end
+    resources :shares, only: :index do
+      collection do
+        get 'page/:page', action: :index
+        get 'activity', action: :activity, as: :dashboard_activity
+        get 'facet/:id', action: :facet, as: :dashboard_facet
+      end
     end
   end
 
   # advanced routes for advanced search
-  get 'search' => 'advanced#index', :as => :advanced
+  get 'search' => 'advanced#index', as: :advanced
 
   # Authority vocabulary queries route
   get 'authorities/:model/:term' => 'authorities#query'
@@ -61,22 +95,24 @@ Sufia::Engine.routes.draw do
   # LDAP-related routes for group and user lookups
   get 'directory/user/:uid' => 'directory#user'
   get 'directory/user/:uid/:attribute' => 'directory#user_attribute'
-  get 'directory/group/:cn' => 'directory#group', :constraints => { :cn => /.*/ }
+  get 'directory/group/:cn' => 'directory#group', constraints: { cn: /.*/ }
 
   # Batch edit routes
-  get 'batches/:id/edit' => 'batch#edit', :as => :batch_edit
-  post 'batches/:id/' => 'batch#update', :as => :batch_generic_files
+  get 'batches/:id/edit' => 'batch#edit', as: :batch_edit
+  post 'batches/:id/' => 'batch#update', as: :batch_generic_files
 
   # Contact form routes
-  post 'contact' => 'contact_form#create', :as => :contact_form_index
+  post 'contact' => 'contact_form#create', as: :contact_form_index
   get 'contact' => 'contact_form#new'
 
+  mount Hydra::Collections::Engine => '/'
+
   # Resque monitoring routes. Don't bother with this route unless Sufia::ResqueAdmin
   # has been defined in the initalizers.
   if defined?(Sufia::ResqueAdmin)
     namespace :admin do
       constraints Sufia::ResqueAdmin do
-        mount Resque::Server, :at => "queues"
+        mount Resque::Server, at: "queues"
       end
     end
   end
@@ -86,7 +122,7 @@ Sufia::Engine.routes.draw do
 
   get 'about' => 'pages#show', id: 'about_page'
   # Static page routes (workaround)
-  get ':action' => 'static#:action', :constraints => { :action => /help|terms|zotero|mendeley|agreement|subject_libraries|versions/ }, :as => :static
+  get ':action' => 'static#:action', constraints: { action: /help|terms|zotero|mendeley|agreement|subject_libraries|versions/ }, as: :static
 
   #Single use link errors
   get 'single_use_link/not_found' => 'errors#single_use_error'

data/db/seeds.rb

@@ -3,5 +3,5 @@
 #
 # Examples:
 #
-#   cities = City.create([{ :name => 'Chicago' }, { :name => 'Copenhagen' }])
-#   Mayor.create(:name => 'Daley', :city => cities.first)
+#   cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }])
+#   Mayor.create(name: 'Daley', city: cities.first)

data/lib/generators/sufia/sufia_generator.rb

@@ -7,7 +7,7 @@ class SufiaGenerator < Rails::Generators::Base
 
   source_root File.expand_path('../templates', __FILE__)
 
-  argument :model_name, :type => :string , :default => "user"
+  argument :model_name, type: :string , default: "user"
   desc """
 This generator makes the following changes to your application:
  1. Runs sufia-models:install
@@ -33,7 +33,7 @@ This generator makes the following changes to your application:
     controller_name = "ApplicationController"
     file_path = "app/controllers/application_controller.rb"
     if File.exists?(file_path)
-      insert_into_file file_path, :after => 'include Blacklight::Controller' do
+      insert_into_file file_path, after: 'include Blacklight::Controller' do
         "  \n# Adds Sufia behaviors into the application controller \n" +
         "  include Sufia::Controller\n"
       end
@@ -47,18 +47,28 @@ This generator makes the following changes to your application:
     copy_file "catalog_controller.rb", "app/controllers/catalog_controller.rb"
   end
 
+  def copy_helper
+    copy_file 'sufia_helper.rb', 'app/helpers/sufia_helper.rb'
+  end
+
+  def remove_blacklight_scss
+    remove_file 'app/assets/stylesheets/blacklight.css.scss'
+  end
+
   def tinymce_config
     copy_file "config/tinymce.yml", "config/tinymce.yml"
   end
 
   # The engine routes have to come after the devise routes so that /users/sign_in will work
   def inject_routes
+    gsub_file 'config/routes.rb', 'root :to => "catalog#index"', ''
+
     routing_code = "\n  Hydra::BatchEdit.add_routes(self)\n" +
       "  # This must be the very last route in the file because it has a catch-all route for 404 errors.
   # This behavior seems to show up only in production mode.
-  mount Sufia::Engine => '/'\n"
+  mount Sufia::Engine => '/'\n  root to: 'homepage#index'\n"
 
     sentinel = /devise_for :users/
-    inject_into_file 'config/routes.rb', routing_code, { :after => sentinel, :verbose => false }
+    inject_into_file 'config/routes.rb', routing_code, { after: sentinel, verbose: false }
   end
 end

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

@@ -32,8 +32,8 @@ class CatalogController < ApplicationController
   configure_blacklight do |config|
     ## Default parameters to send to solr for all search-like requests. See also SolrHelper#solr_search_params
     config.default_solr_params = {
-      :qt => "search",
-      :rows => 10
+      qt: "search",
+      rows: 10
     }
     
     # Specify which field to use in the tag cloud on the homepage.  
@@ -41,19 +41,20 @@ class CatalogController < ApplicationController
     config.tag_cloud_field_name = Solrizer.solr_name("desc_metadata__tag", :facetable)
 
     # solr field configuration for document/show views
-    config.index.title_field = solr_name("desc_metadata__title", :displayable)
+    config.index.title_field = solr_name("desc_metadata__title", :stored_searchable)
     config.index.display_type_field = solr_name("has_model", :symbol)
+    config.index.thumbnail_method = :sufia_thumbnail_tag
 
     # solr fields that will be treated as facets by the blacklight application
     #   The ordering of the field names is the order of the display
-    config.add_facet_field solr_name("desc_metadata__resource_type", :facetable), :label => "Resource Type", :limit => 5
-    config.add_facet_field solr_name("desc_metadata__creator", :facetable), :label => "Creator", :limit => 5
-    config.add_facet_field solr_name("desc_metadata__tag", :facetable), :label => "Keyword", :limit => 5
-    config.add_facet_field solr_name("desc_metadata__subject", :facetable), :label => "Subject", :limit => 5
-    config.add_facet_field solr_name("desc_metadata__language", :facetable), :label => "Language", :limit => 5
-    config.add_facet_field solr_name("desc_metadata__based_near", :facetable), :label => "Location", :limit => 5
-    config.add_facet_field solr_name("desc_metadata__publisher", :facetable), :label => "Publisher", :limit => 5
-    config.add_facet_field solr_name("file_format", :facetable), :label => "File Format", :limit => 5
+    config.add_facet_field solr_name("desc_metadata__resource_type", :facetable), label: "Resource Type", limit: 5
+    config.add_facet_field solr_name("desc_metadata__creator", :facetable), label: "Creator", limit: 5
+    config.add_facet_field solr_name("desc_metadata__tag", :facetable), label: "Keyword", limit: 5
+    config.add_facet_field solr_name("desc_metadata__subject", :facetable), label: "Subject", limit: 5
+    config.add_facet_field solr_name("desc_metadata__language", :facetable), label: "Language", limit: 5
+    config.add_facet_field solr_name("desc_metadata__based_near", :facetable), label: "Location", limit: 5
+    config.add_facet_field solr_name("desc_metadata__publisher", :facetable), label: "Publisher", limit: 5
+    config.add_facet_field solr_name("file_format", :facetable), label: "File Format", limit: 5
 
     # 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
@@ -62,41 +63,41 @@ class CatalogController < 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 solr_name("desc_metadata__title", :stored_searchable, type: :string), :label => "Title"
-    config.add_index_field solr_name("desc_metadata__description", :stored_searchable, type: :string), :label => "Description"
-    config.add_index_field solr_name("desc_metadata__tag", :stored_searchable, type: :string), :label => "Keyword"
-    config.add_index_field solr_name("desc_metadata__subject", :stored_searchable, type: :string), :label => "Subject"
-    config.add_index_field solr_name("desc_metadata__creator", :stored_searchable, type: :string), :label => "Creator"
-    config.add_index_field solr_name("desc_metadata__contributor", :stored_searchable, type: :string), :label => "Contributor"
-    config.add_index_field solr_name("desc_metadata__publisher", :stored_searchable, type: :string), :label => "Publisher"
-    config.add_index_field solr_name("desc_metadata__based_near", :stored_searchable, type: :string), :label => "Location"
-    config.add_index_field solr_name("desc_metadata__language", :stored_searchable, type: :string), :label => "Language"
-    config.add_index_field solr_name("desc_metadata__date_uploaded", :stored_searchable, type: :string), :label => "Date Uploaded"
-    config.add_index_field solr_name("desc_metadata__date_modified", :stored_searchable, type: :string), :label => "Date Modified"
-    config.add_index_field solr_name("desc_metadata__date_created", :stored_searchable, type: :string), :label => "Date Created"
-    config.add_index_field solr_name("desc_metadata__rights", :stored_searchable, type: :string), :label => "Rights"
-    config.add_index_field solr_name("desc_metadata__resource_type", :stored_searchable, type: :string), :label => "Resource Type"
-    config.add_index_field solr_name("desc_metadata__format", :stored_searchable, type: :string), :label => "File Format"
-    config.add_index_field solr_name("desc_metadata__identifier", :stored_searchable, type: :string), :label => "Identifier"
+    config.add_index_field solr_name("desc_metadata__title", :stored_searchable), label: "Title"
+    config.add_index_field solr_name("desc_metadata__description", :stored_searchable), label: "Description"
+    config.add_index_field solr_name("desc_metadata__tag", :stored_searchable), label: "Keyword"
+    config.add_index_field solr_name("desc_metadata__subject", :stored_searchable), label: "Subject"
+    config.add_index_field solr_name("desc_metadata__creator", :stored_searchable), label: "Creator"
+    config.add_index_field solr_name("desc_metadata__contributor", :stored_searchable), label: "Contributor"
+    config.add_index_field solr_name("desc_metadata__publisher", :stored_searchable), label: "Publisher"
+    config.add_index_field solr_name("desc_metadata__based_near", :stored_searchable), label: "Location"
+    config.add_index_field solr_name("desc_metadata__language", :stored_searchable), label: "Language"
+    config.add_index_field solr_name("desc_metadata__date_uploaded", :stored_searchable), label: "Date Uploaded"
+    config.add_index_field solr_name("desc_metadata__date_modified", :stored_searchable), label: "Date Modified"
+    config.add_index_field solr_name("desc_metadata__date_created", :stored_searchable), label: "Date Created"
+    config.add_index_field solr_name("desc_metadata__rights", :stored_searchable), label: "Rights"
+    config.add_index_field solr_name("desc_metadata__resource_type", :stored_searchable), label: "Resource Type"
+    config.add_index_field solr_name("desc_metadata__format", :stored_searchable), label: "File Format"
+    config.add_index_field solr_name("desc_metadata__identifier", :stored_searchable), label: "Identifier"
 
     # 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 solr_name("desc_metadata__title", :stored_searchable, type: :string), :label => "Title"
-    config.add_show_field solr_name("desc_metadata__description", :stored_searchable, type: :string), :label => "Description"
-    config.add_show_field solr_name("desc_metadata__tag", :stored_searchable, type: :string), :label => "Keyword"
-    config.add_show_field solr_name("desc_metadata__subject", :stored_searchable, type: :string), :label => "Subject"
-    config.add_show_field solr_name("desc_metadata__creator", :stored_searchable, type: :string), :label => "Creator"
-    config.add_show_field solr_name("desc_metadata__contributor", :stored_searchable, type: :string), :label => "Contributor"
-    config.add_show_field solr_name("desc_metadata__publisher", :stored_searchable, type: :string), :label => "Publisher"
-    config.add_show_field solr_name("desc_metadata__based_near", :stored_searchable, type: :string), :label => "Location"
-    config.add_show_field solr_name("desc_metadata__language", :stored_searchable, type: :string), :label => "Language"
-    config.add_show_field solr_name("desc_metadata__date_uploaded", :stored_searchable, type: :string), :label => "Date Uploaded"
-    config.add_show_field solr_name("desc_metadata__date_modified", :stored_searchable, type: :string), :label => "Date Modified"
-    config.add_show_field solr_name("desc_metadata__date_created", :stored_searchable, type: :string), :label => "Date Created"
-    config.add_show_field solr_name("desc_metadata__rights", :stored_searchable, type: :string), :label => "Rights"
-    config.add_show_field solr_name("desc_metadata__resource_type", :stored_searchable, type: :string), :label => "Resource Type"
-    config.add_show_field solr_name("desc_metadata__format", :stored_searchable, type: :string), :label => "File Format"
-    config.add_show_field solr_name("desc_metadata__identifier", :stored_searchable, type: :string), :label => "Identifier"
+    config.add_show_field solr_name("desc_metadata__title", :stored_searchable), label: "Title"
+    config.add_show_field solr_name("desc_metadata__description", :stored_searchable), label: "Description"
+    config.add_show_field solr_name("desc_metadata__tag", :stored_searchable), label: "Keyword"
+    config.add_show_field solr_name("desc_metadata__subject", :stored_searchable), label: "Subject"
+    config.add_show_field solr_name("desc_metadata__creator", :stored_searchable), label: "Creator"
+    config.add_show_field solr_name("desc_metadata__contributor", :stored_searchable), label: "Contributor"
+    config.add_show_field solr_name("desc_metadata__publisher", :stored_searchable), label: "Publisher"
+    config.add_show_field solr_name("desc_metadata__based_near", :stored_searchable), label: "Location"
+    config.add_show_field solr_name("desc_metadata__language", :stored_searchable), label: "Language"
+    config.add_show_field solr_name("desc_metadata__date_uploaded", :stored_searchable), label: "Date Uploaded"
+    config.add_show_field solr_name("desc_metadata__date_modified", :stored_searchable), label: "Date Modified"
+    config.add_show_field solr_name("desc_metadata__date_created", :stored_searchable), label: "Date Created"
+    config.add_show_field solr_name("desc_metadata__rights", :stored_searchable), label: "Rights"
+    config.add_show_field solr_name("desc_metadata__resource_type", :stored_searchable), label: "Resource Type"
+    config.add_show_field solr_name("desc_metadata__format", :stored_searchable), label: "File Format"
+    config.add_show_field solr_name("desc_metadata__identifier", :stored_searchable), label: "Identifier"
 
     # "fielded" search configuration. Used by pulldown among other places.
     # For supported keys in hash, see rdoc for Blacklight::SearchFields
@@ -115,12 +116,12 @@ class CatalogController < ApplicationController
     # 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', :include_in_advanced_search => false) do |field|
+    config.add_search_field('all_fields', label: 'All Fields', include_in_advanced_search: false) do |field|
       all_names = config.show_fields.values.map{|val| val.field}.join(" ")
-      title_name = solr_name("desc_metadata__title", :stored_searchable, type: :string)
+      title_name = solr_name("desc_metadata__title", :stored_searchable)
       field.solr_parameters = {
-        :qf => "#{all_names} noid_tsi file_format_tesim",
-        :pf => "#{title_name}"
+        qf: "#{all_names} noid_tsi file_format_tesim",
+        pf: "#{title_name}"
       }
     end
 
@@ -137,19 +138,19 @@ class CatalogController < ApplicationController
       # 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
-      solr_name = solr_name("desc_metadata__contributor", :stored_searchable, type: :string)
+      solr_name = solr_name("desc_metadata__contributor", :stored_searchable)
       field.solr_local_parameters = {
-        :qf => solr_name,
-        :pf => solr_name
+        qf: solr_name,
+        pf: solr_name
       }
     end
 
     config.add_search_field('creator') do |field|
       field.solr_parameters = { :"spellcheck.dictionary" => "creator" }
-      solr_name = solr_name("desc_metadata__creator", :stored_searchable, type: :string)
+      solr_name = solr_name("desc_metadata__creator", :stored_searchable)
       field.solr_local_parameters = {
-        :qf => solr_name,
-        :pf => solr_name
+        qf: solr_name,
+        pf: solr_name
       }
     end
 
@@ -157,10 +158,10 @@ class CatalogController < ApplicationController
       field.solr_parameters = {
         :"spellcheck.dictionary" => "title"
       }
-      solr_name = solr_name("desc_metadata__title", :stored_searchable, type: :string)
+      solr_name = solr_name("desc_metadata__title", :stored_searchable)
       field.solr_local_parameters = {
-        :qf => solr_name,
-        :pf => solr_name
+        qf: solr_name,
+        pf: solr_name
       }
     end
 
@@ -169,10 +170,10 @@ class CatalogController < ApplicationController
       field.solr_parameters = {
         :"spellcheck.dictionary" => "description"
       }
-      solr_name = solr_name("desc_metadata__description", :stored_searchable, type: :string)
+      solr_name = solr_name("desc_metadata__description", :stored_searchable)
       field.solr_local_parameters = {
-        :qf => solr_name,
-        :pf => solr_name
+        qf: solr_name,
+        pf: solr_name
       }
     end
 
@@ -180,10 +181,10 @@ class CatalogController < ApplicationController
       field.solr_parameters = {
         :"spellcheck.dictionary" => "publisher"
       }
-      solr_name = solr_name("desc_metadata__publisher", :stored_searchable, type: :string)
+      solr_name = solr_name("desc_metadata__publisher", :stored_searchable)
       field.solr_local_parameters = {
-        :qf => solr_name,
-        :pf => solr_name
+        qf: solr_name,
+        pf: solr_name
       }
     end
 
@@ -191,10 +192,10 @@ class CatalogController < ApplicationController
       field.solr_parameters = {
         :"spellcheck.dictionary" => "date_created"
       }
-      solr_name = solr_name("desc_metadata__created", :stored_searchable, type: :string)
+      solr_name = solr_name("desc_metadata__created", :stored_searchable)
       field.solr_local_parameters = {
-        :qf => solr_name,
-        :pf => solr_name
+        qf: solr_name,
+        pf: solr_name
       }
     end
 
@@ -202,10 +203,10 @@ class CatalogController < ApplicationController
       field.solr_parameters = {
         :"spellcheck.dictionary" => "subject"
       }
-      solr_name = solr_name("desc_metadata__subject", :stored_searchable, type: :string)
+      solr_name = solr_name("desc_metadata__subject", :stored_searchable)
       field.solr_local_parameters = {
-        :qf => solr_name,
-        :pf => solr_name
+        qf: solr_name,
+        pf: solr_name
       }
     end
 
@@ -213,10 +214,10 @@ class CatalogController < ApplicationController
       field.solr_parameters = {
         :"spellcheck.dictionary" => "language"
       }
-      solr_name = solr_name("desc_metadata__language", :stored_searchable, type: :string)
+      solr_name = solr_name("desc_metadata__language", :stored_searchable)
       field.solr_local_parameters = {
-        :qf => solr_name,
-        :pf => solr_name
+        qf: solr_name,
+        pf: solr_name
       }
     end
 
@@ -224,10 +225,10 @@ class CatalogController < ApplicationController
       field.solr_parameters = {
         :"spellcheck.dictionary" => "resource_type"
       }
-      solr_name = solr_name("desc_metadata__resource_type", :stored_searchable, type: :string)
+      solr_name = solr_name("desc_metadata__resource_type", :stored_searchable)
       field.solr_local_parameters = {
-        :qf => solr_name,
-        :pf => solr_name
+        qf: solr_name,
+        pf: solr_name
       }
     end
 
@@ -236,10 +237,10 @@ class CatalogController < ApplicationController
       field.solr_parameters = {
         :"spellcheck.dictionary" => "format"
       }
-      solr_name = solr_name("desc_metadata__format", :stored_searchable, type: :string)
+      solr_name = solr_name("desc_metadata__format", :stored_searchable)
       field.solr_local_parameters = {
-        :qf => solr_name,
-        :pf => solr_name
+        qf: solr_name,
+        pf: solr_name
       }
     end
 
@@ -248,10 +249,10 @@ class CatalogController < ApplicationController
       field.solr_parameters = {
         :"spellcheck.dictionary" => "identifier"
       }
-      solr_name = solr_name("desc_metadata__id", :stored_searchable, type: :string)
+      solr_name = solr_name("desc_metadata__id", :stored_searchable)
       field.solr_local_parameters = {
-        :qf => solr_name,
-        :pf => solr_name
+        qf: solr_name,
+        pf: solr_name
       }
     end
 
@@ -260,10 +261,10 @@ class CatalogController < ApplicationController
       field.solr_parameters = {
         :"spellcheck.dictionary" => "based_near"
       }
-      solr_name = solr_name("desc_metadata__based_near", :stored_searchable, type: :string)
+      solr_name = solr_name("desc_metadata__based_near", :stored_searchable)
       field.solr_local_parameters = {
-        :qf => solr_name,
-        :pf => solr_name
+        qf: solr_name,
+        pf: solr_name
       }
     end
 
@@ -271,26 +272,26 @@ class CatalogController < ApplicationController
       field.solr_parameters = {
         :"spellcheck.dictionary" => "tag"
       }
-      solr_name = solr_name("desc_metadata__tag", :stored_searchable, type: :string)
+      solr_name = solr_name("desc_metadata__tag", :stored_searchable)
       field.solr_local_parameters = {
-        :qf => solr_name,
-        :pf => solr_name
+        qf: solr_name,
+        pf: solr_name
       }
     end
 
     config.add_search_field('depositor') do |field|
-      solr_name = solr_name("desc_metadata__depositor", :stored_searchable, type: :string)
+      solr_name = solr_name("desc_metadata__depositor", :stored_searchable)
       field.solr_local_parameters = {
-        :qf => solr_name,
-        :pf => solr_name
+        qf: solr_name,
+        pf: solr_name
       }
     end
 
     config.add_search_field('rights') do |field|
-      solr_name = solr_name("desc_metadata__rights", :stored_searchable, type: :string)
+      solr_name = solr_name("desc_metadata__rights", :stored_searchable)
       field.solr_local_parameters = {
-        :qf => solr_name,
-        :pf => solr_name
+        qf: solr_name,
+        pf: solr_name
       }
     end
 
@@ -299,11 +300,11 @@ class CatalogController < ApplicationController
     # whether the sort is ascending or descending (it must be asc or desc
     # except in the relevancy case).
     # label is key, solr field is value
-    config.add_sort_field "score desc, #{uploaded_field} desc", :label => "relevance \u25BC"
-    config.add_sort_field "#{uploaded_field} desc", :label => "date uploaded \u25BC"
-    config.add_sort_field "#{uploaded_field} asc", :label => "date uploaded \u25B2"
-    config.add_sort_field "#{modified_field} desc", :label => "date modified \u25BC"
-    config.add_sort_field "#{modified_field} asc", :label => "date modified \u25B2"
+    config.add_sort_field "score desc, #{uploaded_field} desc", label: "relevance \u25BC"
+    config.add_sort_field "#{uploaded_field} desc", label: "date uploaded \u25BC"
+    config.add_sort_field "#{uploaded_field} asc", label: "date uploaded \u25B2"
+    config.add_sort_field "#{modified_field} desc", label: "date modified \u25BC"
+    config.add_sort_field "#{modified_field} asc", label: "date modified \u25B2"
 
     # If there are more than this many search results, no spelling ("did you
     # mean") suggestion is offered.