From aeb428035c35795533f6eb1bfc8652060b94a218 Mon Sep 17 00:00:00 2001 From: Joe Atzberger Date: Fri, 25 Mar 2016 10:54:00 -0700 Subject: [PATCH 1/2] Solr/Fedora Wrapper Ported over from the similar update to hydra-derivatives. s --- .gitignore | 3 +- .travis.yml | 3 +- Rakefile | 12 +- hydra-editor.gemspec | 3 +- solr/config/_rest_managed.json | 3 + solr/config/admin-extra.html | 31 ++ solr/config/elevate.xml | 36 +++ solr/config/mapping-ISOLatin1Accent.txt | 246 ++++++++++++++++ solr/config/protwords.txt | 21 ++ solr/config/schema.xml | 372 ++++++++++++++++++++++++ solr/config/scripts.conf | 24 ++ solr/config/solrconfig.xml | 297 +++++++++++++++++++ solr/config/spellings.txt | 2 + solr/config/stopwords.txt | 58 ++++ solr/config/stopwords_en.txt | 58 ++++ solr/config/synonyms.txt | 31 ++ solr/config/xslt/example.xsl | 132 +++++++++ solr/config/xslt/example_atom.xsl | 67 +++++ solr/config/xslt/example_rss.xsl | 66 +++++ solr/config/xslt/luke.xsl | 337 +++++++++++++++++++++ 20 files changed, 1793 insertions(+), 9 deletions(-) create mode 100644 solr/config/_rest_managed.json create mode 100644 solr/config/admin-extra.html create mode 100644 solr/config/elevate.xml create mode 100644 solr/config/mapping-ISOLatin1Accent.txt create mode 100644 solr/config/protwords.txt create mode 100644 solr/config/schema.xml create mode 100644 solr/config/scripts.conf create mode 100644 solr/config/solrconfig.xml create mode 100644 solr/config/spellings.txt create mode 100644 solr/config/stopwords.txt create mode 100644 solr/config/stopwords_en.txt create mode 100644 solr/config/synonyms.txt create mode 100644 solr/config/xslt/example.xsl create mode 100644 solr/config/xslt/example_atom.xsl create mode 100644 solr/config/xslt/example_rss.xsl create mode 100644 solr/config/xslt/luke.xsl diff --git a/.gitignore b/.gitignore index abb4c0a..1724f0a 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ log/*.log pkg/ .internal_test_app Gemfile.lock - +fcrepo4-data/ +fcrepo4-test-data/ jetty/ tmp/ diff --git a/.travis.yml b/.travis.yml index e72b91a..d25510d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,8 @@ language: ruby sudo: false rvm: - 2.2 - +jdk: + - oraclejdk8 env: matrix: - "RAILS_VERSION=4.2.5" diff --git a/Rakefile b/Rakefile index 029ae89..5bdcf53 100644 --- a/Rakefile +++ b/Rakefile @@ -25,15 +25,15 @@ Bundler::GemHelper.install_tasks require 'rspec/core/rake_task' RSpec::Core::RakeTask.new(:spec) -require 'jettywrapper' -Jettywrapper.hydra_jetty_version = "v8.1.1" - +require 'solr_wrapper/rake_task' +require 'fcrepo_wrapper' +require 'active_fedora/rake_support' require 'engine_cart/rake_task' -task ci: ['engine_cart:generate', 'jetty:clean'] do +desc 'Continuous Integration' +task ci: ['engine_cart:generate'] do ENV['environment'] = "test" - jetty_params = Jettywrapper.load_config - error = Jettywrapper.wrap(jetty_params) do + with_test_server do Rake::Task['spec'].invoke end end diff --git a/hydra-editor.gemspec b/hydra-editor.gemspec index 03b8677..a2855f7 100644 --- a/hydra-editor.gemspec +++ b/hydra-editor.gemspec @@ -27,5 +27,6 @@ Gem::Specification.new do |s| s.add_development_dependency "devise", '~> 3.4' s.add_development_dependency "hydra-head", '~> 9.0' s.add_development_dependency "engine_cart", '0.8.0' - s.add_development_dependency "jettywrapper", '~> 2.0' + s.add_development_dependency 'solr_wrapper', '~> 0.4' + s.add_development_dependency 'fcrepo_wrapper', '~> 0.2' end diff --git a/solr/config/_rest_managed.json b/solr/config/_rest_managed.json new file mode 100644 index 0000000..e7ada3f --- /dev/null +++ b/solr/config/_rest_managed.json @@ -0,0 +1,3 @@ +{ + "initArgs":{}, + "managedList":[]} \ No newline at end of file diff --git a/solr/config/admin-extra.html b/solr/config/admin-extra.html new file mode 100644 index 0000000..aa739da --- /dev/null +++ b/solr/config/admin-extra.html @@ -0,0 +1,31 @@ + + + diff --git a/solr/config/elevate.xml b/solr/config/elevate.xml new file mode 100644 index 0000000..7630ebe --- /dev/null +++ b/solr/config/elevate.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + diff --git a/solr/config/mapping-ISOLatin1Accent.txt b/solr/config/mapping-ISOLatin1Accent.txt new file mode 100644 index 0000000..725b62c --- /dev/null +++ b/solr/config/mapping-ISOLatin1Accent.txt @@ -0,0 +1,246 @@ +# 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 new file mode 100644 index 0000000..1dfc0ab --- /dev/null +++ b/solr/config/protwords.txt @@ -0,0 +1,21 @@ +# 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 new file mode 100644 index 0000000..9fa17a9 --- /dev/null +++ b/solr/config/schema.xml @@ -0,0 +1,372 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id + + + + + + + + + + + + + + + + + + + + + + + diff --git a/solr/config/scripts.conf b/solr/config/scripts.conf new file mode 100644 index 0000000..f58b262 --- /dev/null +++ b/solr/config/scripts.conf @@ -0,0 +1,24 @@ +# 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 new file mode 100644 index 0000000..73cafe6 --- /dev/null +++ b/solr/config/solrconfig.xml @@ -0,0 +1,297 @@ + + + + + + + + 5.0.0 + + + + + + + + + + + + + + + ${solr.blacklight-core.data.dir:} + + + + + + + + + + *:* + + + + + + + edismax + explicit + *:* + 2<-1 5<-2 6<90% + 1 + 2 + 0.01 + + + id + active_fedora_model_ssi + 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} + + + + + + + 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 + + + + + + + + + + + + + + + mySuggester + FuzzyLookupFactory + textSuggest + true + suggest + + + + + + true + 5 + mySuggester + + + suggest + + + + + + last_modified + ignored_ + + + + + + + + + + diff --git a/solr/config/spellings.txt b/solr/config/spellings.txt new file mode 100644 index 0000000..162a044 --- /dev/null +++ b/solr/config/spellings.txt @@ -0,0 +1,2 @@ +pizza +history diff --git a/solr/config/stopwords.txt b/solr/config/stopwords.txt new file mode 100644 index 0000000..b5824da --- /dev/null +++ b/solr/config/stopwords.txt @@ -0,0 +1,58 @@ +# 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 new file mode 100644 index 0000000..b5824da --- /dev/null +++ b/solr/config/stopwords_en.txt @@ -0,0 +1,58 @@ +# 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 new file mode 100644 index 0000000..b0e31cb --- /dev/null +++ b/solr/config/synonyms.txt @@ -0,0 +1,31 @@ +# 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 new file mode 100644 index 0000000..6832a1d --- /dev/null +++ b/solr/config/xslt/example.xsl @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + <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 new file mode 100644 index 0000000..e1c7d5a --- /dev/null +++ b/solr/config/xslt/example_atom.xsl @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + 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 new file mode 100644 index 0000000..3e09e65 --- /dev/null +++ b/solr/config/xslt/example_rss.xsl @@ -0,0 +1,66 @@ + + + + + + + + + + + + + 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 new file mode 100644 index 0000000..6e9a064 --- /dev/null +++ b/solr/config/xslt/luke.xsl @@ -0,0 +1,337 @@ + + + + + + + + + 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 + + + + + + + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + + + + + + + + + + + + + + + + + From 83983af6bfe21ed18c6eb9b99b459c7b96502674 Mon Sep 17 00:00:00 2001 From: Joe Atzberger Date: Mon, 28 Mar 2016 16:47:03 -0700 Subject: [PATCH 2/2] Expectation not honored. Allow instead. Fixes: ``` Failure/Error: resource.attributes = collect_form_attributes (#).attributes=({}) expected: 1 time with arguments: ({}) received: 0 times ``` In general we need to move away from the non-deterministic weirdness that is `*_any_instance_of`. --- spec/features/create_record_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/features/create_record_spec.rb b/spec/features/create_record_spec.rb index 2040253..a6ec701 100644 --- a/spec/features/create_record_spec.rb +++ b/spec/features/create_record_spec.rb @@ -18,7 +18,7 @@ fill_in '* Title', with: 'My title' - expect_any_instance_of(Audio).to receive(:attributes=).with({}) # called when initializing a new object + allow_any_instance_of(Audio).to receive(:attributes=).with({}) # called when initializing a new object expect_any_instance_of(Audio).to receive(:attributes=).with('title' => ["My title"], "creator"=>[], "description"=>[], "subject"=>[], "isPartOf"=>[]) # Avoid the catalog so we don't have to run Solr expect_any_instance_of(Audio).to receive(:save).and_return(true)