blacklight 3.0pre1 → 3.0pre2

data/lib/blacklight/version.rb

@@ -1,3 +1,3 @@
 module Blacklight
-  VERSION = "3.0pre1"
+  VERSION = "3.0pre2"
 end

data/lib/generators/blacklight/assets_generator.rb

@@ -0,0 +1,25 @@
+# Copy Blacklight assets to public folder in current app. 
+# If you want to do this on application startup, you can
+# add this next line to your one of your environment files --
+# generally you'd only want to do this in 'development', and can
+# add it to environments/development.rb:
+#       require File.join(Blacklight.root, "lib", "generators", "blacklight", "assets_generator.rb")
+#       Blacklight::AssetsGenerator.start(["--force", "--quiet"])
+
+
+# Need the requires here so we can call the generator from environment.rb
+# as suggested above. 
+require 'rails/generators'
+require 'rails/generators/base'
+module Blacklight
+  class AssetsGenerator < Rails::Generators::Base
+    source_root File.expand_path('../templates', __FILE__)
+  
+    def assets
+      directory("public/images", "public/images/blacklight")
+      directory("public/stylesheets", "public/stylesheets/blacklight")
+      directory("public/javascripts", "public/javascripts/blacklight")
+    end
+    
+  end
+end

data/lib/generators/blacklight/blacklight_generator.rb

@@ -60,6 +60,18 @@ EOF
       generate "devise:install"
       generate "devise", model_name.classify
       generate "devise:views"
+      
+      # add the #to_s to the model.      
+      insert_into_file("app/models/#{model_name}.rb", :before => /end(\n| )*$/) do 
+      %{
+  # Method added by Blacklight; Blacklight uses #to_s on your
+  # user class to get a user-displayable login/identifier for
+  # the account. 
+  def to_s
+    email
+  end
+}
+      end
     end
   end
 
@@ -70,9 +82,12 @@ EOF
     directory("config/SolrMarc")
   end
   
+  require File.expand_path('../assets_generator.rb', __FILE__)  
   # Copy all files in templates/public/ directory to public/
+  # Call external generator in AssetsGenerator, so we can
+  # leave that callable seperately too. 
   def copy_public_assets 
-    directory("public")
+    Blacklight::AssetsGenerator.start()    
   end
   
   # Setup the database migrations

data/lib/generators/blacklight/jetty_generator.rb

