spotlight-dor-resources 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8df55f329be83de6c7ad4eded72dab44cb457888
-  data.tar.gz: d38a0f5e00576a446e71ce1d6ea77cd3276aefc3
+  metadata.gz: 020d6aad248dc730e3ee61896bb5883eb3842350
+  data.tar.gz: 76cd9bc6a57381ce04336628dabe02ea8a00d94b
 SHA512:
-  metadata.gz: 010cb19a2fe3c6c2d16753685675e54de632acbf16c40babc1cce108a6aea2d15ef85220345c3e056eeeb22ae6ace6496f22e556d082408b9de8aef6718db12c
-  data.tar.gz: 7060e3540e2e950b013d76f70263748eb461d0207b68e681fdcd46fba366c284d94d3b3c384b6bebc3415b550dd154248e1644a772a44fa8c4c14b08fdccc9c2
+  metadata.gz: fe9fd0ec3cf1e57b32183e71344d7e483ddb94562e09464d586d2377dfab0070fa8ff3b82b24ffcefd7bd7b16fb062c66721dbdad2c9456e4b394b03c77ac639
+  data.tar.gz: 42fef0ae0264474124e6dffd8eada91b6d463760b40e5a28e1388227a594d2844afb32663de4f1b6d0d6d149b9fc5a379e2413bd3c65da329bdc985cf79d80e5

data/.gitignore

@@ -23,4 +23,4 @@ spec/internal
 .internal_test_app
 Gemfile.lock
 jetty
-./spec/internal
+.pry_history

data/.travis.yml

@@ -6,7 +6,6 @@ rvm:
 
 env:
   global:
-    - JRUBY_OPTS="-J-Xms512m -J-Xmx1024m"
     - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
 
 sudo: false
@@ -14,4 +13,3 @@ language: ruby
 
 script:
   - bundle exec rake
-  - bundle exec rake rubocop

data/Rakefile

@@ -10,15 +10,6 @@ Bundler::GemHelper.install_tasks
 
 task default: [:ci, :rubocop]
 
-namespace :spotlight do
-  desc 'Copies the default SOLR config for the bundled Testing Server'
-  task :configure_jetty do
-    FileList['solr_conf/conf/*'].each do |f|
-      cp("#{f}", 'jetty/solr/blacklight-core/conf/', verbose: true)
-    end
-  end
-end
-
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
@@ -27,7 +18,9 @@ RuboCop::RakeTask.new(:rubocop)
 
 require 'jettywrapper'
 require 'engine_cart/rake_task'
-task ci: ['engine_cart:generate', 'jetty:clean', 'spotlight:configure_jetty'] do
+require 'exhibits_solr_conf'
+desc 'Run tests in generated test Rails app with generated Solr instance running'
+task ci: ['engine_cart:generate', 'jetty:clean', 'exhibits:configure_solr'] do
   ENV['environment'] = 'test'
   jetty_params = Jettywrapper.load_config
   jetty_params[:startup_wait] = 60

data/lib/spotlight/dor/indexer.rb

@@ -194,7 +194,7 @@ module Spotlight::Dor
       def add_object_full_text(sdb, solr_doc)
         full_text_urls = object_level_full_text_urls(sdb)
         return if full_text_urls.size == 0
-        solr_doc['full_text_tesim'] = full_text_urls.map { |file_url| get_file_content(file_url) }
+        solr_doc['full_text_tesimv'] = full_text_urls.map { |file_url| get_file_content(file_url) }
       end
 
       # go grab the supplied file url, grab the file, encode and return

data/lib/spotlight/dor/resources/version.rb

@@ -2,7 +2,7 @@ module Spotlight
   module Dor
     # :nodoc:
     module Resources
-      VERSION = '0.1.0'
+      VERSION = '0.2.0'
     end
   end
 end

data/spec/lib/spotlight/dor/indexer_spec.rb

@@ -501,6 +501,7 @@ describe Spotlight::Dor::Indexer do
   # rubocop:enable Metrics/LineLength
 
   describe '#add_object_full_text' do
+    let(:full_text_solr_fname) { 'full_text_tesimv' }
     before do
       allow(sdb).to receive(:bare_druid).and_return(fake_druid)
     end
@@ -527,7 +528,7 @@ describe Spotlight::Dor::Indexer do
       allow(subject).to receive(:get_file_content).with(full_file_path).and_return(expected_text)
       subject.send(:add_object_full_text, sdb, solr_doc)
       expect(subject.object_level_full_text_urls(sdb)).to eq [full_file_path]
-      expect(solr_doc['full_text_tesim']).to eq [expected_text]
+      expect(solr_doc[full_text_solr_fname]).to eq [expected_text]
     end
     it 'does not index the full text if no recognized pattern is found' do
       public_xml_with_no_recognized_full_text = Nokogiri::XML <<-EOF
@@ -547,7 +548,7 @@ describe Spotlight::Dor::Indexer do
       allow(sdb).to receive(:public_xml).and_return(public_xml_with_no_recognized_full_text)
       subject.send(:add_object_full_text, sdb, solr_doc)
       expect(subject.object_level_full_text_urls(sdb)).to eq []
-      expect(solr_doc['full_text_tesim']).to be_nil
+      expect(solr_doc[full_text_solr_fname]).to be_nil
     end
     it 'indexes the full text from two files if two recognized patterns are found' do
       public_xml_with_two_recognized_full_text_files = Nokogiri::XML <<-EOF
@@ -570,7 +571,7 @@ describe Spotlight::Dor::Indexer do
       allow(subject).to receive(:get_file_content).with(full_file_path).and_return(expected_text)
       subject.send(:add_object_full_text, sdb, solr_doc)
       expect(subject.object_level_full_text_urls(sdb)).to eq [full_file_path, full_file_path]
