commonwealth-vlr-engine 0.0.1 → 0.0.2

data/app/views/catalog/_show_tools.html.erb

@@ -20,14 +20,14 @@
   <% if @document.respond_to?( :to_email_text ) %>
       <li class="email">
         <%= link_to content_tag(:span, '', :class => 'glyphicon glyphicon-envelope') + ' ' + t('blacklight.tools.email'),
-                    email_catalog_path(:id => @document),
+                    email_solr_document_path(:id => @document),
                     {:id => 'emailLink', :data => {:ajax_modal => 'trigger'}} %>
       </li>
   <%- end -%>
   <%# if (@document.respond_to?(:export_as_mla_citation_txt) || @document.respond_to?(:export_as_apa_citation_txt)) %>
       <li class="cite">
         <%= link_to content_tag(:span, '', :class => 'glyphicon glyphicon-list-alt') + ' ' + t('blacklight.tools.citation'),
-                    citation_catalog_path(:id => @document),
+                    citation_solr_document_path(:id => @document),
                     {:id => 'citeLink', :data => {:ajax_modal => 'trigger'}} %>
       </li>
   <%# end %>

data/app/views/catalog/_zero_results.html.erb

@@ -10,7 +10,7 @@
         <li><%= t 'blacklight.search.zero_results.search_fields', :search_fields => search_field_label(params) %> --
           <%= link_to t('blacklight.search.zero_results.search_everything',
                         field: blacklight_config.default_search_field.label),
-                      url_for(params_for_search(:search_field=>blacklight_config.default_search_field.key)) %>
+                      url_for(search_state.params_for_search(:search_field=>blacklight_config.default_search_field.key)) %>
         </li>
     <%- end %>
 

data/app/views/collections/_search_form_collection.html.erb

@@ -2,7 +2,7 @@
   <%= form_tag search_action_url,
                :method => :get,
                :class => 'search-query-form form-inline collection-search' do %>
-      <%= render_hash_as_hidden_fields(params_for_search(:f => params[:f]).except('q', 'search_field', 'qt', 'page')) %>
+      <%= render_hash_as_hidden_fields(search_state.params_for_search(:f => params[:f]).except('q', 'search_field', 'qt', 'page')) %>
 
       <div class="input-group pull-left">
         <label for="q_coll" class="sr-only"><%= t('blacklight.search.form.collection') %></label>

data/app/views/collections/show.html.erb

@@ -82,7 +82,7 @@
             <% unless @response.aggregations[map_facet_field].items.empty? %>
                 <div id="blacklight-collection-map-container">
                   <h4><%= t('blacklight.collections.map.title') %></h4>
-                  <%= render :partial => 'catalog/index_map',
+                  <%= render :partial => 'catalog/index_mapview',
                              :locals => {:geojson_features => serialize_geojson(map_facet_values,
                                                                                 'index')} %>
                   </div>

data/app/views/feedback/complete.html.erb

@@ -4,6 +4,6 @@
   <h4><%= t('blacklight.feedback.complete.title') %></h4>
 
   <ul>
-    <li><%= link_to t('blacklight.back_to_search'), catalog_index_path %></li>
+    <li><%= link_to t('blacklight.back_to_search'), search_catalog_path %></li>
   </ul>
 </div>

data/app/views/institutions/_search_form_institution.html.erb

@@ -3,7 +3,7 @@
                :method => :get,
                :class => 'search-query-form form-inline institution-search' do %>
 
-      <%= render_hash_as_hidden_fields(params_for_search(:f => params[:f]).except('q', 'search_field', 'qt', 'page')) %>
+      <%= render_hash_as_hidden_fields(search_state.params_for_search(:f => params[:f]).except('q', 'search_field', 'qt', 'page')) %>
 
       <div class="input-group pull-left">
         <label for="q_inst" class="sr-only"><%= t('blacklight.search.form.institution') %></label>

data/app/views/layouts/commonwealth-vlr-engine.html.erb

@@ -18,7 +18,7 @@
 
   <title><%= render_page_title %></title>
   <%= opensearch_description_tag application_name, opensearch_catalog_url(:format => 'xml') %>
