blacklight-access_controls 0.6.2 → 0.7.0.rc1

data/spec/unit/catalog_spec.rb

@@ -27,7 +27,7 @@ describe Blacklight::AccessControls::Catalog do
       let(:user) { build(:user) }
 
       it 'allows access' do
-        expect { subject }.to_not raise_error
+        expect { subject }.not_to raise_error
       end
 
       # So that you can override enforce_show_permissions

data/spec/unit/enforcement_spec.rb

@@ -1,10 +1,12 @@
 # frozen_string_literal: true
 
-class MyController # < ApplicationController
+class MyController
   include Blacklight::AccessControls::Enforcement
 end
 
 describe Blacklight::AccessControls::Enforcement do
+  subject { controller }
+
   let(:controller) do
     c = MyController.new
     allow(c).to receive(:current_ability).and_return(ability)
@@ -13,18 +15,16 @@ describe Blacklight::AccessControls::Enforcement do
   let(:user) { User.new }
   let(:ability) { Ability.new(user) }
 
-  subject { controller }
-
   describe '#discovery_permissions' do
     it 'has defaults' do
-      expect(subject.discovery_permissions).to eq %w(discover read)
+      expect(subject.discovery_permissions).to eq %w[discover read]
     end
 
     it 'does getter/setter' do
-      subject.discovery_permissions = %w(discover read frobnicate)
-      expect(subject.discovery_permissions).to eq %w(discover read frobnicate)
+      subject.discovery_permissions = %w[discover read frobnicate]
+      expect(subject.discovery_permissions).to eq %w[discover read frobnicate]
       subject.discovery_permissions << 'zazzo'
-      expect(subject.discovery_permissions).to eq %w(discover read frobnicate zazzo)
+      expect(subject.discovery_permissions).to eq %w[discover read frobnicate zazzo]
     end
   end
 
@@ -51,12 +51,12 @@ describe Blacklight::AccessControls::Enforcement do
       end
 
       it "Then I should not be treated as a member of the 'registered' group" do
-        expect(fq_first).to_not match(/registered/)
+        expect(fq_first).not_to match(/registered/)
       end
     end
 
     context 'Given I am a registered user' do
-      let(:groups) { %w(faculty africana-faculty) }
+      let(:groups) { %w[faculty africana-faculty] }
       let(:user) do
         create(:user).tap do |u|
           allow(u).to receive(:groups) { groups }
@@ -69,8 +69,8 @@ describe Blacklight::AccessControls::Enforcement do
       end
 
       it 'searches for my groups' do
-        expect(fq_first).to match(%r{\{!terms f=discover_access_group_ssim\}public,faculty,africana-faculty,registered})
-        expect(fq_first).to match(%r{\{!terms f=read_access_group_ssim\}public,faculty,africana-faculty,registered})
+        expect(fq_first).to match(/\{!terms f=discover_access_group_ssim\}public,faculty,africana-faculty,registered/)
+        expect(fq_first).to match(/\{!terms f=read_access_group_ssim\}public,faculty,africana-faculty,registered/)
       end
 
       it 'does not build empty clauses' do
@@ -100,8 +100,8 @@ describe Blacklight::AccessControls::Enforcement do
         let(:groups) { ['abc:123', 'cde:567'] }
 
         it 'does not escape colons' do
-          expect(fq_first).to match(%r{\{!terms f=discover_access_group_ssim\}public,abc:123,cde:567,registered})
-          expect(fq_first).to match(%r{\{!terms f=read_access_group_ssim\}public,abc:123,cde:567,registered})
+          expect(fq_first).to match(/\{!terms f=discover_access_group_ssim\}public,abc:123,cde:567,registered/)
+          expect(fq_first).to match(/\{!terms f=read_access_group_ssim\}public,abc:123,cde:567,registered/)
         end
       end
     end
@@ -110,7 +110,7 @@ describe Blacklight::AccessControls::Enforcement do
   describe '#apply_user_permissions' do
     describe 'when the user is a guest user (user key nil)' do
       it 'does not create filters' do
-        expect(subject.send(:apply_user_permissions, %w(discover read))).to eq []
+        expect(subject.send(:apply_user_permissions, %w[discover read])).to eq []
       end
     end
 
@@ -118,7 +118,7 @@ describe Blacklight::AccessControls::Enforcement do
       let(:user) { User.new(email: '') }
 
       it 'does not create filters' do
-        expect(subject.send(:apply_user_permissions, %w(discover read))).to eq []
+        expect(subject.send(:apply_user_permissions, %w[discover read])).to eq []
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-access_controls
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0.rc1
 platform: ruby
 authors:
 - Chris Beer