@@ -0,0 +1,101 @@
+
+module Blacklight
+  class Jetty < Rails::Generators::Base
+    source_root File.expand_path('../templates', __FILE__)
+    
+    
+    argument :save_location, :type=>"string", :desc => "where to install the jetty", :default => "./jetty"
+    class_option :environment, :aliases => "-e", :type=>"string", :desc => "environment to use jetty with. Will insert into solr.yml, and also offer to index test data in test environment.", :default => Rails.env
+    # change this to a different download if you want to peg to a different
+    # tagged version of our known-good jetty/solr.
+    class_option :download_url, :aliases => "-u", :type=>"string", :default =>"https://github.com/projectblacklight/blacklight-jetty/zipball/v1.4.1-1" , :desc=>"location of zip file including a jetty with solr setup for blacklight."
+    class_option :downloaded_package, :aliases => "-d", :type=>"string", :desc => "manual download of BL-jetty zip file"
+     
+    
+    desc """ 
+Installs a jetty container with a solr installed in it. A solr setup known 
+good with default blacklight setup, including solr conf files for out
+of the box blacklight. 
+
+Also adds jetty_path key to solr.yml for selected environment, to refer
+to this install. 
+
+Requires system('unzip... ') to work, probably won't work on Windows.
+
+"""
+    
+    def download_jetty         
+      tmp_save_dir = File.join(Rails.root, "tmp", "jetty_generator")      
+      empty_directory(tmp_save_dir)
+      
+      begin
+        unless options[:downloaded_package]
+          begin        
+            say_status("fetching", options[:download_url])
+            zip_file = File.join(tmp_save_dir, "bl_jetty.zip")                
+            get(options[:download_url], zip_file)
+          rescue Exception => e
+            say_status("error", "Could not download #{options[:download_url]} : #{e}", :red)
+            raise Thor::Error.new("Try downloading manually and then using '-d' option?")
+          end
+        else
+          zip_file = options[:downloaded_package]
+        end
+        
+        
+        say_status("unzipping", zip_file)
+        "unzip -d #{tmp_save_dir} -qo #{zip_file}".tap do |command|          
+          system(command) or raise Thor::Error.new("Error executing: #{command}")       
+        end        
+        # It unzips into a top_level directory we've got to find by name
+        # in the tmp dir, sadly. 
+        expanded_dir = Dir[File.join(tmp_save_dir, "projectblacklight-blacklight-jetty-*")].first        
+
+        if File.exists?( save_location ) && ! options[:force]
+          raise Thor::Error.new("cancelled by user") unless [nil, "", "Y", "y"].include? ask("Copy over existing #{save_location}? [Yn]")
+        end
+        
+        directory(expanded_dir, save_location, :verbose => false)
+        say_status("installed", save_location )
+      ensure
+        remove_dir(tmp_save_dir)
+      end                  
+    end
+    
+    # the only thing that's REALLY BL-specific is these conf files
+    # installed by another generator. We write em on top of the solr we
+    # just installed. We "force" it because we're usually writing on top of files
+    # we just installed anyway. The user should have said 'no' to overwriting
+    # their dir if they already had one!  
+    #
+    # If we later install Solr from somewhere other than BL jetty repo, we'd
+    # still want to write these on top, just like this. 
+    def install_conf_files
+      generate("blacklight:solr_conf", "#{File.join(save_location, 'solr', 'conf')} --force")
+    end
+    
+    # adds a jetty_path key to solr.yml for the current environment, so
+    # rake tasks for automatically starting jetty/solr (as well as
+    # for indexing with solrmarc) can find it. 
+    def add_jetty_path_to_solr_yml        
+      # inject_into_file no-ops silently if the :after isn't found, we
+      # want to be noisy. 
+      config_file = "config/solr.yml"
+      config_file_full_path = File.expand_path(config_file, destination_root)
+      after_hook = /#{Regexp.escape(options[:environment])}\:[^\n]*\n/
+            
+      if !(File.exists?(config_file_full_path) && File.binread( config_file_full_path ) =~ after_hook)
+        say_status("skipped", "Could not find '#{options[:environment]}' block in #{config_file} to add jetty_path to.", :red)
+      elsif File.binread( config_file_full_path  ) =~ /#{Regexp.escape(options[:environment])}\:[^\n]*\n.*(?!\n\n).*jetty_path\:/
+        say_status("skipped", "#{config_file} '#{options[:environment]}' block already has jetty_path, not overwriting.", :red)        
+      else
+        inject_into_file config_file, :verbose => false, :after => after_hook do
+          "  jetty_path: '#{save_location}'\n"
+        end
+        say_status("insert", "#{config_file}: jetty_path key for '#{options[:environment]}' block")
+      end                    
+    end
+    
+    
+  end
+end

data/lib/generators/blacklight/solr_conf_generator.rb

@@ -0,0 +1,25 @@
+module Blacklight
+  class SolrConf < Rails::Generators::Base
+    source_root File.expand_path('../templates', __FILE__)
+    
+    argument :target_path, :type=>:string, :default => "."
+    
+    desc """ 
+Generate solr config files solrconfig.xml and schema.xml
+to directory you specify. (default current dir).  
+
+Conf files generated are set up to work with out-of-the-box default 
+blacklight.
+
+You might want to put them into a solr setup, or you might just
+want to look at them.   
+
+"""
+    
+    # this generator used by test jetty generator too. 
+    def solr_conf_files
+      copy_file "solr_conf/schema.xml", File.expand_path("./schema.xml", target_path)
+      copy_file "solr_conf/solrconfig.xml", File.expand_path("./solrconfig.xml", target_path)
+    end
+  end
+end

data/lib/generators/blacklight/templates/catalog_controller.rb

@@ -2,7 +2,6 @@ require 'blacklight/catalog'
 
 class CatalogController < ApplicationController  
 
-  include Blacklight::SolrHelper
   include Blacklight::Catalog
 
 end 

data/lib/generators/blacklight/templates/config/solr.yml

@@ -1,6 +1,18 @@
+# = jetty_path key
+# each environment can have a jetty_path with absolute or relative
+# (to app root) path to a jetty/solr install. This is used
+# by the rake tasks that start up solr automatically for testing
+# and by rake solr:marc:index.  
+#
+# jetty_path is not used by a running Blacklight application
+# at all. In general you do NOT need to deploy solr in Jetty, you can deploy it
+# however you want.  
+# jetty_path is only required for rake tasks that need to know
+# how to start up solr, generally for automated testing. 
+
 development:
   url: http://127.0.0.1:8983/solr