-  <%= favicon_link_tag 'favicon.ico' %>
+  <%= favicon_link_tag %>
   <%= favicon_link_tag 'dc_mobile-icons_60x60.png', :rel => 'apple-touch-icon', :type => 'image/png'  %>
   <%= favicon_link_tag 'dc_mobile-icons_76x76.png', :rel => 'apple-touch-icon', :type => 'image/png', :sizes => '76x76' %>
   <%= favicon_link_tag 'dc_mobile-icons_120x120.png', :rel => 'apple-touch-icon', :type => 'image/png', :sizes => '120x120' %>
@@ -43,7 +43,7 @@
 <%= render :partial => 'shared/ajax_modal' %>
 
 <!-- /container -->
-<div id="main-container" class="container">
+<div id="main-container" class="<%= container_classes %>">
 
   <%= content_tag :h1, application_name, class: 'sr-only application-heading' %>
 

data/app/views/ocr_search/_search_form_ocr.html.erb

@@ -3,7 +3,7 @@
                  :method => :get,
                  :class => 'ocr-search-form',
                  :data => {:ajax_modal => 'preserve'} do %>
-        <%= render_hash_as_hidden_fields(params_for_search(:id => params[:id]).except('q', 'ocr_q', 'search_field', 'qt', 'page')) %>
+        <%= render_hash_as_hidden_fields(search_state.params_for_search(:id => params[:id]).except('q', 'ocr_q', 'search_field', 'qt', 'page')) %>
 
         <div class="input-group pull-left">
           <label for="q_ocr" class="sr-only"><%= t('blacklight.ocr.search.form.q') %></label>

data/app/views/pages/home.html.erb

@@ -1,3 +1,4 @@
 <%# putting this in a partial so it can be called from catalog#index %>
 <%# when no search params present %>
-<%= render :partial => 'pages/_home_partials/home_content' %>
+<%= render 'pages/_home_partials/home_content' %>
+<%= render 'shared/sitelinks_search_box' %>

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

@@ -1,4 +1,4 @@
-<% @page_title = t('blacklight.saved_searches.title') + " - " + application_name %>
+<% @page_title = t('blacklight.saved_searches.page_title', :application_name => application_name) %>
 <div class="col-sm-9" id="searches_content">
 
   <div id="breadcrumb">
@@ -32,7 +32,7 @@
       <%= t('blacklight.saved_searches.list_title') %>
       <small>
         [<%= link_to t('blacklight.saved_searches.clear.action_title'),
-                    clear_saved_searches_path,
+                     blacklight.clear_saved_searches_path,
                     :class => 'clear_all',
                     :method => :delete,
                     :data => { :confirm => t('blacklight.saved_searches.clear.action_confirm') } %>]
@@ -43,10 +43,10 @@
           <tr>
             <td><%= link_to_previous_search(search.query_params) %></td>
             <td><%# button_to content_tag(:i, '', :class => 'icon-remove'),
-                              forget_search_path(search.id) %>
+                              blacklight.forget_search_path(search.id) %>
                 <%= link_to(content_tag(:span, '',
                                         :class => 'glyphicon glyphicon-remove'),
-                            forget_search_path(search.id),
+                            blacklight.forget_search_path(search.id),
                             :class => 'delete_search',
                             :method => 'post',
                             :title => t('blacklight.saved_searches.delete'))

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

@@ -1,4 +1,4 @@
-<% @page_title = t('blacklight.search_history.title') + " - " + application_name %>
+<% @page_title = t('blacklight.search_history.page_title', :application_name => application_name) %>
 <div class="col-sm-9" id="search_history_content">
 <%# sidebar_items << capture do %>
     <!-- <p><%# link_back_to_catalog %></p> -->
@@ -30,7 +30,7 @@
       <%=t('blacklight.search_history.recent')%>
       <small>
         [<%= link_to t('blacklight.search_history.clear.action_title'),
-                     clear_search_history_path,
+                     blacklight.clear_search_history_path,
                      :id => 'clear_search_history',
                      :method => :delete,
                      :data => { :confirm => t('blacklight.search_history.clear.action_confirm') } %>]