@@ -11,36 +11,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-28 00:00:00.000000000 Z
+date: 2018-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: cancancan
+  name: blacklight
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
-  name: blacklight
+  name: cancancan
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: deprecation
   requirement: !ruby/object:Gem::Requirement
@@ -56,91 +56,91 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '11.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '11.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: engine_cart
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: engine_cart
+  name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '4.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '4.8'
 - !ruby/object:Gem::Dependency
-  name: solr_wrapper
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
-  name: factory_girl_rails
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.52.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.52.1
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -154,7 +154,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-rspec
+  name: solr_wrapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -193,6 +193,7 @@ files:
 - lib/blacklight/access_controls/enforcement.rb
 - lib/blacklight/access_controls/permissions_cache.rb
 - lib/blacklight/access_controls/permissions_query.rb
+- lib/blacklight/access_controls/search_builder.rb
 - lib/blacklight/access_controls/user.rb
 - lib/generators/blacklight/ability.rb
 - lib/generators/blacklight/access_controls_generator.rb
@@ -250,11 +251,8 @@ files:
 - solr_conf/conf/mapping-FoldToASCII.txt
 - solr_conf/conf/mapping-ISOLatin1Accent.txt
 - solr_conf/conf/protwords.txt
-- solr_conf/conf/schema.blacklight.xml
 - solr_conf/conf/schema.xml
-- solr_conf/conf/schema.xml.orig
 - solr_conf/conf/solrconfig.adams.xml
-- solr_conf/conf/solrconfig.blacklight.xml
 - solr_conf/conf/solrconfig.old.xml
 - solr_conf/conf/solrconfig.xml
 - solr_conf/conf/solrconfig.xml.orig
@@ -273,6 +271,7 @@ files:
 - spec/test_app_templates/blacklight.yml
 - spec/test_app_templates/lib/generators/test_app_generator.rb
 - spec/unit/ability_spec.rb
+- spec/unit/blacklight/access_controls/search_builder_spec.rb
 - spec/unit/catalog_spec.rb
 - spec/unit/config_spec.rb
 - spec/unit/enforcement_spec.rb
@@ -288,15 +287,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.7.1
 signing_key: 
 specification_version: 4
 summary: Access controls for blacklight-based applications
@@ -307,6 +306,7 @@ test_files:
 - spec/test_app_templates/blacklight.yml
 - spec/test_app_templates/lib/generators/test_app_generator.rb
 - spec/unit/ability_spec.rb
+- spec/unit/blacklight/access_controls/search_builder_spec.rb
 - spec/unit/catalog_spec.rb
 - spec/unit/config_spec.rb
 - spec/unit/enforcement_spec.rb

data/solr_conf/conf/schema.blacklight.xml

