Align with webarchive-discovery Solr 7.

- Remove content field search - Move field searches from handlers to qf - Use webarchive-discovery Solr 7 setup - Update to use Blacklight 7.0.0rc1 and Blacklight Range Limit 7.0.0rc2 - Resolves #45 - Resolves #46 - Resolves #47
archivesunleashed · Oct 12, 2018 · 3e034d2 · 3e034d2
1 parent ef0c872
commit 3e034d2
Show file tree

Hide file tree

Showing 31 changed files with 2,531 additions and 521 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -3,6 +3,7 @@ require: rubocop-rspec
 AllCops:
   Exclude:
     - '.internal_test_app/**/*'
+    - '.internal_test_gem/**/*'
     - 'bin/**/*'
     - 'db/**/*'
     - 'lib/generators/warclight/templates/**/*'

diff --git a/Gemfile b/Gemfile
@@ -10,7 +10,7 @@ gemspec
 # engine_cart: 1.1.0
 # engine_cart stanza: 0.10.0
 # the below comes from engine_cart, a gem used to test this Rails engine gem in the context of a Rails app.
-file = File.expand_path('Gemfile', ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path('.internal_test_app', File.dirname(__FILE__)))
+file = File.expand_path('Gemfile', ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path('.internal_test_gem', File.dirname(__FILE__)))
 if File.exist?(file)
   begin
     eval_gemfile file

diff --git a/app/assets/images/blacklight/logo.png b/app/assets/images/blacklight/logo.png
diff --git a/app/assets/javascripts/warclight/warclight.js b/app/assets/javascripts/warclight/warclight.js
@@ -0,0 +1 @@
+// Vendor Scripts
diff --git a/app/assets/stylesheets/warclight/application.scss b/app/assets/stylesheets/warclight/application.scss
@@ -1 +1,2 @@
-/* Warclight application scss */
+@import 'bootstrap/functions';
+@import 'bootstrap/variables';
diff --git a/app/assets/stylesheets/warclight/warclight.scss b/app/assets/stylesheets/warclight/warclight.scss
diff --git a/lib/generators/warclight/install_generator.rb b/lib/generators/warclight/install_generator.rb
@@ -19,6 +19,10 @@ def include_warclight_solrdocument
       end
     end
 
+    def install_blacklight_range_limit
+      generate 'blacklight_range_limit:install'
+    end
+
     def add_custom_routes
       inject_into_file 'config/routes.rb', after: "mount Blacklight::Engine => '/'" do
         "\n    mount Warclight::Engine => '/'\n"
@@ -27,6 +31,7 @@ def add_custom_routes
 
     def assets
       copy_file 'warclight.scss', 'app/assets/stylesheets/warclight.scss'
+      copy_file 'warclight.js', 'app/assets/javascripts/warclight.js'
       inject_into_file 'app/assets/javascripts/application.js', after: '//= require blacklight/blacklight' do
         "\n//= require bootstrap/scrollspy\n" \
         "\n//= require bootstrap/tab\n"

diff --git a/lib/generators/warclight/templates/catalog_controller.rb b/lib/generators/warclight/templates/catalog_controller.rb
@@ -16,7 +16,10 @@ class CatalogController < ApplicationController
 
     ## Default parameters to send to solr for all search-like requests. See also SearchBuilder#processed_parameters
     config.default_solr_params = {
-      rows: 10
+      rows: 10,
+      'q.alt': '*:*',
+      defType: 'edismax',
+      echoParams: 'explicit'
     }
 
     # solr field configuration for search results/index views
@@ -113,24 +116,20 @@ 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 'text', label: 'Text' do |field|
+    config.add_search_field 'text', label: 'All Text' do |field|
       field.include_in_simple_select = true
     end
 
     config.add_search_field 'title', label: 'Title' do |field|
-      field.qt = 'title_search'
-    end
-
-    config.add_search_field 'content', label: 'Content' do |field|
-      field.qt = 'content_search'
+      field.solr_parameters = { 'qf': 'title' }
     end
 
     config.add_search_field 'url', label: 'URL' do |field|