@@ -43,12 +43,12 @@
               <%- if has_user_authentication_provider? -%>
                   <td class="actions">
                     <%- if current_or_guest_user && search.saved? -%>
-                        <%# button_to t('blacklight.search_history.forget'), forget_search_path(search.id), :class => 'btn btn-default' %>
+                        <%# button_to t('blacklight.search_history.forget'), blacklight.forget_search_path(search.id), :class => 'btn btn-default' %>
                          <%= content_tag(:span, '', :class => 'glyphicon glyphicon-ok') %>
                          In your <%= link_to t('blacklight.saved_searches.title'),
-                                            saved_searches_path %>
+                                             blacklight.saved_searches_path %>
                     <%- else -%>
-                        <%= button_to t('blacklight.search_history.save'), save_search_path(search.id), :method => :put, :class => 'btn btn-default' %>
+                        <%= button_to t('blacklight.search_history.save'), blacklight.save_search_path(search.id), :method => :put, :class => 'btn btn-default' %>
                     <%- end -%>
                   </td>
               <%- end -%>

data/app/views/shared/_folder_item_actions.html.erb

@@ -18,7 +18,6 @@
 <% end %>
 
 <% if current_user && !current_user.folders.empty? %>
-      <% existing_folders = current_user.folders %>
       <div class="btn-group folder-item-control" id="copy_folder_item_control">
         <span class="btn btn-default dropdown-toggle" data-toggle="dropdown">
           <%= content_tag(:span, '', :class => 'glyphicon glyphicon-random') + ' ' + t('blacklight.tools.copy_to') %> <span class="caret"></span>
@@ -39,7 +38,7 @@
                 <% end %>
               </li>
           <% end %>
-          <% existing_folders.each do |folder| %>
+          <% current_user.folders.each do |folder| %>
               <% if @folder && folder.id == @folder.id %>
                 <%# do nothing %>
               <% else %>

data/app/views/shared/_footer.html.erb

@@ -1,4 +1,4 @@
-<div id="footer" class="container">
+<div id="footer" class="<%= container_classes %>">
   <div class="row">
     <div id="footer_logo" class="col-sm-3 hidden-xs">
       <%= link_to application_name, root_path, :id => 'footer_logo_link' %>

data/app/views/shared/_header_navbar.html.erb

@@ -1,5 +1,5 @@
 <div id="header-navbar" class="navbar" role="navigation">
-  <div class="container">
+  <div class="<%= container_classes %>">
     <div class="navbar-header">
       <button id="nav_collapse_button" type="button" class="navbar-toggle btn collapsed" data-toggle="collapse" data-target="#user-util-collapse">
           <span class="glyphicon glyphicon-search"></span>

data/app/views/shared/_nav_links.html.erb