-test:
+test: &test
   url: http://127.0.0.1:8888/solr
 cucumber:
-  url: http://127.0.0.1:8888/solr
+  <<: *test

data/lib/generators/blacklight/templates/public/javascripts/blacklight.js

@@ -1,3 +1,8 @@
+/* This file is generated by Blacklight. You probably don't want to edit
+   this file directly, or you'll have to manually merge your changes if later
+   versions of Blacklight change this file. Instead, use your own JS file
+   which over-rides things in this JS file, as described below: */
+
 /* Blacklight has a Javascript setup meant to support local disabling, 
   modification, and use of Blacklight behaviors. 
   

data/lib/generators/blacklight/templates/public/stylesheets/blacklight.css

@@ -1,3 +1,9 @@
+/* This file is generated by Blacklight. You probably don't want to edit
+   this file directly, or you'll have to manually merge your changes if later
+   versions of Blacklight change this file. Instead, use your own CSS file
+   which over-rides things in this file. Or of course you can choose
+   not to use the Blacklight CSS file at all in your local app. */
+
 /* Global */
 html {background: #707070;}
 
@@ -6,7 +12,7 @@ html {background: #707070;}
    an accident. */
 .ui-dialog-content { text-align: left; }
 
-body {background: url('../images/blacklight/bg.png') repeat-x top left; font: 0.7em Verdana, "Lucida Grande", "Lucida Sans Unicode", "Arial Unicode MS", Arial, sans-serif; line-height: 1.4; color:#333; margin: 0px; padding: 15px;}
+body {background: url('../../images/blacklight/bg.png') repeat-x top left; font: 0.7em Verdana, "Lucida Grande", "Lucida Sans Unicode", "Arial Unicode MS", Arial, sans-serif; line-height: 1.4; color:#333; margin: 0px; padding: 15px;}
 
 select,input,button,textarea {font: 1em Verdana, "Lucida Grande", "Lucida Sans Unicode", "Arial Unicode MS", Arial, sans-serif;}
 
@@ -32,7 +38,7 @@ a:hover {color: #029;}
 #hd {margin: 0em 2em 0 2em; padding: 2em 0 2em 0; }
 #hd .yui-g {text-align: right;}
 #hd .yui-g .first {text-align: left;}
-#doc, #doc2, #doc3, #doc4 {background: #fff url('../images/blacklight/border.png') repeat-x top left; border-bottom: 2px solid #555; margin: 0px auto;}
+#doc, #doc2, #doc3, #doc4 {background: #fff url('../../images/blacklight/border.png') repeat-x top left; border-bottom: 2px solid #555; margin: 0px auto;}
 /* border-top: 10px solid #548cd8; -moz-border-top-colors: #548cd8 #5188d3 #4e84d0 #4b81cd #497dc9 #457ac6 #4376c2 #4173be #3e71bc #3d6fba; */
 
 /* Body Container Layout */
@@ -43,7 +49,7 @@ a:hover {color: #029;}
 .sidebar p {padding-top: 2em;}
 
 /* Top Banner */
-h1.site_title {background: transparent url('../images/blacklight/logo.png') no-repeat top left; margin: 2em 0px 0px 1em; height: 35px; width: 120px;}
+h1.site_title {background: transparent url('../../images/blacklight/logo.png') no-repeat top left; margin: 2em 0px 0px 1em; height: 35px; width: 120px;}
 .first h1 {margin: 0px; padding: 0px;}
 h1.site_title a {display:block; height: 35px; width:120px; text-indent: -9999px; overflow: hidden; text-decoration: none; border: 0px;}
 h1.site_title a:link, h1.site_title a:visited, h1.site_title a:hover, h1.site_title a:active {border: 0px;}

data/lib/generators/blacklight/templates/solr_conf/schema.xml

@@ -0,0 +1,339 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--  
+    For information on how to customize this file, please see
+    http://wiki.apache.org/solr/SchemaXml.  The page also has a link to an 
+    extensively commented version of this file.
+-->
+<schema name="Blacklight Demo Index" version="1.2">
+  <!-- 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.2" 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
+     -->
+  <types>
+    <!-- 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.
+	       This includes "string","boolean","sint","slong","sfloat","sdouble","pdate"
+       - 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"/>
+
+    <!-- included for backwards compat, same as "pint" below. For backwards
+         compat only, see notes at "pint" -->    
+    <fieldType name="integer" class="solr.IntField" omitNorms="true"/>
+    
+     <!--
+     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"/>
+
+    <!--
+      Note:
+      These should only be used for compatibility with existing indexes (created with older Solr versions)
+      or if "sortMissingFirst" or "sortMissingLast" functionality is needed. Use Trie based fields instead.
+
+      Plain numeric field types that store and index the text
+      value verbatim (and hence don't support range queries, since the
+      lexicographic ordering isn't equal to the numeric ordering)
+    -->
+    <fieldType name="pint" class="solr.IntField" omitNorms="true"/>
+    <fieldType name="plong" class="solr.LongField" omitNorms="true"/>
+    <fieldType name="pfloat" class="solr.FloatField" omitNorms="true"/>
+    <fieldType name="pdouble" class="solr.DoubleField" omitNorms="true"/>
+    <fieldType name="pdate" class="solr.DateField" sortMissingLast="true" omitNorms="true"/>
+
+    <!--
+      Note:
+      These should only be used for compatibility with existing indexes (created with older Solr versions)
+      or if "sortMissingFirst" or "sortMissingLast" functionality is needed. Use Trie based fields instead.
+
+      Numeric field types that manipulate the value into
+      a string value that isn't human-readable in its internal form,
+      but with a lexicographic ordering the same as the numeric ordering,
+      so that range queries work correctly.
+    -->
+    <fieldType name="sint" class="solr.SortableIntField" sortMissingLast="true" omitNorms="true"/>
+    <fieldType name="slong" class="solr.SortableLongField" sortMissingLast="true" omitNorms="true"/>
+    <fieldType name="sfloat" class="solr.SortableFloatField" sortMissingLast="true" omitNorms="true"/>
+    <fieldType name="sdouble" class="solr.SortableDoubleField" sortMissingLast="true" omitNorms="true"/>
+    
+    <!-- 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 type="index">
+        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+        <!-- custom filter from bob@umich -->
+        <filter class="schema.UnicodeNormalizationFilterFactory" version="icu4j" composed="false" remove_diacritics="true" remove_modifiers="true" fold="true" />
+        <!-- cusotm filter from bob@umich, tokenizes CJK char-by-char. Not
+             sure how good that is, but it's probably better than tokenizing
+             only at whitespace. -->
+        <filter class="schema.CJKFilterFactory"  bigrams="false"/>
+        <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt" enablePositionIncrements="true" />
+        <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="1" catenateNumbers="1" catenateAll="0" splitOnCaseChange="1"/>
+        <filter class="solr.LowerCaseFilterFactory"/>
+        <filter class="solr.SnowballPorterFilterFactory" language="English" protected="protwords.txt"/>        <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+      </analyzer>
+      <analyzer type="query">
+        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+        <filter class="schema.UnicodeNormalizationFilterFactory" version="icu4j" composed="false" remove_diacritics="true" remove_modifiers="true" fold="true" />
+        <filter class="schema.CJKFilterFactory"  bigrams="false"/>
+        <filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
+        <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt" enablePositionIncrements="true" />
+        <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="0" catenateNumbers="0" catenateAll="0" splitOnCaseChange="1"/>
+        <filter class="solr.LowerCaseFilterFactory"/>
+        <filter class="solr.SnowballPorterFilterFactory" language="English" protected="protwords.txt"/>        <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+      </analyzer>
+    </fieldType>
+
+    <!-- Analyzed Text, no Stemming or Synonyms -->
+    <fieldtype name="textNoStem" class="solr.TextField" positionIncrementGap="100">
+      <analyzer type="index">
+        <tokenizer class="solr.WhitespaceTokenizerFactory" />
+        <filter class="schema.UnicodeNormalizationFilterFactory" version="icu4j" composed="false" remove_diacritics="true" remove_modifiers="true" fold="true" />
+        <filter class="schema.CJKFilterFactory"  bigrams="false"/>
+        <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt" enablePositionIncrements="true" />
+        <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="1" catenateNumbers="1" catenateAll="0" splitOnCaseChange="1" />
+        <filter class="solr.LowerCaseFilterFactory" />
+        <filter class="solr.RemoveDuplicatesTokenFilterFactory" />
+      </analyzer>
+      <analyzer type="query">
+        <tokenizer class="solr.WhitespaceTokenizerFactory" />
+        <filter class="schema.UnicodeNormalizationFilterFactory" version="icu4j" composed="false" remove_diacritics="true" remove_modifiers="true" fold="true" />
+        <filter class="schema.CJKFilterFactory"  bigrams="false"/>
+        <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt" enablePositionIncrements="true" />
+        <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="0" catenateNumbers="0" catenateAll="0" splitOnCaseChange="1" />
+        <filter class="solr.LowerCaseFilterFactory" />
+        <filter class="solr.RemoveDuplicatesTokenFilterFactory" />
+      </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="textTight" class="solr.TextField" positionIncrementGap="100" >
+      <analyzer>
+        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+        <filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="false"/>
+        <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt"/>
+        <filter class="solr.WordDelimiterFilterFactory" generateWordParts="0" generateNumberParts="0" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
+        <filter class="solr.LowerCaseFilterFactory"/>
+        <filter class="solr.SnowballPorterFilterFactory" language="English" protected="protwords.txt"/>
+        <!-- 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>
+
+    <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 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"/>
+        <filter class="schema.UnicodeNormalizationFilterFactory" version="icu4j" composed="false" remove_diacritics="true" remove_modifiers="true" fold="true" />
+        <filter class="solr.LowerCaseFilterFactory" />
+        <filter class="solr.TrimFilterFactory" />
+<!-- 
+        <filter class="solr.PatternReplaceFilterFactory" pattern="([^a-z\d])" replacement="" replace="all" />
+-->
+      </analyzer>
+    </fieldType>
+  </types>
+
+  <fields>   
+    <!-- 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-query-able. In addition,
+    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"/>
+
+    <dynamicField name="*_i"  type="int"    indexed="true"  stored="true"/>
+    <dynamicField name="*_s"  type="string"  indexed="true"  stored="true" multiValued="true"/>
+    <dynamicField name="*_l"  type="long"   indexed="true"  stored="true"/>
+    <dynamicField name="*_t"  type="text"    indexed="true"  stored="false" multiValued="true"/>
+    <dynamicField name="*_b"  type="boolean" indexed="true"  stored="true"/>
+    <dynamicField name="*_f"  type="float"  indexed="true"  stored="true"/>
+    <dynamicField name="*_d"  type="double" indexed="true"  stored="true"/>
+    <dynamicField name="*_dt" type="date"    indexed="true"  stored="true"/>
+    <dynamicField name="random*" type="random" />
+
+    <dynamicField name="*_facet" type="string" indexed="true" stored="false" multiValued="true" />
+    <dynamicField name="*_display" type="string" indexed="false" stored="true" multiValued="true" />
+    <dynamicField name="*_sort" type="alphaOnlySort" indexed="true" stored="false"/>
+    <dynamicField name="*_unstem_search" type="textNoStem" indexed="true" stored="false" multiValued="true" />
+    <dynamicField name="*spell" type="textSpell" indexed="true" stored="false" multiValued="true"/>
+    
+  </fields>
+
+  <uniqueKey>id</uniqueKey>
+  <defaultSearchField>text</defaultSearchField>
+  <solrQueryParser defaultOperator="OR"/>
+
+  <!-- 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"/>
+  
+
+  <!-- spellcheck fields -->
+  <!-- default spell check;  should match fields for default request handler -->
+  <!-- it won't work with a copy of a copy field -->
+  <copyField source="*_t" dest="spell"/>
+  <copyField source="*_facet" dest="spell"/>
+  <!-- title spell check;  should match fields for title request handler -->
+  <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"/>
+  <!-- author spell check; should match fields for author request handler -->
+  <copyField source="author_t" dest="author_spell"/>
+  <copyField source="author_addl_t" dest="author_spell"/>
+  <!-- subject spell check; should match fields for subject request handler -->
+  <copyField source="subject_topic_facet" dest="subject_spell"/>
+  <copyField source="subject_t" dest="subject_spell"/>
+  <copyField source="subject_addl_t" dest="subject_spell"/>  
+  
+  <!-- OpenSearch query field should match request handler search fields -->
+  <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"/>  
+
+</schema>