diff --git a/.ruby-version b/.ruby-version deleted file mode 100644 index 68e042f..0000000 --- a/.ruby-version +++ /dev/null @@ -1 +0,0 @@ -ruby-2.7.0 \ No newline at end of file diff --git a/Gemfile b/Gemfile index ceddd1a..56e273c 100644 --- a/Gemfile +++ b/Gemfile @@ -1,78 +1,67 @@ -source 'https://rubygems.org' +# frozen_string_literal: true +# Attempts to determine if a global gem source has ready been added by another Gemfile +if @sources.global_rubygems_source == Bundler::SourceList.new.global_rubygems_source + Bundler.ui.info '[TestApp] Adding global rubygems source.' + source 'https://rubygems.org' +else + Bundler.ui.info "[TestApp] Global rubygems source already set: #{@sources.global_rubygems_source.inspect}" +end git_source(:github) { |repo| "https://github.com/#{repo}.git" } -# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '~> 5.2.4', '>= 5.2.4.3' -# Use sqlite3 as the database for Active Record -gem "sqlite3", "~> 1.3.0" -# Use Puma as the app server -gem 'puma', '~> 3.11' -# Use SCSS for stylesheets -gem 'sass-rails', '~> 5.0' -# Use Uglifier as compressor for JavaScript assets -gem 'uglifier', '>= 1.3.0' -# See https://github.com/rails/execjs#readme for more supported runtimes -# gem 'mini_racer', platforms: :ruby - -# Use CoffeeScript for .coffee assets and views -gem 'coffee-rails', '~> 4.2' -# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks -gem 'turbolinks', '~> 5' -# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder -gem 'jbuilder', '~> 2.5' -# Use Redis adapter to run Action Cable in production -# gem 'redis', '~> 4.0' -# Use ActiveModel has_secure_password -# gem 'bcrypt', '~> 3.1.7' - -# Use ActiveStorage variant -# gem 'mini_magick', '~> 4.8' - -# Use Capistrano for deployment -# gem 'capistrano-rails', group: :development - -# Reduces boot times through caching; required in config/boot.rb +gem 'addressable', '2.8.1' # remove once https://github.com/postrank-labs/postrank-uri/issues/49 is fixed +gem 'sqlite3', '~> 1.4' gem 'bootsnap', '>= 1.1.0', require: false +gem 'bootstrap', '~> 4.0' +gem 'clamby', '~> 1.6' +gem 'coffee-rails', '~> 4.2' +gem 'dalli' +gem 'devise' +gem 'devise-guests', '~> 0.8' -group :development, :test do - # Call 'byebug' anywhere in the code to stop execution and get a debugger console - gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] -end +# Required because grpc and google-protobuf gem's binaries are not compatible with Alpine Linux. +# To install the package in Alpine: `apk add ruby-grpc` +# The pinned versions should match the version provided by the Alpine packages. -group :development do - # Access an interactive console on exception pages or by calling 'console' anywhere in the code. - # gem 'web-console', '>= 3.3.0' - gem 'listen', '>= 3.0.5', '< 3.2' - # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring - gem 'spring' - gem 'spring-watcher-listen', '~> 2.0.0' -end -group :test do - # Adds support for Capybara system testing and selenium driver - gem 'capybara', '>= 2.15' - gem 'selenium-webdriver' - # Easy installation and use of chromedriver to run system tests with Chrome - gem 'webdrivers', '~> 4.0' +if RUBY_PLATFORM =~ /musl/ +# # Disabled due to dependency mismatches in Alpine packages (grpc 1.62.1 needs protobuf ~> 3.25) +# path '/usr/lib/ruby/gems/3.3.0' do + gem 'google-protobuf', force_ruby_platform: true + gem 'grpc', force_ruby_platform: true +# end end -# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'hydra-role-management' +gem 'hyrax', '~> 5.2.0' +gem 'jbuilder', '~> 2.5' +gem 'jquery-rails' +gem 'okcomputer' +gem 'pg', '~> 1.3' +gem 'puma' +gem 'rack-mini-profiler', require: ['prepend_net_http_patch'] +gem 'rails', '6.1.7.10' +gem 'riiif', '~> 2.1' +gem 'rsolr', '>= 1.0', '< 3' +gem 'sass-rails', '~> 6.0' +gem 'sidekiq', '~> 7.0' +gem 'stackprof', require: false +gem 'turbolinks', '~> 5' +gem 'twitter-typeahead-rails', '0.11.1.pre.corejavascript' gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] +gem 'uglifier', '>= 1.3.0' +gem 'activerecord-nulldb-adapter', '~> 1.1' -gem 'hyrax', '~> 2.9' -group :development, :test do - gem 'solr_wrapper', '>= 0.3' +group :development do + gem 'better_errors' # add command line in browser when errors + gem 'binding_of_caller' # deeper stack trace used by better errors + + # Access an interactive console on exception pages or by calling 'console' anywhere in the code. + gem 'web-console', '>= 3.3.0' end -gem 'rsolr', '>= 1.0', '< 3' -gem 'bootstrap-sass', '~> 3.0' -gem 'twitter-typeahead-rails', '0.11.1.pre.corejavascript' -gem 'jquery-rails' -gem 'devise' -gem 'devise-guests', '~> 0.6' group :development, :test do - gem 'fcrepo_wrapper' - gem 'rspec-rails' + gem 'debug', '>= 1.0.0' + gem 'pry-doc' + gem 'pry-rails' + gem 'pry-rescue' end - -gem 'riiif', '~> 2.0' diff --git a/Rakefile b/Rakefile index 87de0d3..e85f913 100644 --- a/Rakefile +++ b/Rakefile @@ -4,5 +4,3 @@ require_relative 'config/application' Rails.application.load_tasks - -require 'solr_wrapper/rake_task' unless Rails.env.production? diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 8b869ca..26736ce 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -2,7 +2,6 @@ class ApplicationController < ActionController::Base helper Openseadragon::OpenseadragonHelper # Adds a few additional behaviors into the application controller include Blacklight::Controller - skip_after_action :discard_flash_if_xhr include Hydra::Controller::ControllerBehavior # Adds Hyrax behaviors into the application controller diff --git a/app/models/search_builder.rb b/app/models/search_builder.rb index c896985..c9a3a71 100644 --- a/app/models/search_builder.rb +++ b/app/models/search_builder.rb @@ -2,7 +2,6 @@ class SearchBuilder < Blacklight::SearchBuilder include Blacklight::Solr::SearchBuilderBehavior # Add a filter query to restrict the search to documents the current user has access to - include Hydra::AccessControlsEnforcement include Hyrax::SearchFilters diff --git a/app/models/user.rb b/app/models/user.rb index 323b5cc..dcf9c1c 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -5,11 +5,6 @@ class User < ApplicationRecord include Hyrax::User include Hyrax::UserUsageStats - - - if Blacklight::Utils.needs_attr_accessible? - attr_accessible :email, :password, :password_confirmation - end # Connects this user object to Blacklights Bookmarks. include Blacklight::User # Include default devise modules. Others available are: diff --git a/config/blacklight.yml b/config/blacklight.yml index ef16b4c..0a7266e 100644 --- a/config/blacklight.yml +++ b/config/blacklight.yml @@ -1,9 +1,9 @@ development: adapter: solr - url: <%= ENV['SOLR_DEVELOPMENT_URL'] || "http://127.0.0.1:#{ENV.fetch('SOLR_DEVELOPMENT_PORT', 8983)}/solr/hydra-development" %> + url: <%= ENV['SOLR_URL'] || "http://127.0.0.1:#{ENV.fetch('SOLR_DEVELOPMENT_PORT', 8983)}/solr/hyrax-development" %> test: &test adapter: solr - url: <%= ENV['SOLR_TEST_URL'] || "http://127.0.0.1:#{ENV.fetch('SOLR_TEST_PORT', 8985)}/solr/hydra-test" %> + url: <%= ENV['SOLR_URL'] || "http://127.0.0.1:#{ENV.fetch('SOLR_TEST_PORT', 8985)}/solr/hyrax-test" %> production: adapter: solr url: <%= ENV['SOLR_URL'] || "http://127.0.0.1:8983/solr/blacklight-core" %> diff --git a/config/environments/test.rb b/config/environments/test.rb index 9e91d6b..fc57de4 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -1,3 +1,5 @@ +require_relative '../../app/middleware/disable_animations_in_test_environment' + Rails.application.configure do config.middleware.use DisableAnimationsInTestEnvironment # Settings specified here will take precedence over those in config/application.rb. diff --git a/config/initializers/riiif.rb b/config/initializers/riiif.rb index e64daf6..9b7328e 100644 --- a/config/initializers/riiif.rb +++ b/config/initializers/riiif.rb @@ -18,7 +18,7 @@ end end -Riiif::Image.authorization_service = Hyrax::IIIFAuthorizationService +Riiif::Image.authorization_service = Hyrax::IiifAuthorizationService Riiif.not_found_image = Rails.root.join('app', 'assets', 'images', 'us_404.svg') Riiif.unauthorized_image = Rails.root.join('app', 'assets', 'images', 'us_404.svg') diff --git a/config/solr.yml b/config/solr.yml index 38b3dee..b7dac4f 100644 --- a/config/solr.yml +++ b/config/solr.yml @@ -1,7 +1,7 @@ # This is a sample config file that points to a solr server for each environment development: - url: <%= ENV['SOLR_DEVELOPMENT_URL'] || "http://127.0.0.1:#{ENV.fetch('SOLR_DEVELOPMENT_PORT', 8983)}/solr/hydra-development" %> + url: <%= ENV['SOLR_URL'] || "http://127.0.0.1:#{ENV.fetch('SOLR_DEVELOPMENT_PORT', 8983)}/solr/hyrax-development" %> test: - url: <%= ENV['SOLR_TEST_URL'] || "http://127.0.0.1:#{ENV.fetch('SOLR_TEST_PORT', 8985)}/solr/hydra-test" %> + url: <%= ENV['SOLR_URL'] || "http://127.0.0.1:#{ENV.fetch('SOLR_TEST_PORT', 8985)}/solr/hyrax-test" %> production: url: <%= ENV['SOLR_URL'] || "http://your.production.server:8080/bl_solr/core0" %> diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..819c148 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,44 @@ +version: "3.8" + +services: + fedora: + image: ghcr.io/samvera/fcrepo4:4.7.5 + ports: + - "8986:8080" # Test port + volumes: + - fedora_data:/opt/fcrepo/data + environment: + - CATALINA_OPTS=-Djava.awt.headless=true -Dfile.encoding=UTF-8 -server -Xms512m -Xmx1024m -XX:NewSize=256m -XX:MaxNewSize=256m -XX:PermSize=256m -XX:MaxPermSize=256m -XX:+DisableExplicitGC + healthcheck: + test: ["CMD", "curl", "-f", "http://localhost:8080/fcrepo/rest"] + interval: 30s + timeout: 10s + retries: 5 + + solr: + image: solr:9.9 + ports: + - "8985:8983" # Test port + volumes: + - solr_data:/var/solr:cached + - ./spec/internal_test_hyrax/solr/conf:/opt/solr/server/configsets/hyraxconf + command: + - sh + - -c + - "precreate-core hyrax-test /opt/solr/server/configsets/hyraxconf; solr-precreate hyrax /opt/solr/server/configsets/hyraxconf" + ulimits: + nofile: + soft: 65536 + hard: 524288 + environment: + - SOLR_CORE_CONF_DIR=/opt/solr/server/configsets/hyraxconf + - SOLR_MODULES=analysis-extras,extraction + healthcheck: + test: ["CMD", "curl", "-f", "http://localhost:8983/solr/admin/cores"] + interval: 30s + timeout: 10s + retries: 5 + +volumes: + fedora_data: + solr_data: diff --git a/solr/conf/admin-extra.html b/solr/conf/admin-extra.html deleted file mode 100644 index 21b5090..0000000 --- a/solr/conf/admin-extra.html +++ /dev/null @@ -1,31 +0,0 @@ - - - diff --git a/solr/conf/elevate.xml b/solr/conf/elevate.xml deleted file mode 100644 index b91e75c..0000000 --- a/solr/conf/elevate.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/solr/conf/protwords.txt b/solr/conf/protwords.txt deleted file mode 100644 index 5a32e50..0000000 --- a/solr/conf/protwords.txt +++ /dev/null @@ -1,21 +0,0 @@ -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -#----------------------------------------------------------------------- -# Use a protected word file to protect against the stemmer reducing two -# unrelated words to the same base word. - -# Some non-words that normally won't be encountered, -# just to test that they won't be stemmed. -dontstems -zwhacky - diff --git a/solr/conf/schema.xml b/solr/conf/schema.xml index ad6bda5..19697ec 100644 --- a/solr/conf/schema.xml +++ b/solr/conf/schema.xml @@ -45,497 +45,290 @@ that avoids logging every request --> - + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - + + + + + - + - The optional positionIncrementGap puts space between multiple fields of - this type on the same document, with the purpose of preventing false phrase - matching across fields. + + - For more info on customizing your analyzer chain, please see - http://wiki.apache.org/solr/AnalyzersTokenizersTokenFilters - --> - - - - - - - - - + + - --> + - - - - - - - - - - - + + + + + + - + - + - - - - - - - - - - - - - - - - + + - --> + + - - + + - - - - - - + - - - - - - + - - - - - - - - - - - - - - - - - + + - - - + - - - + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + Another way to map multiple source fields to the same + destination field is to use the dynamic field syntax. + copyField also supports a maxChars to copy setting. --> + + + + - diff --git a/solr/conf/solrconfig.xml b/solr/conf/solrconfig.xml index eba6cc9..8c75d49 100644 --- a/solr/conf/solrconfig.xml +++ b/solr/conf/solrconfig.xml @@ -16,26 +16,12 @@ limitations under the License. --> - - - 5.0.0 - - - - - + @@ -43,187 +29,76 @@ ${solr.blacklight-core.data.dir:} - + - + - + - + *:* - - - dismax + edismax explicit - 10 - *:* 2<-1 5<-2 6<90% + 1 + 2 + 0.01 + + id + title_tesim + author_tesim + subject_tesim + + + all_text_timv^10 + - - - - title_unstem_search^100000 - subtitle_unstem_search^50000 - title_t^25000 - subtitle_t^10000 - title_addl_unstem_search^5000 - title_addl_t^2500 - title_added_entry_unstem_search^1500 - title_added_entry_t^1250 - subject_topic_unstem_search^1000 - subject_unstem_search^750 - subject_topic_facet^625 - subject_t^500 - author_unstem_search^250 - author_addl_unstem_search^250 - author_t^100 - author_addl_t^50 - subject_addl_unstem_search^250 - subject_addl_t^50 - title_series_unstem_search^25 - title_series_t^10 - isbn_t - text - - - title_unstem_search^1000000 - subtitle_unstem_search^500000 - title_t^250000 - subtitle_t^100000 - title_addl_unstem_search^50000 - title_addl_t^25000 - title_added_entry_unstem_search^15000 - title_added_entry_t^12500 - subject_topic_unstem_search^10000 - subject_unstem_search^7500 - subject_topic_facet^6250 - subject_t^5000 - author_unstem_search^2500 - author_addl_unstem_search^2500 - author_t^1000 - author_addl_t^500 - subject_addl_unstem_search^2500 - subject_addl_t^500 - title_series_unstem_search^250 - title_series_t^100 - text^10 - - author_unstem_search^200 - author_addl_unstem_search^50 - author_t^20 - author_addl_t + author_tesim - author_unstem_search^2000 - author_addl_unstem_search^500 - author_t^200 - author_addl_t^10 - title_unstem_search^50000 - subtitle_unstem_search^25000 - title_addl_unstem_search^10000 - title_t^5000 - subtitle_t^2500 - title_addl_t^100 - title_added_entry_unstem_search^50 - title_added_entry_t^10 - title_series_unstem_search^5 - title_series_t + title_tesim - title_unstem_search^500000 - subtitle_unstem_search^250000 - title_addl_unstem_search^100000 - title_t^50000 - subtitle_t^25000 - title_addl_t^1000 - title_added_entry_unstem_search^500 - title_added_entry_t^100 - title_series_t^50 - title_series_unstem_search^10 - subject_topic_unstem_search^200 - subject_unstem_search^125 - subject_topic_facet^100 - subject_t^50 - subject_addl_unstem_search^10 - subject_addl_t + subject_tesim - subject_topic_unstem_search^2000 - subject_unstem_search^1250 - subject_t^1000 - subject_topic_facet^500 - subject_addl_unstem_search^100 - subject_addl_t^10 - - 3 - 0.01 - - id, - score, - author_display, - author_vern_display, - format, - isbn_t, - language_facet, - lc_callnum_display, - material_type_display, - published_display, - published_vern_display, - pub_date, - title_display, - title_vern_display, - subject_topic_facet, - subject_geo_facet, - subject_era_facet, - subtitle_display, - subtitle_vern_display, - url_fulltext_display, - url_suppl_display, + *, + score true 1 - format - lc_1letter_facet - lc_alpha_facet - lc_b4cutter_facet - language_facet - pub_date - subject_era_facet - subject_geo_facet - subject_topic_facet - + true default true @@ -232,62 +107,39 @@ 5 - - - - - - - spellcheck - + + + + + off + all + 1 + {!raw f=id v=$id} + + id, + access_ssim, + discover_access_group_ssim,discover_access_person_ssim, + read_access_group_ssim,read_access_person_ssim, + edit_access_group_ssim,edit_access_person_ssim, + depositor_ti, + embargo_release_date_dtsi + inheritable_access_ssim, + inheritable_discover_access_group_ssim,inheritable_discover_access_person_ssim, + inheritable_read_access_group_ssim,inheritable_read_access_person_ssim, + inheritable_edit_access_group_ssim,inheritable_edit_access_person_ssim, + inheritable_embargo_release_date_dtsi + + + + + + + explicit + lucene + @@ -300,24 +152,19 @@ - - textSpell - - - - default spell @@ -345,67 +192,12 @@ 0.7 true - - - - - - - - - - - - mySuggester - FuzzyLookupFactory - textSuggest - true - suggest - - - - + - true - 5 - mySuggester + last_modified + ignored_ - - suggest - - - diff --git a/solr/conf/spellings.txt b/solr/conf/spellings.txt deleted file mode 100644 index 765190a..0000000 --- a/solr/conf/spellings.txt +++ /dev/null @@ -1,2 +0,0 @@ -pizza -history diff --git a/solr/conf/synonyms.txt b/solr/conf/synonyms.txt deleted file mode 100644 index 453eb31..0000000 --- a/solr/conf/synonyms.txt +++ /dev/null @@ -1,31 +0,0 @@ -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -#----------------------------------------------------------------------- -#some test synonym mappings unlikely to appear in real input text -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma - diff --git a/solr/config/_rest_managed.json b/solr/config/_rest_managed.json deleted file mode 100644 index e7ada3f..0000000 --- a/solr/config/_rest_managed.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "initArgs":{}, - "managedList":[]} \ No newline at end of file diff --git a/solr/config/admin-extra.html b/solr/config/admin-extra.html deleted file mode 100644 index 21b5090..0000000 --- a/solr/config/admin-extra.html +++ /dev/null @@ -1,31 +0,0 @@ - - - diff --git a/solr/config/elevate.xml b/solr/config/elevate.xml deleted file mode 100644 index b91e75c..0000000 --- a/solr/config/elevate.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/solr/config/mapping-ISOLatin1Accent.txt b/solr/config/mapping-ISOLatin1Accent.txt deleted file mode 100644 index 186ca31..0000000 --- a/solr/config/mapping-ISOLatin1Accent.txt +++ /dev/null @@ -1,246 +0,0 @@ -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Syntax: -# "source" => "target" -# "source".length() > 0 (source cannot be empty.) -# "target".length() >= 0 (target can be empty.) - -# example: -# "??" => "A" -# "\u00C0" => "A" -# "\u00C0" => "\u0041" -# "??" => "ss" -# "\t" => " " -# "\n" => "" - -# ?? => A -"\u00C0" => "A" - -# ?? => A -"\u00C1" => "A" - -# ?? => A -"\u00C2" => "A" - -# ?? => A -"\u00C3" => "A" - -# ?? => A -"\u00C4" => "A" - -# ?? => A -"\u00C5" => "A" - -# ?? => AE -"\u00C6" => "AE" - -# ?? => C -"\u00C7" => "C" - -# ?? => E -"\u00C8" => "E" - -# ?? => E -"\u00C9" => "E" - -# ?? => E -"\u00CA" => "E" - -# ?? => E -"\u00CB" => "E" - -# ?? => I -"\u00CC" => "I" - -# ?? => I -"\u00CD" => "I" - -# ?? => I -"\u00CE" => "I" - -# ?? => I -"\u00CF" => "I" - -# ?? => IJ -"\u0132" => "IJ" - -# ?? => D -"\u00D0" => "D" - -# ?? => N -"\u00D1" => "N" - -# ?? => O -"\u00D2" => "O" - -# ?? => O -"\u00D3" => "O" - -# ?? => O -"\u00D4" => "O" - -# ?? => O -"\u00D5" => "O" - -# ?? => O -"\u00D6" => "O" - -# ?? => O -"\u00D8" => "O" - -# ?? => OE -"\u0152" => "OE" - -# ?? -"\u00DE" => "TH" - -# ?? => U -"\u00D9" => "U" - -# ?? => U -"\u00DA" => "U" - -# ?? => U -"\u00DB" => "U" - -# ?? => U -"\u00DC" => "U" - -# ?? => Y -"\u00DD" => "Y" - -# ?? => Y -"\u0178" => "Y" - -# ?? => a -"\u00E0" => "a" - -# ?? => a -"\u00E1" => "a" - -# ?? => a -"\u00E2" => "a" - -# ?? => a -"\u00E3" => "a" - -# ?? => a -"\u00E4" => "a" - -# ?? => a -"\u00E5" => "a" - -# ?? => ae -"\u00E6" => "ae" - -# ?? => c -"\u00E7" => "c" - -# ?? => e -"\u00E8" => "e" - -# ?? => e -"\u00E9" => "e" - -# ?? => e -"\u00EA" => "e" - -# ?? => e -"\u00EB" => "e" - -# ?? => i -"\u00EC" => "i" - -# ?? => i -"\u00ED" => "i" - -# ?? => i -"\u00EE" => "i" - -# ?? => i -"\u00EF" => "i" - -# ?? => ij -"\u0133" => "ij" - -# ?? => d -"\u00F0" => "d" - -# ?? => n -"\u00F1" => "n" - -# ?? => o -"\u00F2" => "o" - -# ?? => o -"\u00F3" => "o" - -# ?? => o -"\u00F4" => "o" - -# ?? => o -"\u00F5" => "o" - -# ?? => o -"\u00F6" => "o" - -# ?? => o -"\u00F8" => "o" - -# ?? => oe -"\u0153" => "oe" - -# ?? => ss -"\u00DF" => "ss" - -# ?? => th -"\u00FE" => "th" - -# ?? => u -"\u00F9" => "u" - -# ?? => u -"\u00FA" => "u" - -# ?? => u -"\u00FB" => "u" - -# ?? => u -"\u00FC" => "u" - -# ?? => y -"\u00FD" => "y" - -# ?? => y -"\u00FF" => "y" - -# ??? => ff -"\uFB00" => "ff" - -# ??? => fi -"\uFB01" => "fi" - -# ??? => fl -"\uFB02" => "fl" - -# ??? => ffi -"\uFB03" => "ffi" - -# ??? => ffl -"\uFB04" => "ffl" - -# ??? => ft -"\uFB05" => "ft" - -# ??? => st -"\uFB06" => "st" diff --git a/solr/config/protwords.txt b/solr/config/protwords.txt deleted file mode 100644 index 5a32e50..0000000 --- a/solr/config/protwords.txt +++ /dev/null @@ -1,21 +0,0 @@ -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -#----------------------------------------------------------------------- -# Use a protected word file to protect against the stemmer reducing two -# unrelated words to the same base word. - -# Some non-words that normally won't be encountered, -# just to test that they won't be stemmed. -dontstems -zwhacky - diff --git a/solr/config/schema.xml b/solr/config/schema.xml deleted file mode 100644 index f5895a0..0000000 --- a/solr/config/schema.xml +++ /dev/null @@ -1,367 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - id - - - - - - - - - - - - - - - - - diff --git a/solr/config/scripts.conf b/solr/config/scripts.conf deleted file mode 100644 index f58b262..0000000 --- a/solr/config/scripts.conf +++ /dev/null @@ -1,24 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -user= -solr_hostname=localhost -solr_port=8983 -rsyncd_port=18983 -data_dir= -webapp_name=solr -master_host= -master_data_dir= -master_status_dir= diff --git a/solr/config/solrconfig.xml b/solr/config/solrconfig.xml deleted file mode 100644 index 8aadbef..0000000 --- a/solr/config/solrconfig.xml +++ /dev/null @@ -1,325 +0,0 @@ - - - - - - - - 5.0.0 - - - - - - - - - - - - - - - ${solr.blacklight-core.data.dir:} - - - - - - - - - - *:* - - - - - ${solr.ulog.dir:} - - - - ${solr.autoCommit.maxTime:15000} - false - - - - ${solr.autoSoftCommit.maxTime:-1} - - - - - - - - edismax - explicit - *:* - 2<-1 5<-2 6<90% - 1 - 2 - 0.01 - - - id - title_tesim - author_tesim - subject_tesim - - - all_text_timv^10 - - - - author_tesim - - - - - title_tesim - - - - - subject_tesim - - - - - - *, - score - - - true - 1 - - true - default - true - true - false - 5 - - - - spellcheck - - - - - - off - all - 1 - {!raw f=id v=$id} - - id, - access_ssim, - discover_access_group_ssim,discover_access_person_ssim, - read_access_group_ssim,read_access_person_ssim, - edit_access_group_ssim,edit_access_person_ssim, - depositor_ti, - embargo_release_date_dtsi - inheritable_access_ssim, - inheritable_discover_access_group_ssim,inheritable_discover_access_person_ssim, - inheritable_read_access_group_ssim,inheritable_read_access_person_ssim, - inheritable_edit_access_group_ssim,inheritable_edit_access_person_ssim, - inheritable_embargo_release_date_dtsi - - - - - - - explicit - lucene - - - - - - - all - * - 1 - {!term f=id v=$id} - - - - - - - - true - - - termsComponent - - - - - - - textSpell - - - - - - default - spell - ./spell - true - - - author - author_spell - ./spell_author - 0.7 - true - - - subject - subject_spell - ./spell_subject - 0.7 - true - - - title - title_spell - ./spell_title - 0.7 - true - - - - - - - - - - - - - - - - - - last_modified - ignored_ - - - - - - - - - - diff --git a/solr/config/spellings.txt b/solr/config/spellings.txt deleted file mode 100644 index 765190a..0000000 --- a/solr/config/spellings.txt +++ /dev/null @@ -1,2 +0,0 @@ -pizza -history diff --git a/solr/config/stopwords.txt b/solr/config/stopwords.txt deleted file mode 100644 index 22f277f..0000000 --- a/solr/config/stopwords.txt +++ /dev/null @@ -1,58 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -#----------------------------------------------------------------------- -# a couple of test stopwords to test that the words are really being -# configured from this file: -stopworda -stopwordb - -#Standard english stop words taken from Lucene's StopAnalyzer -a -an -and -are -as -at -be -but -by -for -if -in -into -is -it -no -not -of -on -or -s -such -t -that -the -their -then -there -these -they -this -to -was -will -with - diff --git a/solr/config/stopwords_en.txt b/solr/config/stopwords_en.txt deleted file mode 100644 index 22f277f..0000000 --- a/solr/config/stopwords_en.txt +++ /dev/null @@ -1,58 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -#----------------------------------------------------------------------- -# a couple of test stopwords to test that the words are really being -# configured from this file: -stopworda -stopwordb - -#Standard english stop words taken from Lucene's StopAnalyzer -a -an -and -are -as -at -be -but -by -for -if -in -into -is -it -no -not -of -on -or -s -such -t -that -the -their -then -there -these -they -this -to -was -will -with - diff --git a/solr/config/synonyms.txt b/solr/config/synonyms.txt deleted file mode 100644 index 453eb31..0000000 --- a/solr/config/synonyms.txt +++ /dev/null @@ -1,31 +0,0 @@ -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -#----------------------------------------------------------------------- -#some test synonym mappings unlikely to appear in real input text -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma - diff --git a/solr/config/xslt/example.xsl b/solr/config/xslt/example.xsl deleted file mode 100644 index ff7cae7..0000000 --- a/solr/config/xslt/example.xsl +++ /dev/null @@ -1,132 +0,0 @@ - - - - - - - - - - - - - - - <xsl:value-of select="$title"/> - - - -