-      field.qt = 'url_search'
+      field.solr_parameters = { 'qf': 'url' }
     end
 
     config.add_search_field 'host', label: 'Host' do |field|
-      field.qt = 'host_search'
+      field.solr_parameters = { 'qf': 'host' }
     end
 
     # Field-based searches. We have registered handlers in the Solr configuration

diff --git a/solr/conf/elevate.xml b/solr/conf/elevate.xml
@@ -24,19 +24,15 @@
 
 -->
 <elevate>
- <!-- Query elevation examples
-  <query text="foo bar">
-    <doc id="1" />
-    <doc id="2" />
-    <doc id="3" />
-  </query>
-
-for use with techproducts example
+ <query text="foo bar">
+  <doc id="1" />
+  <doc id="2" />
+  <doc id="3" />
+ </query>
+
+ <query text="ipod">
+   <doc id="MA147LL/A" />  <!-- put the actual ipod at the top -->
+   <doc id="IW-02" exclude="true" /> <!-- exclude this cable -->
+ </query>
 
-  <query text="ipod">
-    <doc id="MA147LL/A" />  put the actual ipod at the top 
-    <doc id="IW-02" exclude="true" /> exclude this cable
-  </query>
--->
-
 </elevate>
diff --git a/solr/conf/lang/contractions_fr.txt b/solr/conf/lang/contractions_fr.txt
@@ -7,9 +7,3 @@ qu
 n
 s
 j
-d
-c
-jusqu
-quoiqu
-lorsqu
-puisqu
diff --git a/solr/conf/lang/stopwords_da.txt b/solr/conf/lang/stopwords_da.txt
@@ -4,8 +4,6 @@
  | Also see http://www.opensource.org/licenses/bsd-license.html
  |  - Encoding was converted to UTF-8.
  |  - This notice was added.
- |
- | NOTE: To use this file with StopFilterFactory, you must specify format="snowball"
 
  | A Danish stop word list. Comments begin with vertical bar. Each stop
  | word is at the start of a line.

diff --git a/solr/conf/lang/stopwords_de.txt b/solr/conf/lang/stopwords_de.txt
@@ -4,8 +4,6 @@
  | Also see http://www.opensource.org/licenses/bsd-license.html
  |  - Encoding was converted to UTF-8.
  |  - This notice was added.
- |
- | NOTE: To use this file with StopFilterFactory, you must specify format="snowball"
 
  | A German stop word list. Comments begin with vertical bar. Each stop
  | word is at the start of a line.

diff --git a/solr/conf/lang/stopwords_es.txt b/solr/conf/lang/stopwords_es.txt
@@ -4,8 +4,6 @@
  | Also see http://www.opensource.org/licenses/bsd-license.html
  |  - Encoding was converted to UTF-8.
  |  - This notice was added.
- |
- | NOTE: To use this file with StopFilterFactory, you must specify format="snowball"
 
  | A Spanish stop word list. Comments begin with vertical bar. Each stop
  | word is at the start of a line.

diff --git a/solr/conf/lang/stopwords_fi.txt b/solr/conf/lang/stopwords_fi.txt
@@ -4,8 +4,6 @@
  | Also see http://www.opensource.org/licenses/bsd-license.html
  |  - Encoding was converted to UTF-8.
  |  - This notice was added.
- |
- | NOTE: To use this file with StopFilterFactory, you must specify format="snowball"
 
 | forms of BE
 

diff --git a/solr/conf/lang/stopwords_fr.txt b/solr/conf/lang/stopwords_fr.txt
@@ -4,8 +4,6 @@
  | Also see http://www.opensource.org/licenses/bsd-license.html
  |  - Encoding was converted to UTF-8.
  |  - This notice was added.
- |
- | NOTE: To use this file with StopFilterFactory, you must specify format="snowball"
 
  | A French stop word list. Comments begin with vertical bar. Each stop
  | word is at the start of a line.