-      expect(solr_doc['full_text_tesim']).to eq [expected_text, expected_text] # same file twice in a 2 element array
+      expect(solr_doc[full_text_solr_fname]).to eq [expected_text, expected_text] # same file twice in a 2 element array
     end
   end # add_object_full_text
 end

data/spec/models/spotlight/resources/purl_spec.rb

@@ -66,11 +66,13 @@ describe Spotlight::Resources::Purl do
     end
 
     it 'adds a document to solr' do
-      solr_data = [{ spotlight_resource_id_ssim: nil, spotlight_resource_type_ssim: 'spotlight/resources/purls', upstream: true }]
+      solr_data = [{ spotlight_resource_id_ssim: subject.to_global_id,
+                     spotlight_resource_type_ssim: 'spotlight/resources/purls',
+                     upstream: true }]
       expect(blacklight_solr).to receive(:update).with(params: { commitWithin: 500 },
                                                        data: solr_data.to_json,
                                                        headers: { 'Content-Type' => 'application/json' })
-      expect(subject).to receive(:update_index_time!)
+      expect(subject).to receive(:commit)
       subject.reindex
     end
   end

data/spec/spec_helper.rb

@@ -1,6 +1,5 @@
 ENV["RAILS_ENV"] ||= 'test'
 
-require 'factory_girl'
 require 'database_cleaner'
 require 'devise'
 require 'engine_cart'
@@ -8,9 +7,7 @@ require 'vcr'
 EngineCart.load_application!
 
 require 'rspec/rails'
-require 'capybara/poltergeist'
-Capybara.javascript_driver = :poltergeist
-Capybara.default_max_wait_time = 5
+require 'capybara'
 
 if ENV["COVERAGE"] or ENV["CI"]
   require 'simplecov'
@@ -27,9 +24,6 @@ require 'spotlight'
 
 Dir["./spec/support/**/*.rb"].sort.each {|f| require f}
 
-FactoryGirl.definition_file_paths = [File.expand_path("../factories", __FILE__)]
-FactoryGirl.find_definitions
-
 VCR.configure do |config|
   config.cassette_library_dir = "spec/vcr_cassettes"
   config.hook_into :webmock

data/spec/test_app_templates/catalog_controller.rb

@@ -8,20 +8,20 @@ class CatalogController < ApplicationController
   configure_blacklight do |config|
     ## Default parameters to send to solr for all search-like requests. See also SolrHelper#solr_search_params
     config.default_solr_params = {
-      :qt   => 'search',
-      :rows => 10,
-      :fl   => '*'
+      qt: 'search',
+      rows: 10,
+      fl: '*'
     }
 
     ## Default parameters to send on single-document requests to Solr. These settings are the Blackligt defaults (see SolrHelper#solr_doc_params) or
     ## parameters included in the Blacklight-jetty document requestHandler.
     #
     #config.default_document_solr_params = {
-    #  :qt => 'document',
+    #  qt: 'document',
     #  ## These are hard-coded in the blacklight 'document' requestHandler
-    #  # :fl => '*',
-    #  # :rows => 1
-    #  # :q => '{!raw f=id v=$id}'
+    #  # fl: '*',
+    #  # rows: 1
+    #  # q: '{!raw f=id v=$id}'
     #}
 
     # solr field configuration for search results/index views
@@ -50,12 +50,12 @@ class CatalogController < ApplicationController
     #
     # :show may be set to false if you don't want the facet to be drawn in the
     # facet bar
-    config.add_facet_field 'genre_ssim', :label => 'Genre', :limit => true
-    config.add_facet_field 'personal_name_ssm', :label => 'Personal Names', :limit => true
-    config.add_facet_field 'corporate_name_ssm', :label => 'Corporate Names', :limit => true
-    config.add_facet_field 'subject_geographic_ssim', :label => 'Geographic'
-    config.add_facet_field 'subject_temporal_ssim', :label => 'Era'
-    config.add_facet_field 'language_ssim', :label => 'Language'
+    config.add_facet_field 'genre_ssim', label: 'Genre', limit: true
+    config.add_facet_field 'personal_name_ssm', label: 'Personal Names', limit: true
+    config.add_facet_field 'corporate_name_ssm', label: 'Corporate Names', limit: true
+    config.add_facet_field 'subject_geographic_ssim', label: 'Geographic'
+    config.add_facet_field 'subject_temporal_ssim', label: 'Era'
+    config.add_facet_field 'language_ssim', label: 'Language'
 
 
     # Have BL send all facet field names to Solr, which has been the default
@@ -65,32 +65,32 @@ class CatalogController < ApplicationController
 
     # solr fields to be displayed in the index (search results) view
     #   The ordering of the field names is the order of the display
-    config.add_index_field 'language_ssm', :label => 'Language'
-    config.add_index_field 'abstract_tesim', :label => 'Abstract'
-    config.add_index_field 'note_mapuse_tesim', :label => 'Type'
-    config.add_index_field 'note_source_tesim', :label => 'Source'
-    config.add_index_field 'subject_geographic_tesim', :label => 'Geographic Subject'
-    config.add_index_field 'subject_temporal_tesim', :label => 'Temporal Subject'
+    config.add_index_field 'language_ssm', label: 'Language'
+    config.add_index_field 'abstract_tesim', label: 'Abstract'
+    config.add_index_field 'note_mapuse_tesim', label: 'Type'
+    config.add_index_field 'note_source_tesim', label: 'Source'
+    config.add_index_field 'subject_geographic_tesim', label: 'Geographic Subject'
+    config.add_index_field 'subject_temporal_tesim', label: 'Temporal Subject'
 
     # solr fields to be displayed in the show (single result) view
     #   The ordering of the field names is the order of the display