@@ -1,724 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- 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.
--->
-
-<!--  
- This is the Solr schema file. This file should be named "schema.xml" and
- should be in the conf directory under the solr home
- (i.e. ./solr/conf/schema.xml by default) 
- or located where the classloader for the Solr webapp can find it.
-
- This example schema is the recommended starting point for users.
- It should be kept correct and concise, usable out-of-the-box.
-
- For more information, on how to customize this file, please see
- http://wiki.apache.org/solr/SchemaXml
-
- PERFORMANCE NOTE: this schema includes many optional features and should not
- be used for benchmarking.  To improve performance one could
-  - set stored="false" for all fields possible (esp large fields) when you
-    only need to search on the field but don't need to return the original
-    value.
-  - set indexed="false" if you don't need to search on the field, but only
-    return the field as a result of searching on other indexed fields.
-  - remove all unneeded copyField statements
-  - for best index size and searching performance, set "index" to false
-    for all general text fields, use copyField to copy them to the
-    catchall "text" field, and use that for searching.
-  - For maximum indexing performance, use the StreamingUpdateSolrServer
-    java client.
-  - Remember to run the JVM in server mode, and use a higher logging level
-    that avoids logging every request
--->
-
-<schema name="Blacklight Demo Index" version="1.5">
-  <!-- attribute "name" is the name of this schema and is only used for display purposes.
-       Applications should change this to reflect the nature of the search collection.
-       version="1.4" is Solr's version number for the schema syntax and semantics.  It should
-       not normally be changed by applications.
-       1.0: multiValued attribute did not exist, all fields are multiValued by nature
-       1.1: multiValued attribute introduced, false by default 
-       1.2: omitTermFreqAndPositions attribute introduced, true by default except for text fields.
-       1.3: removed optional field compress feature
-       1.4: default auto-phrase (QueryParser feature) to off
-     -->
-
-  <types>
-    <!-- field type definitions. The "name" attribute is
-       just a label to be used by field definitions.  The "class"
-       attribute and any other attributes determine the real
-       behavior of the fieldType.
-         Class names starting with "solr" refer to java classes in the
-       org.apache.solr.analysis package.
-    -->
-
-    <!-- The StrField type is not analyzed, but indexed/stored verbatim. -->
-    <fieldType name="string" class="solr.StrField" sortMissingLast="true" omitNorms="true"/>
-
-    <!-- boolean type: "true" or "false" -->
-    <fieldType name="boolean" class="solr.BoolField" sortMissingLast="true" omitNorms="true"/>
-    <!--Binary data type. The data should be sent/retrieved in as Base64 encoded Strings -->
-    <fieldtype name="binary" class="solr.BinaryField"/>
-
-    <!-- The optional sortMissingLast and sortMissingFirst attributes are
-         currently supported on types that are sorted internally as strings
-         and on numeric types.
-	       This includes "string","boolean", and, as of 3.5 (and 4.x),
-	       int, float, long, date, double, including the "Trie" variants.
-       - If sortMissingLast="true", then a sort on this field will cause documents
-         without the field to come after documents with the field,
-         regardless of the requested sort order (asc or desc).
-       - If sortMissingFirst="true", then a sort on this field will cause documents
-         without the field to come before documents with the field,
-         regardless of the requested sort order.
-       - If sortMissingLast="false" and sortMissingFirst="false" (the default),
-         then default lucene sorting will be used which places docs without the
-         field first in an ascending sort and last in a descending sort.
-    -->
-
-    <!--
-      Default numeric field types. For faster range queries, consider the tint/tfloat/tlong/tdouble types.
-    -->
-    <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
-    <fieldType name="float" class="solr.TrieFloatField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
-    <fieldType name="long" class="solr.TrieLongField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
-    <fieldType name="double" class="solr.TrieDoubleField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
-
-    <!--
-     Numeric field types that index each value at various levels of precision
-     to accelerate range queries when the number of values between the range
-     endpoints is large. See the javadoc for NumericRangeQuery for internal
-     implementation details.
-
-     Smaller precisionStep values (specified in bits) will lead to more tokens
-     indexed per value, slightly larger index size, and faster range queries.
-     A precisionStep of 0 disables indexing at different precision levels.
-    -->
-    <fieldType name="tint" class="solr.TrieIntField" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
-    <fieldType name="tfloat" class="solr.TrieFloatField" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
-    <fieldType name="tlong" class="solr.TrieLongField" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
-    <fieldType name="tdouble" class="solr.TrieDoubleField" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
-
-    <!-- The format for this date field is of the form 1995-12-31T23:59:59Z, and
-         is a more restricted form of the canonical representation of dateTime
-         http://www.w3.org/TR/xmlschema-2/#dateTime    
-         The trailing "Z" designates UTC time and is mandatory.
-         Optional fractional seconds are allowed: 1995-12-31T23:59:59.999Z
-         All other components are mandatory.
-
-         Expressions can also be used to denote calculations that should be
-         performed relative to "NOW" to determine the value, ie...
-
-               NOW/HOUR
-                  ... Round to the start of the current hour
-               NOW-1DAY
-                  ... Exactly 1 day prior to now
-               NOW/DAY+6MONTHS+3DAYS
-                  ... 6 months and 3 days in the future from the start of
-                      the current day
-                      
-         Consult the DateField javadocs for more information.
-
-         Note: For faster range queries, consider the tdate type
-      -->
-    <fieldType name="date" class="solr.TrieDateField" omitNorms="true" precisionStep="0" positionIncrementGap="0"/>
-
-    <!-- A Trie based date field for faster date range queries and date faceting. -->
-    <fieldType name="tdate" class="solr.TrieDateField" omitNorms="true" precisionStep="6" positionIncrementGap="0"/>
-
-    <!-- The "RandomSortField" is not used to store or search any
-         data.  You can declare fields of this type it in your schema
-         to generate pseudo-random orderings of your docs for sorting 
-         purposes.  The ordering is generated based on the field name 
-         and the version of the index, As long as the index version
-         remains unchanged, and the same field name is reused,
-         the ordering of the docs will be consistent.  
-         If you want different psuedo-random orderings of documents,
-         for the same version of the index, use a dynamicField and
-         change the name
-     -->
-    <fieldType name="random" class="solr.RandomSortField" indexed="true" />
-
-    <!-- solr.TextField allows the specification of custom text analyzers
-         specified as a tokenizer and a list of token filters. Different
-         analyzers may be specified for indexing and querying.
-
-         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
-     -->
-    <fieldType name="text" class="solr.TextField" positionIncrementGap="100">
-      <analyzer>
-        <tokenizer class="solr.StandardTokenizerFactory"/>
-        <filter class="solr.ICUFoldingFilterFactory" />
-        <filter class="solr.SnowballPorterFilterFactory" language="English" />
-      </analyzer>
-    </fieldType>
-
-    <!-- One can also specify an existing Analyzer class that has a
-         default constructor via the class attribute on the analyzer element
-    <fieldType name="text_greek" class="solr.TextField">
-      <analyzer class="org.apache.lucene.analysis.el.GreekAnalyzer"/>
-    </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"/>
-      </analyzer>
-    </fieldType>
-
-    <!-- A general text field that has reasonable, generic
-         cross-language defaults: it tokenizes with StandardTokenizer,
-	 removes stop words from case-insensitive "stopwords.txt"
-	 (empty by default), and down cases.  At query time only, it
-	 also applies synonyms. -->
-    <fieldType name="text_general" class="solr.TextField" positionIncrementGap="100">
-      <analyzer type="index">
-        <tokenizer class="solr.StandardTokenizerFactory"/>
-        <!-- in this example, we will only use synonyms at query time
-        <filter class="solr.SynonymFilterFactory" synonyms="index_synonyms.txt" ignoreCase="true" expand="false"/>
-        -->
-        <filter class="solr.LowerCaseFilterFactory"/>
-      </analyzer>
-      <analyzer type="query">
-        <tokenizer class="solr.StandardTokenizerFactory"/>
-        <filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
-        <filter class="solr.LowerCaseFilterFactory"/>
-      </analyzer>
-    </fieldType>
-
-    <!-- A text field with defaults appropriate for English: it
-         tokenizes with StandardTokenizer, removes English stop words
-         (stopwords_en.txt), down cases, protects words from protwords.txt, and
-         finally applies Porter's stemming.  The query time analyzer
-         also applies synonyms from synonyms.txt. -->
-    <fieldType name="text_en" class="solr.TextField" positionIncrementGap="100">
-      <analyzer type="index">
-        <tokenizer class="solr.StandardTokenizerFactory"/>
-        <!-- in this example, we will only use synonyms at query time
-        <filter class="solr.SynonymFilterFactory" synonyms="index_synonyms.txt" ignoreCase="true" expand="false"/>
-        -->
-        <filter class="solr.LowerCaseFilterFactory"/>
-        <filter class="solr.EnglishPossessiveFilterFactory"/>
-        <filter class="solr.KeywordMarkerFilterFactory" protected="protwords.txt"/>
-        <!-- Optionally you may want to use this less aggressive stemmer instead of PorterStemFilterFactory:
-            <filter class="solr.EnglishMinimalStemFilterFactory"/>
-        -->
-        <filter class="solr.PorterStemFilterFactory"/>
-      </analyzer>
-      <analyzer type="query">
-        <tokenizer class="solr.StandardTokenizerFactory"/>
-        <filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
-        <filter class="solr.LowerCaseFilterFactory"/>
-        <filter class="solr.EnglishPossessiveFilterFactory"/>
-        <filter class="solr.KeywordMarkerFilterFactory" protected="protwords.txt"/>
-        <!-- Optionally you may want to use this less aggressive stemmer instead of PorterStemFilterFactory:
-            <filter class="solr.EnglishMinimalStemFilterFactory"/>
-        -->
-        <filter class="solr.PorterStemFilterFactory"/>
-      </analyzer>
-    </fieldType>
-
-    <!-- A text field with defaults appropriate for English, plus
-	 aggressive word-splitting and autophrase features enabled.
-	 This field is just like text_en, except it adds
-	 WordDelimiterFilter to enable splitting and matching of
-	 words on case-change, alpha numeric boundaries, and
-	 non-alphanumeric chars.  This means certain compound word
-	 cases will work, for example query "wi fi" will match
-	 document "WiFi" or "wi-fi".  However, other cases will still
-	 not match, for example if the query is "wifi" and the
-	 document is "wi fi" or if the query is "wi-fi" and the
-	 document is "wifi".
-        -->
-    <fieldType name="text_en_splitting" class="solr.TextField" positionIncrementGap="100" autoGeneratePhraseQueries="true">
-      <analyzer type="index">
-        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
-        <!-- in this example, we will only use synonyms at query time
-        <filter class="solr.SynonymFilterFactory" synonyms="index_synonyms.txt" ignoreCase="true" expand="false"/>
-        -->
-        <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="1" catenateNumbers="1" catenateAll="0" splitOnCaseChange="1"/>
-        <filter class="solr.LowerCaseFilterFactory"/>
-        <filter class="solr.KeywordMarkerFilterFactory" protected="protwords.txt"/>
-        <filter class="solr.PorterStemFilterFactory"/>
-      </analyzer>
-      <analyzer type="query">
-        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
-        <filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
-        <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="0" catenateNumbers="0" catenateAll="0" splitOnCaseChange="1"/>
-        <filter class="solr.LowerCaseFilterFactory"/>
-        <filter class="solr.KeywordMarkerFilterFactory" protected="protwords.txt"/>
-        <filter class="solr.PorterStemFilterFactory"/>
-      </analyzer>
-    </fieldType>
-
-    <!-- Less flexible matching, but less false matches.  Probably not ideal for product names,
-         but may be good for SKUs.  Can insert dashes in the wrong place and still match. -->
-    <fieldType name="text_en_splitting_tight" class="solr.TextField" positionIncrementGap="100" autoGeneratePhraseQueries="true">
-      <analyzer>
-        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
-        <filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="false"/>
-        <!--<filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords_en.txt"/>-->
-        <filter class="solr.WordDelimiterFilterFactory" generateWordParts="0" generateNumberParts="0" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
-        <filter class="solr.LowerCaseFilterFactory"/>
-        <filter class="solr.KeywordMarkerFilterFactory" protected="protwords.txt"/>
-        <filter class="solr.EnglishMinimalStemFilterFactory"/>
-        <!-- this filter can remove any duplicate tokens that appear at the same position - sometimes
-             possible with WordDelimiterFilter in conjuncton with stemming. -->
-        <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
-      </analyzer>
-    </fieldType>
-
-    <!-- Just like text_general except it reverses the characters of
-	 each token, to enable more efficient leading wildcard queries. -->
-    <fieldType name="text_general_rev" class="solr.TextField" positionIncrementGap="100">
-      <analyzer type="index">
-        <tokenizer class="solr.StandardTokenizerFactory"/>
-        <filter class="solr.LowerCaseFilterFactory"/>
-        <filter class="solr.ReversedWildcardFilterFactory" withOriginal="true"
-                maxPosAsterisk="3" maxPosQuestion="2" maxFractionAsterisk="0.33"/>
-      </analyzer>
-      <analyzer type="query">
-        <tokenizer class="solr.StandardTokenizerFactory"/>
-        <filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
-        <filter class="solr.LowerCaseFilterFactory"/>
-      </analyzer>
-    </fieldType>
-
-    <fieldType name="textSpell" class="solr.TextField" positionIncrementGap="100" >
-      <analyzer>
-        <tokenizer class="solr.StandardTokenizerFactory"/>
-        <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt"/>
-        <filter class="solr.StandardFilterFactory"/>
-        <filter class="solr.LowerCaseFilterFactory"/>
-        <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
-      </analyzer>
-    </fieldType>
-
-    <fieldType class="solr.TextField" name="textSuggest" positionIncrementGap="100">
-      <analyzer>
-        <tokenizer class="solr.KeywordTokenizerFactory"/>
-        <filter class="solr.StandardFilterFactory"/>
-        <filter class="solr.LowerCaseFilterFactory"/>
-        <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
-      </analyzer>
-    </fieldType>
-
-    <!-- charFilter + WhitespaceTokenizer  -->
-    <!--
-    <fieldType name="text_char_norm" class="solr.TextField" positionIncrementGap="100" >
-      <analyzer>
-        <charFilter class="solr.MappingCharFilterFactory" mapping="mapping-ISOLatin1Accent.txt"/>
-        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
-      </analyzer>
-    </fieldType>
-    -->
-
-    <!-- This is an example of using the KeywordTokenizer along
-         With various TokenFilterFactories to produce a sortable field
-         that does not include some properties of the source text
-      -->
-    <fieldType name="alphaOnlySort" class="solr.TextField" sortMissingLast="true" omitNorms="true">
-      <analyzer>
-        <!-- KeywordTokenizer does no actual tokenizing, so the entire
-             input string is preserved as a single token
-          -->
-        <tokenizer class="solr.KeywordTokenizerFactory"/>
-        <!-- The LowerCase TokenFilter does what you expect, which can be
-             when you want your sorting to be case insensitive
-          -->
-        <filter class="solr.LowerCaseFilterFactory" />
-        <!-- The TrimFilter removes any leading or trailing whitespace -->
-        <filter class="solr.TrimFilterFactory" />
-        <!-- The PatternReplaceFilter gives you the flexibility to use
-             Java Regular expression to replace any sequence of characters
-             matching a pattern with an arbitrary replacement string, 
-             which may include back references to portions of the original
-             string matched by the pattern.
-             
-             See the Java Regular Expression documentation for more
-             information on pattern and replacement string syntax.
-             
-             http://java.sun.com/j2se/1.5.0/docs/api/java/util/regex/package-summary.html
-          -->
-        <filter class="solr.PatternReplaceFilterFactory"
-                pattern="([^a-z])" replacement="" replace="all"
-                />
-      </analyzer>
-    </fieldType>
-
-    <fieldtype name="phonetic" stored="false" indexed="true" class="solr.TextField" >
-      <analyzer>
-        <tokenizer class="solr.StandardTokenizerFactory"/>
-        <filter class="solr.DoubleMetaphoneFilterFactory" inject="false"/>
-      </analyzer>
-    </fieldtype>
-
-    <fieldtype name="payloads" stored="false" indexed="true" class="solr.TextField" >
-      <analyzer>
-        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
-        <!--
-        The DelimitedPayloadTokenFilter can put payloads on tokens... for example,
-        a token of "foo|1.4"  would be indexed as "foo" with a payload of 1.4f
-        Attributes of the DelimitedPayloadTokenFilterFactory : 
-         "delimiter" - a one character delimiter. Default is | (pipe)
-	 "encoder" - how to encode the following value into a playload
-	    float -> org.apache.lucene.analysis.payloads.FloatEncoder,
-	    integer -> o.a.l.a.p.IntegerEncoder
-	    identity -> o.a.l.a.p.IdentityEncoder
-            Fully Qualified class name implementing PayloadEncoder, Encoder must have a no arg constructor.
-         -->
-        <filter class="solr.DelimitedPayloadTokenFilterFactory" encoder="float"/>
-      </analyzer>
-    </fieldtype>
-
-    <!-- lowercases the entire field value, keeping it as a single token.  -->
-    <fieldType name="lowercase" class="solr.TextField" positionIncrementGap="100">
-      <analyzer>
-        <tokenizer class="solr.KeywordTokenizerFactory"/>
-        <filter class="solr.LowerCaseFilterFactory" />
-      </analyzer>
-    </fieldType>
-
-    <fieldType name="text_path" class="solr.TextField" positionIncrementGap="100">
-      <analyzer>
-        <tokenizer class="solr.PathHierarchyTokenizerFactory"/>
-      </analyzer>
-    </fieldType>
-
-    <!-- since fields of this type are by default not stored or indexed,
-         any data added to them will be ignored outright.  -->
-    <fieldtype name="ignored" stored="false" indexed="false" multiValued="true" class="solr.StrField" />
-
-    <!-- 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"/>
-
-    <!--
-     A Geohash is a compact representation of a latitude longitude pair in a single field.
-     See http://wiki.apache.org/solr/SpatialSearch
-    -->
-    <fieldtype name="geohash" class="solr.GeoHashField"/>
-  </types>
-
-
-  <fields>
-    <!-- Valid attributes for fields:
-      name: mandatory - the name for the field
-      type: mandatory - the name of a previously defined type from the
-        <types> section
-      indexed: true if this field should be indexed (searchable or sortable)
-      stored: true if this field should be retrievable
-      multiValued: true if this field may contain multiple values per document
-      omitNorms: (expert) set to true to omit the norms associated with
-        this field (this disables length normalization and index-time
-        boosting for the field, and saves some memory).  Only full-text
-        fields or fields that need an index-time boost need norms.
-      termVectors: [false] set to true to store the term vector for a
-        given field.
-        When using MoreLikeThis, fields used for similarity should be
-        stored for best performance.
-      termPositions: Store position information with the term vector.
-        This will increase storage costs.
-      termOffsets: Store offset information with the term vector. This
-        will increase storage costs.
-      default: a value that should be used if no value is specified
-        when adding a document.
-    -->
-
-    <!-- NOTE: this is not a full list of fields in the index; dynamic fields are also used -->
-    <field name="id" type="string" indexed="true" stored="true" required="true" />
-    <field name="timestamp" type="date" indexed="true" stored="true" default="NOW" multiValued="false"/>
-    <!-- default, catch all search field -->
-    <field name="text" type="text" indexed="true" stored="false" multiValued="true"/>
-
-    <!-- these display fields are NOT multi-valued -->
-    <field name="marc_display" type="string" indexed="false" stored="true" multiValued="false"/>
-    <field name="title_display" type="string" indexed="false" stored="true" multiValued="false"/>
-    <field name="title_vern_display" type="string" indexed="false" stored="true" multiValued="false"/>
-    <field name="subtitle_display" type="string" indexed="false" stored="true" multiValued="false"/>
-    <field name="subtitle_vern_display" type="string" indexed="false" stored="true" multiValued="false"/>
-    <field name="author_display" type="string" indexed="false" stored="true" multiValued="false"/>
-    <field name="author_vern_display" type="string" indexed="false" stored="true" multiValued="false"/>
-
-    <!-- these fields are also used for display, so they must be stored -->
-    <field name="isbn_t" type="text" indexed="true" stored="true" multiValued="true"/>
-    <field name="language_facet" type="string" indexed="true" stored="true" multiValued="true" />
-    <field name="subject_topic_facet" type="string" indexed="true" stored="true" multiValued="true" />
-    <field name="subject_era_facet" type="string" indexed="true" stored="true" multiValued="true" />
-    <field name="subject_geo_facet" type="string" indexed="true" stored="true" multiValued="true" />
-    <!-- pub_date is used for facet and display so it must be indexed and stored -->
-    <field name="pub_date" type="string" indexed="true" stored="true" multiValued="true"/>
-    <!-- pub_date sort uses new trie-based int fields, which are recommended for any int and are displayable, sortable, and range-quer
-    we use 'tint' for faster range-queries. -->
-    <field name="pub_date_sort" type="tint" indexed="true" stored="true" multiValued="false"/>
-
-    <!-- format is used for facet, display, and choosing which partial to use for the show view, so it must be stored and indexed -->
-    <field name="format" type="string" indexed="true" stored="true"/>
-
-
-
-    <!-- Dynamic field definitions allow using convention over configuration
-        for fields via the specification of patterns to match field names.
-        EXAMPLE:  name="*_i" will match any field ending in _i (like myid_i, z_i)
-        RESTRICTION: the glob-like pattern in the name attribute must have
-        a "*" only at the start or the end.  -->
-
-    <!-- text (_t...) -->
-    <dynamicField name="*_ti" type="text_general" stored="false" indexed="true" multiValued="false"/>
-    <dynamicField name="*_tim" type="text_general" stored="false" indexed="true" multiValued="true"/>
-    <dynamicField name="*_ts" type="text_general" stored="true" indexed="false" multiValued="false"/>
-    <dynamicField name="*_tsm" type="text_general" stored="true" indexed="false" multiValued="true"/>
-    <dynamicField name="*_tsi" type="text_general" stored="true" indexed="true" multiValued="false"/>
-    <dynamicField name="*_tsim" type="text_general" stored="true" indexed="true" multiValued="true"/>
-    <dynamicField name="*_tiv" type="text_general" stored="false" indexed="true" multiValued="false" termVectors="true" termPositions="true" termOffsets="true"/>
-    <dynamicField name="*_timv" type="text_general" stored="false" indexed="true" multiValued="true" termVectors="true" termPositions="true" termOffsets="true"/>
-    <dynamicField name="*_tsiv" type="text_general" stored="true" indexed="true" multiValued="false" termVectors="true" termPositions="true" termOffsets="true"/>
-    <dynamicField name="*_tsimv" type="text_general" 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="alphaOnlySort" 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"/>
-
-  </fields>
-
-  <!-- Field to use to determine and enforce document uniqueness.
-       Unless this field is marked with required="false", it will be a required field
-    -->
-  <uniqueKey>id</uniqueKey>
-
-  <!-- field for the QueryParser to use when an explicit fieldname is absent -->
-  <defaultSearchField>text</defaultSearchField>
-
-  <!-- SolrQueryParser configuration: defaultOperator="AND|OR" -->
-  <solrQueryParser defaultOperator="OR"/>
-
-  <!-- copyField commands copy one field to another at the time a document
-        is added to the index.  It's used either to index the same field differently,
-        or to add multiple fields to the same field for easier/faster searching.  -->
-  <!-- Copy Fields -->
-
-  <!-- unstemmed fields -->
-  <!--<copyField source="title_t" dest="title_unstem_search"/>-->
-  <!--<copyField source="subtitle_t" dest="subtitle_unstem_search"/>-->
-  <!--<copyField source="title_addl_t" dest="title_addl_unstem_search"/>-->
-  <!--<copyField source="title_added_entry_t" dest="title_added_entry_unstem_search"/>-->
-  <!--<copyField source="title_series_t" dest="title_series_unstem_search"/>-->
-  <!--<copyField source="author_t" dest="author_unstem_search"/>-->
-  <!--<copyField source="author_addl_t" dest="author_addl_unstem_search"/>-->
-  <!--<copyField source="subject_t" dest="subject_unstem_search"/>-->
-  <!--<copyField source="subject_addl_t" dest="subject_addl_unstem_search"/>-->
-  <!--<copyField source="subject_topic_facet" dest="subject_topic_unstem_search"/>-->
-
-  <!-- sort fields -->
-  <copyField source="pub_date" dest="pub_date_sort"/>
-
-
-  <!--&lt;!&ndash; spellcheck fields &ndash;&gt;-->
-  <!--&lt;!&ndash; default spell check;  should match fields for default request handler &ndash;&gt;-->
-  <!--&lt;!&ndash; it won't work with a copy of a copy field &ndash;&gt;-->
-  <!--<copyField source="*_t" dest="spell"/>-->
-  <!--<copyField source="*_facet" dest="spell"/>-->
-  <!--&lt;!&ndash; title spell check;  should match fields for title request handler &ndash;&gt;-->
-  <!--<copyField source="title_t" dest="title_spell"/>-->
-  <!--<copyField source="subtitle_t" dest="title_spell"/>-->
-  <!--<copyField source="addl_titles_t" dest="title_spell"/>-->
-  <!--<copyField source="title_added_entry_t" dest="title_spell"/>-->
-  <!--<copyField source="title_series_t" dest="title_spell"/>-->
-  <!--&lt;!&ndash; author spell check; should match fields for author request handler &ndash;&gt;-->
-  <!--<copyField source="author_t" dest="author_spell"/>-->
-  <!--<copyField source="author_addl_t" dest="author_spell"/>-->
-  <!--&lt;!&ndash; subject spell check; should match fields for subject request handler &ndash;&gt;-->
-  <!--<copyField source="subject_topic_facet" dest="subject_spell"/>-->
-  <!--<copyField source="subject_t" dest="subject_spell"/>-->
-  <!--<copyField source="subject_addl_t" dest="subject_spell"/>-->
-
-  <!--&lt;!&ndash; OpenSearch query field should match request handler search fields &ndash;&gt;-->
-  <!--<copyField source="title_t" dest="opensearch_display"/>-->
-  <!--<copyField source="subtitle_t" dest="opensearch_display"/>-->
-  <!--<copyField source="addl_titles_t" dest="opensearch_display"/>-->
-  <!--<copyField source="title_added_entry_t" dest="opensearch_display"/>-->
-  <!--<copyField source="title_series_t" dest="opensearch_display"/>-->
-  <!--<copyField source="author_t" dest="opensearch_display"/>-->
-  <!--<copyField source="author_addl_t" dest="opensearch_display"/>-->
-  <!--<copyField source="subject_topic_facet" dest="opensearch_display"/>-->
-  <!--<copyField source="subject_t" dest="opensearch_display"/>-->
-  <!--<copyField source="subject_addl_t" dest="opensearch_display"/>-->
-
-  <!--&lt;!&ndash; for suggestions &ndash;&gt;-->
-  <!--<copyField source="*_t" dest="suggest"/>-->
-  <!--<copyField source="*_facet" dest="suggest"/>-->
-
-  <!-- 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="*_t" dest="text" maxChars="3000"/> -->
-
-  <!-- copy name to alphaNameSort, a field designed for sorting by name -->
-  <!-- <copyField source="name" dest="alphaNameSort"/> -->
-
-
-  <!-- Similarity is the scoring routine for each document vs. a query.
-       A custom similarity may be specified here, but the default is fine
-       for most applications.  -->
-  <!-- <similarity class="org.apache.lucene.search.DefaultSimilarity"/> -->
-  <!-- ... OR ...
-       Specify a SimilarityFactory class name implementation
-       allowing parameters to be used.
-  -->
-  <!--
-  <similarity class="com.example.solr.CustomSimilarityFactory">
-    <str name="paramkey">param value</str>
-  </similarity>
-  -->
-
-
-</schema>