@@ -169,8 +167,7 @@ eussent
 
                | Later additions (from Jean-Christophe Deschamps)
 ceci           |  this
-cela           |  that
-celà           |  that
+celà           |  that
 cet            |  this
 cette          |  this
 ici            |  here

diff --git a/solr/conf/lang/stopwords_hu.txt b/solr/conf/lang/stopwords_hu.txt
@@ -4,8 +4,6 @@
  | Also see http://www.opensource.org/licenses/bsd-license.html
  |  - Encoding was converted to UTF-8.
  |  - This notice was added.
- |
- | NOTE: To use this file with StopFilterFactory, you must specify format="snowball"
 
 | Hungarian stop word list
 | prepared by Anna Tordai

diff --git a/solr/conf/lang/stopwords_it.txt b/solr/conf/lang/stopwords_it.txt
@@ -4,8 +4,6 @@
  | Also see http://www.opensource.org/licenses/bsd-license.html
  |  - Encoding was converted to UTF-8.
  |  - This notice was added.
- |
- | NOTE: To use this file with StopFilterFactory, you must specify format="snowball"
 
  | An Italian stop word list. Comments begin with vertical bar. Each stop
  | word is at the start of a line.

diff --git a/solr/conf/lang/stopwords_nl.txt b/solr/conf/lang/stopwords_nl.txt
@@ -4,8 +4,6 @@
  | Also see http://www.opensource.org/licenses/bsd-license.html
  |  - Encoding was converted to UTF-8.
  |  - This notice was added.
- |
- | NOTE: To use this file with StopFilterFactory, you must specify format="snowball"
 
  | A Dutch stop word list. Comments begin with vertical bar. Each stop
  | word is at the start of a line.

diff --git a/solr/conf/lang/stopwords_no.txt b/solr/conf/lang/stopwords_no.txt
@@ -4,8 +4,6 @@
  | Also see http://www.opensource.org/licenses/bsd-license.html
  |  - Encoding was converted to UTF-8.
  |  - This notice was added.
- |
- | NOTE: To use this file with StopFilterFactory, you must specify format="snowball"
 
  | A Norwegian stop word list. Comments begin with vertical bar. Each stop
  | word is at the start of a line.

diff --git a/solr/conf/lang/stopwords_pt.txt b/solr/conf/lang/stopwords_pt.txt
@@ -4,8 +4,6 @@
  | Also see http://www.opensource.org/licenses/bsd-license.html
  |  - Encoding was converted to UTF-8.
  |  - This notice was added.
- |
- | NOTE: To use this file with StopFilterFactory, you must specify format="snowball"
 
  | A Portuguese stop word list. Comments begin with vertical bar. Each stop
  | word is at the start of a line.

diff --git a/solr/conf/lang/stopwords_ru.txt b/solr/conf/lang/stopwords_ru.txt
@@ -4,8 +4,6 @@
  | Also see http://www.opensource.org/licenses/bsd-license.html
  |  - Encoding was converted to UTF-8.
  |  - This notice was added.
- |
- | NOTE: To use this file with StopFilterFactory, you must specify format="snowball"
 
  | a russian stop word list. comments begin with vertical bar. each stop
  | word is at the start of a line.

diff --git a/solr/conf/lang/stopwords_sv.txt b/solr/conf/lang/stopwords_sv.txt
@@ -4,8 +4,6 @@
  | Also see http://www.opensource.org/licenses/bsd-license.html
  |  - Encoding was converted to UTF-8.
  |  - This notice was added.
- |
- | NOTE: To use this file with StopFilterFactory, you must specify format="snowball"
 
  | A Swedish stop word list. Comments begin with vertical bar. Each stop
  | word is at the start of a line.
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,9 +7,3 @@ qu @@
     n
     s
     j
-    d
-    c
-    jusqu
-    quoiqu
-    lorsqu
-    puisqu