-    config.add_show_field 'note_phys_desc_tesim', :label => 'Note'
-    config.add_show_field 'note_source_tesim', :label => 'Source'
-    config.add_show_field 'note_desc_note_tesim', :label => 'Note'
-    config.add_show_field 'note_references_tesim', :label => 'References'
-    config.add_show_field 'note_provenance_tesim', :label => 'Provenance'
-    config.add_show_field 'note_page_num_tesim', :label => 'Page Number'
-    config.add_show_field 'subject_geographic_tesim', :label => 'Geographic Subject'
-    config.add_show_field 'subject_temporal_tesim', :label => 'Temporal Subject'
-    config.add_show_field 'personal_name_ssm', :label => 'Personal Names'
-    config.add_show_field 'corporate_name_ssm', :label => 'Corporate Names'
+    config.add_show_field 'note_phys_desc_tesim', label: 'Note'
+    config.add_show_field 'note_source_tesim', label: 'Source'
+    config.add_show_field 'note_desc_note_tesim', label: 'Note'
+    config.add_show_field 'note_references_tesim', label: 'References'
+    config.add_show_field 'note_provenance_tesim', label: 'Provenance'
+    config.add_show_field 'note_page_num_tesim', label: 'Page Number'
+    config.add_show_field 'subject_geographic_tesim', label: 'Geographic Subject'
+    config.add_show_field 'subject_temporal_tesim', label: 'Temporal Subject'
+    config.add_show_field 'personal_name_ssm', label: 'Personal Names'
+    config.add_show_field 'corporate_name_ssm', label: 'Corporate Names'
 
-    config.add_sort_field 'score desc, sort_title_ssi asc', :label => 'Relevance'
-    config.add_sort_field 'sort_title_ssi asc', :label => 'Title'
-    config.add_sort_field 'sort_type_ssi asc', :label => 'Type'
-    config.add_sort_field 'sort_date_dtsi asc', :label => 'Date'
-    config.add_sort_field 'sort_source_ssi asc', :label => 'Source'
-    config.add_sort_field 'id asc', :label => 'Identifier'
+    config.add_sort_field 'score desc, sort_title_ssi asc', label: 'Relevance'
+    config.add_sort_field 'sort_title_ssi asc', label: 'Title'
+    config.add_sort_field 'sort_type_ssi asc', label: 'Type'
+    config.add_sort_field 'sort_date_dtsi asc', label: 'Date'
+    config.add_sort_field 'sort_source_ssi asc', label: 'Source'
+    config.add_sort_field 'id asc', label: 'Identifier'
   end
 
 end

data/spec/test_app_templates/lib/generators/test_app_generator.rb

@@ -4,37 +4,36 @@ class TestAppGenerator < Rails::Generators::Base
   source_root File.expand_path("../../../../spec/test_app_templates", __FILE__)
 
   def add_gems
-    gem 'blacklight', '~> 5.1'
-    gem "blacklight-spotlight"
+    gem 'blacklight-spotlight'
     Bundler.with_clean_env do
-      run "bundle install"
+      run 'bundle install --quiet'
     end
   end
 
   def run_blacklight_generator
-    say_status("warning", "GENERATING BL", :yellow)
+    say_status('warning', 'GENERATING BL', :yellow)
     generate 'blacklight:install', '--devise --jettywrapper'
   end
 
   def run_spotlight_migrations
-    rake "spotlight:install:migrations"
-    rake "db:migrate"
+    rake 'spotlight:install:migrations'
+    rake 'db:migrate'
   end
 
   def add_spotlight_routes_and_assets
     # spotlight will provide its own catalog controller.. remove blacklight's to
     # avoid getting prompted about file conflicts
-    remove_file "app/controllers/catalog_controller.rb"
+    remove_file 'app/controllers/catalog_controller.rb'
 
-    generate 'spotlight:install'
+    generate 'spotlight:install', '-f --mailer_default_url_host=localhost:3000'
   end
 
   def add_catalog_controller
-    copy_file "catalog_controller.rb", "app/controllers/catalog_controller.rb", force: true
+    copy_file 'catalog_controller.rb', 'app/controllers/catalog_controller.rb', force: true
   end
 
   def configure_gdor
-    copy_file "gdor.yml", "config/gdor.yml", force: true
+    copy_file 'gdor.yml', 'config/gdor.yml', force: true
   end
 
 end

data/spotlight-dor-resources.gemspec

@@ -1,6 +1,7 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
 require 'spotlight/dor/resources/version'
 
 Gem::Specification.new do |spec|
@@ -17,6 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
+  spec.required_ruby_version = '>= 2.2.3' # parallel gem fails with 2.2.2
+
   spec.add_dependency 'faraday'
   spec.add_dependency 'solrizer'
   spec.add_dependency 'gdor-indexer'
@@ -30,11 +33,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rspec-rails'
   spec.add_development_dependency 'capybara'
-  spec.add_development_dependency 'poltergeist', '>= 1.5.0'
   spec.add_development_dependency 'vcr', '~> 3.0'
   spec.add_development_dependency 'webmock'
   spec.add_development_dependency 'jettywrapper'
   spec.add_development_dependency 'engine_cart', '~> 0.8'
-  spec.add_development_dependency 'factory_girl'
   spec.add_development_dependency 'database_cleaner'
+  spec.add_development_dependency 'exhibits_solr_conf'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spotlight-dor-resources
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Chris Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-11 00:00:00.000000000 Z
+date: 2015-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -178,20 +178,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: poltergeist
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.5.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
@@ -249,7 +235,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
-  name: factory_girl
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -263,7 +249,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: exhibits_solr_conf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -300,8 +286,6 @@ files:
 - lib/spotlight/dor/resources.rb
 - lib/spotlight/dor/resources/engine.rb
 - lib/spotlight/dor/resources/version.rb
-- solr_conf/conf/schema.xml
-- solr_conf/conf/solrconfig.xml
 - spec/integration/gdor_integration_spec.rb
 - spec/lib/spotlight/dor/indexer_spec.rb
 - spec/models/spotlight/resources/purl_spec.rb
@@ -327,7 +311,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/solr_conf/conf/schema.xml

@@ -1,346 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema name="Hydra" version="1.5">
-  <!-- NOTE: various comments and unused configuration possibilities have been purged
-     from this file.  Please refer to http://wiki.apache.org/solr/SchemaXml,
-     as well as the default schema file included with Solr -->
-  
-  <uniqueKey>id</uniqueKey>
-  
-  <fields>
-    <field name="id" type="string" stored="true" indexed="true" multiValued="false" required="true"/>
-    <field name="_version_" type="long"     indexed="true"  stored="true"/>
-    <field name="timestamp" type="date" indexed="true" stored="true" default="NOW" multiValued="false"/>
-    
-    <field name="lat" type="tdouble" stored="true" indexed="true" multiValued="false"/>
-    <field name="lng" type="tdouble" stored="true" indexed="true" multiValued="false"/>
-    <field name="original_pid_tesim" type="pid_text" stored="true" indexed="true" multiValued="true"/>
-
-    <field name="full_title_ng" type="text_en_ng" stored="false" indexed="true" multiValued="true"/>
-    <field name="id_ng"         type="text_en_ng" stored="false" indexed="true" multiValued="false"/>
-
-    <!-- NOTE:  not all possible Solr field types are represented in the dynamic fields -->
-
-    <!-- text (_t...) -->
-<!--
-    <dynamicField name="*_ti" type="text" stored="false" indexed="true" multiValued="false"/>
-    <dynamicField name="*_tim" type="text" stored="false" indexed="true" multiValued="true"/>
--->
-    <dynamicField name="*_ts" type="text" stored="true" indexed="false" multiValued="false"/>
-    <dynamicField name="*_tsm" type="text" stored="true" indexed="false" multiValued="true"/>
-    <dynamicField name="*_tsi" type="text" stored="true" indexed="true" multiValued="false"/>
-    <dynamicField name="*_tsim" type="text" stored="true" indexed="true" multiValued="true"/>
-<!--
-    <dynamicField name="*_tiv" type="text" stored="false" indexed="true" multiValued="false" termVectors="true" termPositions="true" termOffsets="true"/>
-    <dynamicField name="*_timv" type="text" stored="false" indexed="true" multiValued="true" termVectors="true" termPositions="true" termOffsets="true"/>
--->
-    <dynamicField name="*_tsiv" type="text" stored="true" indexed="true" multiValued="false" termVectors="true" termPositions="true" termOffsets="true"/>
-    <dynamicField name="*_tsimv" type="text" stored="true" indexed="true" multiValued="true" termVectors="true" termPositions="true" termOffsets="true"/>
-    
-    <!-- English text (_te...) -->
-<!--
-    <dynamicField name="*_tei" type="text_en" stored="false" indexed="true" multiValued="false"/>
-    <dynamicField name="*_teim" type="text_en" stored="false" indexed="true" multiValued="true"/>
--->
-    <dynamicField name="*_tes" type="text_en" stored="true" indexed="false" multiValued="false"/>
-    <dynamicField name="*_tesm" type="text_en" stored="true" indexed="false" multiValued="true"/>
-    <dynamicField name="*_tesi" type="text_en" stored="true" indexed="true" multiValued="false"/>
-    <dynamicField name="*_tesim" type="text_en" stored="true" indexed="true" multiValued="true"/>
-<!--
-    <dynamicField name="*_teiv" type="text_en" stored="false" indexed="true" multiValued="false" termVectors="true" termPositions="true" termOffsets="true"/>
-    <dynamicField name="*_teimv" type="text_en" stored="false" indexed="true" multiValued="true" termVectors="true" termPositions="true" termOffsets="true"/>
--->
-    <dynamicField name="*_tesiv" type="text_en" stored="true" indexed="true" multiValued="false" termVectors="true" termPositions="true" termOffsets="true"/>
-    <dynamicField name="*_tesimv" type="text_en" stored="true" indexed="true" multiValued="true" termVectors="true" termPositions="true" termOffsets="true"/>
-    
-    <!-- string (_s...) -->
-<!--
-    <dynamicField name="*_si" type="string" stored="false" indexed="true" multiValued="false"/>
-    <dynamicField name="*_sim" type="string" stored="false" indexed="true" multiValued="true"/>
--->
-    <dynamicField name="*_ss" type="string" stored="true" indexed="false" multiValued="false"/>
-    <dynamicField name="*_ssm" type="string" stored="true" indexed="false" multiValued="true"/>
-    <dynamicField name="*_ssi" type="string" stored="true" indexed="true" multiValued="false"/>
-    <dynamicField name="*_ssim" type="string" stored="true" indexed="true" multiValued="true"/>
-<!--
-    <dynamicField name="*_ssort" type="alphaSort" stored="false" indexed="true" multiValued="false"/>
--->
-    
-    <!-- integer (_i...) -->
-<!--
-    <dynamicField name="*_ii" type="int" stored="false" indexed="true" multiValued="false"/>
-    <dynamicField name="*_iim" type="int" stored="false" indexed="true" multiValued="true"/>
--->
-    <dynamicField name="*_is" type="int" stored="true" indexed="false" multiValued="false"/>
-    <dynamicField name="*_ism" type="int" stored="true" indexed="false" multiValued="true"/>
-    <dynamicField name="*_isi" type="int" stored="true" indexed="true" multiValued="false"/>
-    <dynamicField name="*_isim" type="int" stored="true" indexed="true" multiValued="true"/>
-    
-    <!-- trie integer (_it...) (for faster range queries) -->
-<!--
-    <dynamicField name="*_iti" type="tint" stored="false" indexed="true" multiValued="false"/>
-    <dynamicField name="*_itim" type="tint" stored="false" indexed="true" multiValued="true"/>
--->
-    <dynamicField name="*_its" type="tint" stored="true" indexed="false" multiValued="false"/>
-    <dynamicField name="*_itsm" type="tint" stored="true" indexed="false" multiValued="true"/>
-    <dynamicField name="*_itsi" type="tint" stored="true" indexed="true" multiValued="false"/>
-    <dynamicField name="*_itsim" type="tint" stored="true" indexed="true" multiValued="true"/>
-    
-    <!-- date (_dt...) -->
-    <!-- The format for this date field is of the form 1995-12-31T23:59:59Z
-         Optional fractional seconds are allowed: 1995-12-31T23:59:59.999Z -->
-<!--
-    <dynamicField name="*_dti" type="date" stored="false" indexed="true" multiValued="false"/>
-    <dynamicField name="*_dtim" type="date" stored="false" indexed="true" multiValued="true"/>
--->
-    <dynamicField name="*_dts" type="date" stored="true" indexed="false" multiValued="false"/>
-    <dynamicField name="*_dtsm" type="date" stored="true" indexed="false" multiValued="true"/>
-    <dynamicField name="*_dtsi" type="date" stored="true" indexed="true" multiValued="false"/>
-    <dynamicField name="*_dtsim" type="date" stored="true" indexed="true" multiValued="true"/>
-    
-    <!-- trie date (_dtt...) (for faster range queries) -->
-<!--
-    <dynamicField name="*_dtti" type="tdate" stored="false" indexed="true" multiValued="false"/>
-    <dynamicField name="*_dttim" type="tdate" stored="false" indexed="true" multiValued="true"/>
--->
-    <dynamicField name="*_dtts" type="tdate" stored="true" indexed="false" multiValued="false"/>
-    <dynamicField name="*_dttsm" type="tdate" stored="true" indexed="false" multiValued="true"/>
-    <dynamicField name="*_dttsi" type="tdate" stored="true" indexed="true" multiValued="false"/>
-    <dynamicField name="*_dttsim" type="tdate" stored="true" indexed="true" multiValued="true"/>
-    
-    <!-- long (_l...) -->
-<!--
-    <dynamicField name="*_li" type="long" stored="false" indexed="true" multiValued="false"/>
-    <dynamicField name="*_lim" type="long" stored="false" indexed="true" multiValued="true"/>
--->
-    <dynamicField name="*_ls" type="long" stored="true" indexed="false" multiValued="false"/>
-    <dynamicField name="*_lsm" type="long" stored="true" indexed="false" multiValued="true"/>
-    <dynamicField name="*_lsi" type="long" stored="true" indexed="true" multiValued="false"/>
-    <dynamicField name="*_lsim" type="long" stored="true" indexed="true" multiValued="true"/>
-    
-    <!-- trie long (_lt...) (for faster range queries) -->
-<!--
-    <dynamicField name="*_lti" type="tlong" stored="false" indexed="true" multiValued="false"/>
-    <dynamicField name="*_ltim" type="tlong" stored="false" indexed="true" multiValued="true"/>
--->
-    <dynamicField name="*_lts" type="tlong" stored="true" indexed="false" multiValued="false"/>
-    <dynamicField name="*_ltsm" type="tlong" stored="true" indexed="false" multiValued="true"/>
-    <dynamicField name="*_ltsi" type="tlong" stored="true" indexed="true" multiValued="false"/>
-    <dynamicField name="*_ltsim" type="tlong" stored="true" indexed="true" multiValued="true"/>
-    
-    <!-- double (_db...) -->
-<!--
-    <dynamicField name="*_dbi" type="double" stored="false" indexed="true" multiValued="false"/>
-    <dynamicField name="*_dbim" type="double" stored="false" indexed="true" multiValued="true"/>
--->
-    <dynamicField name="*_dbs" type="double" stored="true" indexed="false" multiValued="false"/>
-    <dynamicField name="*_dbsm" type="double" stored="true" indexed="false" multiValued="true"/>
-    <dynamicField name="*_dbsi" type="double" stored="true" indexed="true" multiValued="false"/>
-    <dynamicField name="*_dbsim" type="double" stored="true" indexed="true" multiValued="true"/>
-    
-    <!-- trie double (_dbt...) (for faster range queries) -->
-<!--
-    <dynamicField name="*_dbti" type="tdouble" stored="false" indexed="true" multiValued="false"/>
-    <dynamicField name="*_dbtim" type="tdouble" stored="false" indexed="true" multiValued="true"/>
--->
-    <dynamicField name="*_dbts" type="tdouble" stored="true" indexed="false" multiValued="false"/>
-    <dynamicField name="*_dbtsm" type="tdouble" stored="true" indexed="false" multiValued="true"/>
-    <dynamicField name="*_dbtsi" type="tdouble" stored="true" indexed="true" multiValued="false"/>
-    <dynamicField name="*_dbtsim" type="tdouble" stored="true" indexed="true" multiValued="true"/>
-    
-    <!-- float (_f...) -->
-<!--
-    <dynamicField name="*_fi" type="float" stored="false" indexed="true" multiValued="false"/>
-    <dynamicField name="*_fim" type="float" stored="false" indexed="true" multiValued="true"/>
--->
-    <dynamicField name="*_fs" type="float" stored="true" indexed="false" multiValued="false"/>
-    <dynamicField name="*_fsm" type="float" stored="true" indexed="false" multiValued="true"/>
-    <dynamicField name="*_fsi" type="float" stored="true" indexed="true" multiValued="false"/>
-    <dynamicField name="*_fsim" type="float" stored="true" indexed="true" multiValued="true"/>
-    
-    <!-- trie float (_ft...) (for faster range queries) -->
-<!--
-    <dynamicField name="*_fti" type="tfloat" stored="false" indexed="true" multiValued="false"/>
-    <dynamicField name="*_ftim" type="tfloat" stored="false" indexed="true" multiValued="true"/>
--->
-    <dynamicField name="*_fts" type="tfloat" stored="true" indexed="false" multiValued="false"/>
-    <dynamicField name="*_ftsm" type="tfloat" stored="true" indexed="false" multiValued="true"/>
-    <dynamicField name="*_ftsi" type="tfloat" stored="true" indexed="true" multiValued="false"/>
-    <dynamicField name="*_ftsim" type="tfloat" stored="true" indexed="true" multiValued="true"/>
-    
-    <!-- boolean (_b...) -->
-<!--
-    <dynamicField name="*_bi" type="boolean" stored="false" indexed="true" multiValued="false"/>
--->
-    <dynamicField name="*_bs" type="boolean" stored="true" indexed="false" multiValued="false"/>
-    <dynamicField name="*_bsi" type="boolean" stored="true" indexed="true" multiValued="false"/>
-    
-    <!-- Type used to index the lat and lon components for the "location" FieldType -->
-<!--
-    <dynamicField name="*_coordinate" type="tdouble" indexed="true"  stored="false" />
--->
-
-    <!-- location (_ll...) -->
-<!--
-    <dynamicField name="*_lli" type="location" stored="false" indexed="true" multiValued="false"/>
-    <dynamicField name="*_llim" type="location" stored="false" indexed="true" multiValued="true"/>
--->
-    <dynamicField name="*_lls" type="location" stored="true" indexed="false" multiValued="false"/>
-    <dynamicField name="*_llsm" type="location" stored="true" indexed="false" multiValued="true"/>
-    <dynamicField name="*_llsi" type="location" stored="true" indexed="true" multiValued="false"/>
-    <dynamicField name="*_llsim" type="location" stored="true" indexed="true" multiValued="true"/>
-
-    <!-- you must define copyField source and dest fields explicity or schemaBrowser doesn't work -->
-    <field name="all_text_timv" type="text" stored="false" indexed="true" multiValued="true" termVectors="true" termPositions="true" termOffsets="true"/>
-
-
-  </fields>
-
-
-  <!-- Above, multiple source fields are copied to the [text] field.
-      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.  -->
-
-  <copyField source="id" dest="id_ng" maxChars="3000"/>
-  <copyField source="full_title_tesim" dest="full_title_ng" maxChars="3000"/>
-  <copyField source="*_tesim" dest="all_text_timv" maxChars="3000"/>
-
-  <types>
-    <fieldType name="string" class="solr.StrField" sortMissingLast="true" />
-    <fieldType name="boolean" class="solr.BoolField" sortMissingLast="true"/>    
-    <fieldType name="rand" class="solr.RandomSortField" omitNorms="true"/>
-    
-    <!-- Default numeric field types.  -->
-    <fieldType name="int" class="solr.TrieIntField" precisionStep="0" positionIncrementGap="0"/>
-    <fieldType name="float" class="solr.TrieFloatField" precisionStep="0" positionIncrementGap="0"/>
-    <fieldType name="long" class="solr.TrieLongField" precisionStep="0" positionIncrementGap="0"/>
-    <fieldType name="double" class="solr.TrieDoubleField" precisionStep="0" positionIncrementGap="0"/>
-    
-    <!-- trie numeric field types for faster range queries -->
-    <fieldType name="tint" class="solr.TrieIntField" precisionStep="8" positionIncrementGap="0"/>
-    <fieldType name="tfloat" class="solr.TrieFloatField" precisionStep="8" positionIncrementGap="0"/>
-    <fieldType name="tlong" class="solr.TrieLongField" precisionStep="8" positionIncrementGap="0"/>
-    <fieldType name="tdouble" class="solr.TrieDoubleField" precisionStep="8" positionIncrementGap="0"/>
-    
-    <!-- The format for this date field is of the form 1995-12-31T23:59:59Z
-         Optional fractional seconds are allowed: 1995-12-31T23:59:59.999Z
-      -->
-    <fieldType name="date" class="solr.TrieDateField" precisionStep="0" positionIncrementGap="0"/>
-    <!-- A Trie based date field for faster date range queries and date faceting. -->
-    <fieldType name="tdate" class="solr.TrieDateField" precisionStep="6" positionIncrementGap="0"/>
-    
-    
-    <!-- This point type indexes the coordinates as separate fields (subFields)
-      If subFieldType is defined, it references a type, and a dynamic field
-      definition is created matching *___<typename>.  Alternately, if 
-      subFieldSuffix is defined, that is used to create the subFields.
-      Example: if subFieldType="double", then the coordinates would be
-        indexed in fields myloc_0___double,myloc_1___double.
-      Example: if subFieldSuffix="_d" then the coordinates would be indexed
-        in fields myloc_0_d,myloc_1_d
-      The subFields are an implementation detail of the fieldType, and end
-      users normally should not need to know about them.
-     -->
-    <fieldType name="point" class="solr.PointType" dimension="2" subFieldSuffix="_d"/>
-    
-    <!-- A specialized field for geospatial search. If indexed, this fieldType must not be multivalued. -->
-    <fieldType name="location" class="solr.LatLonType" subFieldSuffix="_coordinate"/>
-    
-    <!-- An alternative geospatial field type new to Solr 4.  It supports multiValued and polygon shapes.
-      For more information about this and other Spatial fields new to Solr 4, see:
-      http://wiki.apache.org/solr/SolrAdaptersForLuceneSpatial4
-    -->
-    <fieldType name="location_rpt" class="solr.SpatialRecursivePrefixTreeFieldType"
-      geo="true" distErrPct="0.025" maxDistErr="0.000009" units="degrees" />
-    
-    <fieldType name="text" class="solr.TextField" omitNorms="false">
-      <analyzer>
-        <tokenizer class="solr.ICUTokenizerFactory"/>
-        <filter class="solr.ICUFoldingFilterFactory"/>  <!-- NFKC, case folding, diacritics removed -->
-        <filter class="solr.TrimFilterFactory"/>
-      </analyzer>
-    </fieldType>
-    
-    <!-- A text field that only splits on whitespace for exact matching of words -->
-    <fieldType name="text_ws" class="solr.TextField" positionIncrementGap="100">
-      <analyzer>
-        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
-        <filter class="solr.TrimFilterFactory"/>
-      </analyzer>
-    </fieldType>
-        
-    <!-- single token analyzed text, for sorting.  Punctuation is significant. -->
-    <fieldtype name="alphaSort" class="solr.TextField" sortMissingLast="true" omitNorms="true">
-      <analyzer>
-        <tokenizer class="solr.KeywordTokenizerFactory" />
-        <filter class="solr.ICUFoldingFilterFactory"/>
-        <filter class="solr.TrimFilterFactory" />
-      </analyzer>
-    </fieldtype>
-    
-    <!-- A text field with defaults appropriate for English -->
-    <fieldType name="text_en" class="solr.TextField" positionIncrementGap="100">
-      <analyzer>
-        <tokenizer class="solr.ICUTokenizerFactory"/>
-        <filter class="solr.ICUFoldingFilterFactory"/>  <!-- NFKC, case folding, diacritics removed -->
-        <filter class="solr.EnglishPossessiveFilterFactory"/>
-        <!-- EnglishMinimalStemFilterFactory is less aggressive than PorterStemFilterFactory: -->
-        <filter class="solr.EnglishMinimalStemFilterFactory"/>
-        <!--
-        <filter class="solr.PorterStemFilterFactory"/>
-        -->
-        <filter class="solr.TrimFilterFactory"/>
-      </analyzer>
-    </fieldType>
-
-    <!-- A text field with defaults appropriate for English an NGrams -->
-    <fieldType name="text_en_ng" class="solr.TextField" positionIncrementGap="100">
-      <analyzer type="index">
-        <tokenizer class="solr.ICUTokenizerFactory"/>
-        <filter class="solr.ICUFoldingFilterFactory"/>  <!-- NFKC, case folding, diacritics removed -->
-        <filter class="solr.EnglishPossessiveFilterFactory"/>
-        <!-- EnglishMinimalStemFilterFactory is less aggressive than PorterStemFilterFactory: -->
-        <filter class="solr.EnglishMinimalStemFilterFactory"/>
-        <filter class="solr.TrimFilterFactory"/>
-        <filter class="solr.EdgeNGramFilterFactory" minGramSize="3" maxGramSize="15" side="front"/>:
-      </analyzer>
-
-      <analyzer type="index">
-        <tokenizer class="solr.ICUTokenizerFactory"/>
-        <filter class="solr.ICUFoldingFilterFactory"/>  <!-- NFKC, case folding, diacritics removed -->
-        <filter class="solr.EnglishPossessiveFilterFactory"/>
-        <!-- EnglishMinimalStemFilterFactory is less aggressive than PorterStemFilterFactory: -->
-        <filter class="solr.EnglishMinimalStemFilterFactory"/>
-        <filter class="solr.TrimFilterFactory"/>
-      </analyzer>
-    </fieldType>
-
-    <fieldType name="pid_text" class="solr.TextField" positionIncrementGap="100">
-      <analyzer>
-        <tokenizer class="solr.KeywordTokenizerFactory"/>
-      </analyzer>
-    </fieldType>
-        
-    <!-- queries for paths match documents at that path, or in descendent paths -->
-    <fieldType name="descendent_path" class="solr.TextField">
-      <analyzer type="index">
-        <tokenizer class="solr.PathHierarchyTokenizerFactory" delimiter="/" />
-      </analyzer>
-      <analyzer type="query">
-        <tokenizer class="solr.KeywordTokenizerFactory" />
-      </analyzer>
-    </fieldType>
-    
-    <!-- queries for paths match documents at that path, or in ancestor paths -->
-    <fieldType name="ancestor_path" class="solr.TextField">
-      <analyzer type="index">
-        <tokenizer class="solr.KeywordTokenizerFactory" />
-      </analyzer>
-      <analyzer type="query">
-        <tokenizer class="solr.PathHierarchyTokenizerFactory" delimiter="/" />
-      </analyzer>
-    </fieldType>
-    
-  </types>
-  
-</schema>

data/solr_conf/conf/solrconfig.xml

@@ -1,180 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<config>
-  <!-- NOTE: various comments and unused configuration possibilities have been purged
-     from this file.  Please refer to http://wiki.apache.org/solr/SolrConfigXml,
-     as well as the default solrconfig file included with Solr -->
-  
-  <abortOnConfigurationError>${solr.abortOnConfigurationError:true}</abortOnConfigurationError>
-  
-  <luceneMatchVersion>LUCENE_40</luceneMatchVersion>
-
-  <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.StandardDirectoryFactory}"/>
-
-  <updateHandler class="solr.DirectUpdateHandler2">
-    <updateLog>
-      <str name="dir">${solr.core0.data.dir:}</str>
-    </updateLog>
-  </updateHandler>
-
-  <!-- solr lib dirs -->
-  <lib dir="../lib/contrib/analysis-extras/lib" />
-  <lib dir="../lib/contrib/analysis-extras/lucene-libs" />
-  
-  <dataDir>${solr.data.dir:}</dataDir>
-
-  <requestHandler name="search" class="solr.SearchHandler" default="true">
-    <!-- default values for query parameters can be specified, these
-         will be overridden by parameters in the request
-      -->
-     <lst name="defaults">
-       <str name="defType">edismax</str>
-       <str name="echoParams">explicit</str>
-       <str name="q.alt">*:*</str>
-       <str name="mm">2&lt;-1 5&lt;-2 6&lt;90%</str>
-       <int name="qs">1</int>
-       <int name="ps">2</int>
-       <float name="tie">0.01</float>
-       <!-- this qf and pf are used by default, if not otherwise specified by
-            client. The default blacklight_config will use these for the
-            "keywords" search. See the author_qf/author_pf, title_qf, etc 
-            below, which the default blacklight_config will specify for
-            those searches. You may also be interested in:
-            http://wiki.apache.org/solr/LocalParams
-       -->
-        <str name="qf">
-          id
-          full_title_tesim
-          short_title_tesim
-          alternative_title_tesim
-          active_fedora_model_ssi
-          title_tesim
-          author_tesim
-          subject_tesim
-          all_text_timv
-        </str>
-        <str name="pf">
-          all_text_timv^10
-        </str>
-
-       <str name="author_qf">
-          author_tesim
-       </str>
-       <str name="author_pf">
-       </str>
-       <str name="title_qf">
-          title_tesim
-          full_title_tesim
-          short_title_tesim
-          alternative_title_tesim
-       </str>
-       <str name="title_pf">
-       </str>
-       <str name="subject_qf">
-          subject_tesim
-       </str>
-       <str name="subject_pf">
-       </str>
-       
-       <str name="fl">
-         *, 
-         score
-       </str>
-
-       <str name="facet">true</str>
-       <str name="facet.mincount">1</str>
-       <str name="facet.limit">10</str>
-       <str name="facet.field">active_fedora_model_ssi</str>
-       <str name="facet.field">subject_ssim</str>
-       
-       <str name="spellcheck">true</str>
-       <str name="spellcheck.dictionary">default</str>
-       <str name="spellcheck.onlyMorePopular">true</str>
-       <str name="spellcheck.extendedResults">true</str>
-       <str name="spellcheck.collate">false</str>
-       <str name="spellcheck.count">5</str>
-
-     </lst>
-    <arr name="last-components">
-      <str>spellcheck</str>
-    </arr>
-  </requestHandler>
-
-  <requestHandler name="permissions" class="solr.SearchHandler" >
-    <lst name="defaults">
-      <str name="facet">off</str>
-      <str name="echoParams">all</str>
-      <str name="rows">1</str>
-      <str name="q">{!raw f=id v=$id}</str> <!-- use id=666 instead of q=id:666 -->
-      <str name="fl">
-        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
-      </str>
-    </lst>
-  </requestHandler>
-  
-  <requestHandler name="standard" class="solr.SearchHandler">
-     <lst name="defaults">
-       <str name="echoParams">explicit</str>
-       <str name="defType">lucene</str>
-     </lst>
-  </requestHandler>
-
-  <!-- for requests to get a single document; use id=666 instead of q=id:666 -->
-  <requestHandler name="document" class="solr.SearchHandler" >
-    <lst name="defaults">
-      <str name="echoParams">all</str>
-      <str name="fl">*</str>
-      <str name="rows">1</str>
-      <str name="q">{!raw f=id v=$id}</str> <!-- use id=666 instead of q=id:666 -->
-    </lst>
-  </requestHandler>
-
-
-  <searchComponent name="spellcheck" class="solr.SpellCheckComponent">
-    <str name="queryAnalyzerFieldType">textSpell</str>
-    <!-- Multiple "Spell Checkers" can be declared and used by this component
-      (e.g. for title_spell field)
-      -->
-    <lst name="spellchecker">
-      <str name="name">default</str>
-      <str name="field">spell</str>
-      <str name="spellcheckIndexDir">./spell</str>
-      <str name="buildOnOptimize">true</str>
-    </lst>
-  </searchComponent>
-  
-  <requestHandler name="/replication" class="solr.ReplicationHandler" startup="lazy" /> 
-  
-  <requestDispatcher handleSelect="true" >
-    <requestParsers enableRemoteStreaming="true" multipartUploadLimitInKB="2048" />
-  </requestDispatcher>
-  
-  <requestHandler name="/analysis/field" startup="lazy" class="solr.FieldAnalysisRequestHandler" />
-  <requestHandler name="/update" class="solr.UpdateRequestHandler"  />
-  <requestHandler name="/admin/" class="org.apache.solr.handler.admin.AdminHandlers" />
-  
-  <requestHandler name="/admin/ping" class="solr.PingRequestHandler">
-    <lst name="invariants">
-      <str name="q">solrpingquery</str>
-    </lst>
-    <lst name="defaults">
-      <str name="echoParams">all</str>
-    </lst>
-  </requestHandler>
-  
-  <!-- config for the admin interface --> 
-  <admin>
-    <defaultQuery>search</defaultQuery>
-  </admin>
-  
-</config>