@@ -1,9 +1,9 @@
 <% nav_links = {
         :search => {
                 :basic => {:nav_link_title => t('blacklight.search.nav.basic'),
-                           :nav_link_path => catalog_index_path},
+                           :nav_link_path => search_catalog_path},
                 :advanced => {:nav_link_title => t('blacklight.search.nav.advanced'),
-                              :nav_link_path => advanced_search_path}
+                              :nav_link_path => blacklight_advanced_search_engine.advanced_search_path}
         },
         :explore => {},
         :about => {

data/app/views/shared/_search_form_header.html.erb

@@ -1,9 +1,15 @@
 <%= form_tag search_action_url, :method => :get, :class => 'header-search-form form-inline' do %>
-    <%= render_hash_as_hidden_fields(params_for_search(:search_field => default_search_field[:key]).except('q', 'qt', 'page', 'utf8', 'f', 'sort', 'mlt_id', 'coordinates', 'spatial_search_type', 'view')) %>
+    <%= render_hash_as_hidden_fields(search_state.params_for_search(:search_field => default_search_field[:key]).except('q', 'qt', 'page', 'utf8', 'f', 'sort', 'mlt_id', 'coordinates', 'spatial_search_type', 'view')) %>
 
     <div class="input-group pull-left">
-      <label for="q" class="sr-only"><%= t('blacklight.search.form.q') %></label>
-      <%= text_field_tag :q, nil, :placeholder => t('blacklight.search.form.q'), :class => 'search_q q form-control input-sm', :id => 'q'%>
+      <label for="q" class="sr-only"><%= t('blacklight.search.form.search.label') %></label>
+      <%= text_field_tag :q,
+                         nil,
+                         placeholder: t('blacklight.search.form.search.placeholder'),
+                         class: 'search_q q form-control input-sm',
+                         id: 'q',
+                         data: { autocomplete_enabled: autocomplete_enabled?,
+                                 autocomplete_path: blacklight.suggest_index_path } %>
       <span class="input-group-btn">
               <button type="submit" class="btn btn-primary search-btn btn-xs" id="search">
                 <span class="submit-search-text"><%=t('blacklight.search.form.submit')%></span>

data/app/views/shared/_sitelinks_search_box.html.erb

@@ -0,0 +1,12 @@
+<script type="application/ld+json">
+  {
+    "@context": "http://schema.org",
+    "@type": "WebSite",
+    "url": "<%= root_url %>",
+    "potentialAction": {
+      "@type": "SearchAction",
+      "target": "<%= search_catalog_url %>?q={search_term_string}",
+      "query-input": "required name=search_term_string"
+    }
+  }
+</script>

data/app/views/shared/_tools.html.erb

@@ -2,12 +2,12 @@
 <ul class="folderItemToolsList">
     <li class="cite">
     <%= link_to content_tag(:span, '', :class => 'glyphicon glyphicon-list-alt') + ' ' + t('blacklight.tools.citation'),
-                  citation_catalog_path(:id => ''),
+                citation_solr_documents_path(:id => ''),
                   {:id => 'citeLink', :name => 'citation', :class => 'lightboxLink btn btn-default'} %>
     </li>
     <li class="email">
     <%= link_to content_tag(:span, '', :class => 'glyphicon glyphicon-envelope') + ' ' + t('blacklight.tools.email'),
-                email_catalog_path(:id => ''),
+                email_solr_documents_path(:id => ''),
                 :class => 'lightboxLink btn btn-default',
                 :id => 'emailLink' %>
     </li>

data/app/views/shared/_user_util_links.html.erb

@@ -10,8 +10,8 @@
         </button>
         <ul id="user-util-links-list" class="dropdown-menu">
           <li><%= link_to t('blacklight.header_links.folders'), folders_path %></li>
-          <li><%= link_to t('blacklight.header_links.saved_searches'), saved_searches_path %></li>
-          <li><%= link_to t('blacklight.header_links.search_history'), search_history_path %></li>
+          <li><%= link_to t('blacklight.header_links.saved_searches'), blacklight.saved_searches_path %></li>
+          <li><%= link_to t('blacklight.header_links.search_history'), blacklight.search_history_path %></li>
           <li><%= link_to t('devise.registrations.edit'), edit_user_registration_path %></li>
           <li><%= link_to t('blacklight.header_links.logout'), destroy_user_session_path %></li>
         </ul>

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

@@ -10,11 +10,11 @@
       <%= t('blacklight.folders.intro') %>
     </li>
     <li>
-      <h4><%= link_to t('blacklight.header_links.saved_searches'), saved_searches_path %></h4>
+      <h4><%= link_to t('blacklight.header_links.saved_searches'), blacklight.saved_searches_path %></h4>
       <%= t('blacklight.saved_searches.intro') %>
     </li>
     <li>
-      <h4><%= link_to t('blacklight.header_links.search_history'), search_history_path %></h4>
+      <h4><%= link_to t('blacklight.header_links.search_history'), blacklight.search_history_path %></h4>
       <%= t('blacklight.search_history.intro') %>
     </li>
     <li>

data/commonwealth-vlr-engine.gemspec

@@ -18,10 +18,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'rails', '~>4.2.0'
-  spec.add_dependency 'blacklight', '~>5.14.0'
-  spec.add_dependency 'blacklight_advanced_search', '5.1.4'
-  spec.add_dependency 'blacklight-gallery', '0.4.0'
-  spec.add_dependency 'blacklight-maps', '0.4.0'
+  spec.add_dependency 'blacklight', '>= 6.1.0'
+  spec.add_dependency 'blacklight_advanced_search', '6.0.2'
+  spec.add_dependency 'blacklight-gallery', '0.5.0'
+  spec.add_dependency 'blacklight-maps', '0.5.0'
   spec.add_dependency 'bootstrap-sass', '~> 3.0'
   spec.add_dependency 'font-awesome-sass', '4.1.0'
   spec.add_dependency 'bpluser'

data/config/initializers/assets.rb

@@ -0,0 +1,2 @@
+#Rails.application.config.assets.paths << CommonwealthVlrEngine::Engine.root.join('app','assets','images')
+#Rails.application.config.assets.paths << CommonwealthVlrEngine::Engine.root.join('app','assets','images','openseadragon')

data/config/locales/commonwealth-vlr-engine.en.yml

@@ -191,6 +191,9 @@ en:
             success: 'All items removed.'
             failure: 'Items could not be removed. Please try again later.'
 
+    formats:
+          page_title: 'Formats - %{application_name}'
+
     footer:
           address: '123 Main Street, Anywhere, MA 01234'
 
@@ -281,6 +284,7 @@ en:
             note_date: 'Notes (date)'
             note_ownership: 'Notes (ownership)'
             note_performers: 'Performers'
+            note_physical: 'Notes (object)'
             note_reference: 'Notes (citation)'
             note_resp: 'Name on Item'
             publisher: 'Publisher'

data/config/routes.rb

@@ -1,6 +1,7 @@
 Rails.application.routes.draw do
 
   mount Bpluser::Engine => '/bpluser'
+  mount BlacklightAdvancedSearch::Engine => '/'
 
   # alias for map browse
   get 'places', :to => 'catalog#map', :as => 'places_facet'

data/lib/commonwealth-vlr-engine.rb

@@ -4,12 +4,15 @@ require 'commonwealth-vlr-engine/version'
 module CommonwealthVlrEngine
 
   require 'commonwealth-vlr-engine/controller_override'
-  require 'commonwealth-vlr-engine/commonwealth_search_builder'
+  require 'commonwealth-vlr-engine/search_builder/commonwealth_search_builder_behavior'
+  require 'commonwealth-vlr-engine/search_builder/institutions_search_builder'
+  require 'commonwealth-vlr-engine/search_builder/collections_search_builder'
+  require 'commonwealth-vlr-engine/search_builder/flagged_search_builder'
+  require 'commonwealth-vlr-engine/search_builder/ocr_search_builder'
+  require 'commonwealth-vlr-engine/search_builder/mlt_search_builder'
   require 'commonwealth-vlr-engine/controller'
   require 'commonwealth-vlr-engine/render_constraints_override'
   require 'commonwealth-vlr-engine/pages'
-  require 'commonwealth-vlr-engine/routes'
-  require 'commonwealth-vlr-engine/route_sets'
   require 'commonwealth-vlr-engine/finder'
   require 'commonwealth-vlr-engine/notifier'
   require 'commonwealth-vlr-engine/iiif_manifest'
@@ -38,18 +41,5 @@ module CommonwealthVlrEngine
     File.join(app_root, 'config', 'vlr.yml')
   end
 
-  def self.inject!
-
-    CatalogController.send(:include, CommonwealthVlrEngine::RenderConstraintsOverride)
-    CatalogController.send(:helper, CommonwealthVlrEngine::RenderConstraintsOverride) unless
-        CatalogController.helpers.is_a?(CommonwealthVlrEngine::RenderConstraintsOverride)
-
-    # inject into SearchHistory and SavedSearches so mlt queries display properly
-    SearchHistoryController.send(:helper, CommonwealthVlrEngine::RenderConstraintsOverride) unless
-        SearchHistoryController.helpers.is_a?(CommonwealthVlrEngine::RenderConstraintsOverride)
-    SavedSearchesController.send(:helper, CommonwealthVlrEngine::RenderConstraintsOverride) unless
-        SavedSearchesController.helpers.is_a?(CommonwealthVlrEngine::RenderConstraintsOverride)
-  end
-
 end
 

data/lib/commonwealth-vlr-engine/controller_override.rb

@@ -4,21 +4,15 @@ module CommonwealthVlrEngine
 
     included do
 
-      # adds behavior for retrieving files for an object
       self.send(:include, CommonwealthVlrEngine::Finder)
+      self.send(:include, CommonwealthVlrEngine::RenderConstraintsOverride)
+      self.send(:helper, CommonwealthVlrEngine::RenderConstraintsOverride)
 
-      if self.respond_to? :search_params_logic
-        search_params_logic.concat [:exclude_unwanted_models, :exclude_unpublished_items, :exclude_institutions, :exclude_volumes]
-      end
+      # add BlacklightAdvancedSearch
+      self.send(:include, BlacklightAdvancedSearch::Controller)
 
-      if self.blacklight_config.search_builder_class
-        self.blacklight_config.search_builder_class.send(:include,
-                                                         CommonwealthVlrEngine::CommonwealthSearchBuilder
-        ) unless
-            self.blacklight_config.search_builder_class.include?(
-                CommonwealthVlrEngine::CommonwealthSearchBuilder
-            )
-      end
+      # add BlacklightMaps
+      self.send(:include, BlacklightMaps::ControllerOverride)
 
       before_filter :get_object_files, :only => [:show]
       before_filter :set_nav_context, :only => [:index]
@@ -62,10 +56,12 @@ module CommonwealthVlrEngine
         # solr field for flagged/inappropriate content
         config.flagged_field = 'flagged_content_ssi'
 
-        # advanced search facet limits
+        # advanced search configuration
         config.advanced_search = {
-            :qt => 'search',
-            :form_solr_parameters => {
+            qt: 'search',
+            url_key: 'advanced',
+            query_parser: 'dismax',
+            form_solr_parameters: {
                 'facet.field' => ['genre_basic_ssim', 'collection_name_ssim'],
                 'facet.limit' => -1, # return all facet values
                 'facet.sort' => 'index' # sort by byte order of values
@@ -88,28 +84,28 @@ module CommonwealthVlrEngine
         config.index.display_type_field = 'active_fedora_model_suffix_ssi'
 
         # solr fields that will be treated as facets by the blacklight application
-        config.add_facet_field 'subject_facet_ssim', :label => 'Topic', :limit => 8, :sort => 'count', :collapse => false
-        config.add_facet_field 'subject_geographic_ssim', :label => 'Place', :limit => 8, :sort => 'count', :collapse => false
-        config.add_facet_field 'date_facet_ssim', :label => 'Date', :limit => 8, :sort => 'index', :collapse => false
-        config.add_facet_field 'genre_basic_ssim', :label => 'Format', :limit => 8, :sort => 'count', :helper_method => :render_format, :collapse => false
-        config.add_facet_field 'collection_name_ssim', :label => 'Collection', :limit => 8, :sort => 'count', :collapse => false
+        config.add_facet_field 'subject_facet_ssim', label: 'Topic', limit: 8, sort: 'count', collapse:  false
+        config.add_facet_field 'subject_geographic_ssim', label: 'Place', limit: 8, sort: 'count', collapse:  false
+        config.add_facet_field 'date_facet_ssim', label: 'Date', limit: 8, sort: 'index', collapse:  false
+        config.add_facet_field 'genre_basic_ssim', label: 'Format', limit: 8, sort: 'count', helper_method: :render_format, collapse:  false
+        config.add_facet_field 'collection_name_ssim', label: 'Collection', limit: 8, sort: 'count', collapse:  false
         # link_to_facet fields (not in facets sidebar of search results)
-        config.add_facet_field 'related_item_host_ssim', :label => 'Collection', :include_in_request => false # Collection (local)
-        config.add_facet_field 'genre_specific_ssim', :label => 'Genre', :include_in_request => false
-        config.add_facet_field 'related_item_series_ssim', :label => 'Series', :limit => 300, :sort => 'index', :include_in_request => false
-        config.add_facet_field 'related_item_subseries_ssim', :label => 'Subseries', :include_in_request => false
-        config.add_facet_field 'related_item_subsubseries_ssim', :label => 'Sub-subseries', :include_in_request => false
-        config.add_facet_field 'institution_name_ssim', :label => 'Institution', :include_in_request => false
-        config.add_facet_field 'name_facet_ssim', :label => 'Name', :include_in_request => false
+        config.add_facet_field 'related_item_host_ssim', label: 'Collection', include_in_request: false # Collection (local)
+        config.add_facet_field 'genre_specific_ssim', label: 'Genre', include_in_request: false
+        config.add_facet_field 'related_item_series_ssim', label: 'Series', limit: 300, sort: 'index', include_in_request: false
+        config.add_facet_field 'related_item_subseries_ssim', label: 'Subseries', include_in_request: false
+        config.add_facet_field 'related_item_subsubseries_ssim', label: 'Sub-subseries', include_in_request: false
+        config.add_facet_field 'institution_name_ssim', label: 'Institution', include_in_request: false
+        config.add_facet_field 'name_facet_ssim', label: 'Name', include_in_request: false
         # facet for blacklight-maps catalog#index map view
         # have to use '-2' to get all values
         # because Blacklight::RequestBuilders#solr_facet_params adds '+1' to value
-        config.add_facet_field 'subject_geojson_facet_ssim', :limit => -2, :label => 'Coordinates', :show => false
+        config.add_facet_field 'subject_geojson_facet_ssim', limit: -2, label: 'Coordinates', show: false
 
         # solr fields to be displayed in the index (search results) view
-        config.add_index_field 'genre_basic_ssim', :label => 'Format', :helper_method => :render_format_index
-        config.add_index_field 'collection_name_ssim', :label => 'Collection', :helper_method => :index_collection_link
-        config.add_index_field 'date_start_tsim', :label => 'Date', :helper_method => :index_date_value
+        config.add_index_field 'genre_basic_ssim', label: 'Format', helper_method: :render_format_index
+        config.add_index_field 'collection_name_ssim', label: 'Collection', helper_method: :index_collection_link
+        config.add_index_field 'date_start_tsim', label: 'Date', helper_method: :index_date_value
 
         # "fielded" search configuration. Used by pulldown among other places.
         config.add_search_field('all_fields') do |field|
@@ -120,8 +116,8 @@ module CommonwealthVlrEngine
         config.add_search_field('title') do |field|
           field.solr_parameters = { :'spellcheck.dictionary' => 'default' }
           field.solr_local_parameters = {
-              :qf => '$title_qf',
-              :pf => '$title_pf'
+              qf: '$title_qf',
+              pf: '$title_pf'
           }
         end
 
@@ -129,32 +125,32 @@ module CommonwealthVlrEngine
           field.solr_parameters = { :'spellcheck.dictionary' => 'default' }
           field.qt = 'search'
           field.solr_local_parameters = {
-              :qf => '$subject_qf',
-              :pf => '$subject_pf'
+              qf: '$subject_qf',
+              pf: '$subject_pf'
           }
         end
 
         config.add_search_field('place') do |field|
           field.solr_parameters = { :'spellcheck.dictionary' => 'default' }
           field.solr_local_parameters = {
-              :qf => '$place_qf',
-              :pf => '$place_pf'
+              qf: '$place_qf',
+              pf: '$place_pf'
           }
         end
 
         config.add_search_field('creator') do |field|
           field.solr_parameters = { :'spellcheck.dictionary' => 'default' }
           field.solr_local_parameters = {
-              :qf => '$author_qf',
-              :pf => '$author_pf'
+              qf: '$author_qf',
+              pf: '$author_pf'
           }
         end
 
         # "sort results by" select (pulldown)
-        config.add_sort_field 'score desc, title_info_primary_ssort asc', :label => 'relevance'
-        config.add_sort_field 'title_info_primary_ssort asc, date_start_dtsi asc', :label => 'title'
-        config.add_sort_field 'date_start_dtsi asc, title_info_primary_ssort asc', :label => 'date (asc)'
-        config.add_sort_field 'date_start_dtsi desc, title_info_primary_ssort asc', :label => 'date (desc)'
+        config.add_sort_field 'score desc, title_info_primary_ssort asc', label: 'relevance'
+        config.add_sort_field 'title_info_primary_ssort asc, date_start_dtsi asc', label: 'title'
+        config.add_sort_field 'date_start_dtsi asc, title_info_primary_ssort asc', label: 'date (asc)'
+        config.add_sort_field 'date_start_dtsi desc, title_info_primary_ssort asc', label: 'date (desc)'
 
       end
 
@@ -186,11 +182,11 @@ module CommonwealthVlrEngine
     # displays values and pagination links for Format field
     def formats_facet
       @nav_li_active = 'explore'
+      @page_title = t('blacklight.formats.page_title', :application_name => t('blacklight.application_name'))
 
       @facet = blacklight_config.facet_fields['genre_basic_ssim']
       @response = get_facet_field_response(@facet.key, params)
       @display_facet = @response.aggregations[@facet.key]
-
       @pagination = facet_paginator(@facet, @display_facet)
 
       render :facet
@@ -199,7 +195,7 @@ module CommonwealthVlrEngine
     # if this is 'more like this' search, solr id = params[:mlt_id]
     def mlt_search
       if params[:mlt_id]
-        CatalogController.search_params_logic += [:set_solr_id_for_mlt] unless CatalogController.search_params_logic.include? :set_solr_id_for_mlt
+        blacklight_config.search_builder_class = CommonwealthMltSearchBuilder
       end
     end
 
@@ -215,8 +211,8 @@ module CommonwealthVlrEngine
     # add institutions if configured
     def add_institution_fields
       if t('blacklight.home.browse.institutions.enabled')
-        blacklight_config.add_facet_field 'physical_location_ssim', :label => 'Institution', :limit => 8, :sort => 'count', :collapse => false
-        blacklight_config.add_index_field 'institution_name_ssim', :label => 'Institution', :helper_method => :index_institution_link
+        blacklight_config.add_facet_field 'physical_location_ssim', label: 'Institution', limit: 8, sort: 'count', collapse:  false
+        blacklight_config.add_index_field 'institution_name_ssim', label: 'Institution', helper_method: :index_institution_link
       end
     end
 
@@ -233,6 +229,45 @@ module CommonwealthVlrEngine
       volumes.presence
     end
 
+    protected
+    ##
+    # When a user logs in, transfer any saved searches or bookmarks to the current_user
+    def transfer_guest_user_actions_to_current_user
+      return unless respond_to? :current_user and respond_to? :guest_user and current_user and guest_user
+      current_user_searches = current_user.searches.pluck(:query_params)
+      current_user_bookmarks = current_user.bookmarks.pluck(:document_id)
+
+      guest_user.searches.reject { |s| current_user_searches.include?(s.query_params)}.each do |s|
+        current_user.searches << s
+        s.save!
+      end
+
+      guest_user.bookmarks.reject { |b| current_user_bookmarks.include?(b.document_id)}.each do |b|
+        current_user.bookmarks << b
+        b.save!
+      end
+
+      #Custom code to transfer over folders
+      guest_user.folders.each do |folder|
+        target_folder = current_user.folders.where(:title=>folder.title)
+        if target_folder.blank?
+          target_folder = current_user.folders.create({title: folder.title, description: folder.description, visibility: folder.visibility})
+          target_folder.save!
+        else
+          target_folder = target_folder.first
+        end
+        folder.folder_items.each do |item_to_add|
+          unless target_folder.has_folder_item(item_to_add.document_id)
+            target_folder.folder_items.create(:document_id => item_to_add.document_id) and target_folder.touch
+            target_folder.save!
+          end
+        end
+      end
+
+      # let guest_user know we've moved some bookmarks from under it
+      guest_user.reload if guest_user.persisted?
+    end
+
   end
 
 end