-
- This has been formatted by the sample "example.xsl" transform - - use your own XSLT to get a nicer page -
- - - - - - - -
- - - - -
-
- - - - - - - - - - - - - - - javascript:toggle("");? -
- - exp - - - - - - - - - - - - - - - - -
    - -
    • -     -
- - - - - - - - - - - - - - - - - - - - - - - - diff --git a/solr/config/xslt/example_atom.xsl b/solr/config/xslt/example_atom.xsl deleted file mode 100644 index dbc7afa..0000000 --- a/solr/config/xslt/example_atom.xsl +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - Example Solr Atom 1.0 Feed - - This has been formatted by the sample "example_atom.xsl" transform - - use your own XSLT to get a nicer Atom feed. - - - Apache Solr - solr-user@lucene.apache.org - - - - - - tag:localhost,2007:example - - - - - - - - - <xsl:value-of select="str[@name='name']"/> - - tag:localhost,2007: - - - - - - diff --git a/solr/config/xslt/example_rss.xsl b/solr/config/xslt/example_rss.xsl deleted file mode 100644 index b5bd0cf..0000000 --- a/solr/config/xslt/example_rss.xsl +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - Example Solr RSS 2.0 Feed - http://localhost:8983/solr - - This has been formatted by the sample "example_rss.xsl" transform - - use your own XSLT to get a nicer RSS feed. - - en-us - http://localhost:8983/solr - - - - - - - - - - - <xsl:value-of select="str[@name='name']"/> - - http://localhost:8983/solr/select?q=id: - - - - - - - http://localhost:8983/solr/select?q=id: - - - - diff --git a/solr/config/xslt/luke.xsl b/solr/config/xslt/luke.xsl deleted file mode 100644 index d3f71c6..0000000 --- a/solr/config/xslt/luke.xsl +++ /dev/null @@ -1,337 +0,0 @@ - - - - - - - - - Solr Luke Request Handler Response - - - - - - - - - <xsl:value-of select="$title"/> - - - - - -

- -

-
- -
- -

Index Statistics

- - - -

Field Statistics

- - - -

Document statistics

- - - - - - - - - - -
- -
- - - - -
- -
- - - - - - - - - - - - - - - - - - - - - - - -
-

- -

- -
- -
- - - - -
- - 50 - 800 - 160 - blue - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- background-color: ; width: px; height: px; -
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - -
  • - -
    • -     -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -