blacklight-spotlight 0.3.1 → 0.4.1

data/app/views/spotlight/sir_trevor/blocks/_solr_documents_embed_block.html.erb

@@ -0,0 +1,22 @@
+<% solr_documents_embed_block.with_solr_helper(self) %>
+
+<div class="content-block items-block row">
+  
+  <% if solr_documents_embed_block.documents? %>
+
+    <div class="content-block spotlight-flexbox pull-<%= solr_documents_embed_block.content_align %> <%= solr_documents_embed_block.text? ? "col-md-6" : "col-md-12" %> ">
+      <% solr_documents_embed_block.documents.each do |document| %>
+        <div class="box" data-id="<%= document.id %>">
+          <%= render_document_partials document, blacklight_config.view.embed.partials, (blacklight_config.view.embed.locals || {}).reverse_merge(block: solr_documents_embed_block) %>
+        </div>
+      <% end %>
+    </div>
+  <% end %>
+
+  <% if solr_documents_embed_block.text? %>
+    <div class="text-col col-md-6 pull-<%= solr_documents_embed_block.text_align %>">
+      <h3><%= solr_documents_embed_block.title %></h3>
+      <%= sir_trevor_markdown solr_documents_embed_block.text %>
+    </div>
+  <% end %>
+</div>

data/app/views/spotlight/sir_trevor/blocks/_solr_documents_features_block.html.erb

@@ -0,0 +1,40 @@
+<% solr_documents_features_block.with_solr_helper(self) %>
+<% indicators = [] %>
+<% html_id = "carousel-#{solr_documents_features_block.object_id}" %>
+
+<div class="content-block item-features">
+  <% if solr_documents_features_block.documents? %>
+  <div id="<%= html_id %>" class="row carousel" data-ride="carousel"  data-interval="false">
+      <div class="col-sm-6">
+        <div class="carousel-inner">
+          <% solr_documents_features_block.documents.each_with_index do |document, index| %>
+            <div class="item <%= 'active' if index == 0 %>" data-id="<%= document.id %>">
+              <% if block_thumb = solr_documents_features_block.document_options(document.id)[:full_image_url] %>
+                <%= link_to_document(document, image_tag(block_thumb), counter: -1) %>
+              <% elsif has_thumbnail? document %>
+                <%= render_thumbnail_tag(document, {}, document_counter: -1) %>
+              <% end %>
+            </div>
+
+            <% indicators << capture do %>
+              <li data-target="#<%= html_id %>" data-slide-to="<%= index %>" class="list-group-item <%= 'active' if index == 0 %>">
+                <a href="#" title="<%= (caption_text = render_index_field_value(document, (solr_documents_features_block.primary_caption_field if solr_documents_features_block.primary_caption?) || document_show_link_field)) %>">
+                  <%= truncate(caption_text, length: 95) %>
+                </a>
+                <% if solr_documents_features_block.secondary_caption? %>
+                  <p><%= render_index_field_value(document, solr_documents_features_block.secondary_caption_field) %></p>
+                <% end %>
+              </li>
+            <% end %>
+
+          <% end %>
+        </div>
+      </div>
+
+      <!-- Indicators -->
+      <ol class="carousel-indicators col-sm-6 list-group list-striped">
+        <%= safe_join(indicators, "\n") %>
+      </ol>
+    </div>
+  <% end %>
+</div>

data/app/views/spotlight/sir_trevor/blocks/_solr_documents_grid_block.html.erb

@@ -0,0 +1,21 @@
+<% solr_documents_grid_block.with_solr_helper(self) %>
+<div class="content-block item-grid-block row">
+  <div class="items-col col-md-9 pull-<%= solr_documents_grid_block.content_align %>">
+    <% if solr_documents_grid_block.documents? %>
+        <% solr_documents_grid_block.documents.each_with_index do |document, index| %>
+          <div class="box item-<%= index %>" data-id="<%= document.id %>">
+            <% if block_thumb = solr_documents_grid_block.document_options(document.id)[:thumbnail_image_url] %>
+              <div class="thumbnail"><%= link_to_document(document, image_tag(block_thumb), counter: -1) %></div>
+            <% elsif has_thumbnail? document %>
+              <div class="thumbnail"><%= render_thumbnail_tag(document, {}, document_counter: -1) %></div>
+            <% end %>
+          </div>
+        <% end %>
+    <% end %>
+  </div>
+
+  <div class="text-col col-md-3 pull-<%= solr_documents_grid_block.text_align %>">
+    <h3><%= solr_documents_grid_block.title %></h3>
+    <%= sir_trevor_markdown solr_documents_grid_block.text %>
+  </div>
+</div>

data/config/locales/spotlight.en.yml

@@ -88,6 +88,11 @@ en:
             url: "File"
       "spotlight/contact":
           avatar: "Photo"
+      "spotlight/page":
+        display_sidebar?: "Show sidebar"
+        display_title: "Show title"
+      "spotlight/masthead":
+        display: "Show background image in masthead"
   blacklight:
     search:
       fields:
@@ -109,8 +114,6 @@ en:
       page_title: "Page title"
       settings:
         header: "Settings"
-      show_sidebar: "Show sidebar"
-      display_title: "Show title"
     appearances:
       edit:
         header: Appearance
@@ -122,23 +125,15 @@ en:
             label: "Searchable (offer searchbox and facet sidebar)"
         main_navigation:
           menu: Main menu
-          help: Click a menu item to change its display label. Drag and drop a menu item to change their order in the main navigation menu.
+          help: Select the menu items you want to be displayed in the main navigation menu (menu items are only displayed when published pages exist for that item). Click a menu item to change its display label. Drag and drop a menu item to change their order in the menu.
         restore_default: "Restore default"
         search_results: Search results
         site_masthead:
           heading: Site masthead
           help: "You can select and crop an image to use as a background in your exhibit site's masthead. To use an image as a masthead background, you should use an image that is at least 120 pixels tall and 1200 pixels wide. For best results use an image at least 1800 pixels wide. You can crop larger images using the cropping tool below."
-          display:
-            label: "Show background image in masthead"
-          source:
-            header: "Image source"
-            exhibit:
-              label: "From this exhibit"
-              help: "To find an image to use as a background, start typing the title of an exhibit item."
-            remote:
-              label: "Upload an image"
-              header: "Cropped image"
-              help: 'Adjust the cropping box to cover the area of the image you want as the masthead background. Click "Save Changes" to save the copped area.'
+        site_thumbnail:
+          heading: Site thumbnail
+          help: "You can select and crop an image to visually represent this exhibit."
         thumbnail:
           small: Small
           medium: Medium
@@ -205,6 +200,8 @@ en:
       edit_default:
         blank_field_warning_html: "This field is currently hidden on all pages. You can make it visible on the Curation > %{link} page."
         full_title_tesim: "Title"
+        url-field:
+          help: "Valid file types: %{extensions}"
       facets:
         exhibit_visibility:
           label: "Item Visibility"
@@ -246,6 +243,11 @@ en:
         header: Edit Exhibit-Specific Field
       new:
         header: Add Exhibit-Specific Field
+      form:
+        field_type:
+          label: "Type"
+          vocab: "Controlled vocabulary"
+          text: "Free text"
     dashboards:
       show:
         header: Dashboard
@@ -259,6 +261,7 @@ en:
           updated_at: Last Edited
       solr_document_activity:
         header: Recently Updated Items
+        no_documents: There are no documents in this exhibit
       analytics:
         header: "User Activity Over the Past Month"
         pageviews: "page views"
@@ -269,11 +272,13 @@ en:
           header: "Most popular pages"
     exhibits:
       breadcrumb: Home
+      delete:
+        heading: Delete exhibit
+        warning_html: This action is irreversible. Be sure to back up the exhibit settings and content using the %{export_link} feature before proceeding.
       edit:
         header: Settings
-        import: Import
-        delete_exhibit: Delete exhibit
-        delete_exhibit_warning_html: This action is irreversible. Be sure to back up the exhibit settings and content using the %{export_link} feature before proceeding.
+        basic_settings:
+          heading: Basic settings
       form:
         fields:
           contact_emails:
@@ -284,15 +289,13 @@ en:
       new:
         header: Create a new exhibit
       import:
-        header: Import/Export
-        import:
-          header: Import exhibit data
-          instructions: You can import an exhibit JSON file exported from this application to use that data file to define this exhibit.
-          button: Import data
-        export:
-          header: Export exhibit data
-          instructions: You can create a backup of this exhibit by exporting the data that defines it to a JSON file. You can then import that JSON file into new exhibit to restore the exhibit data or to use as a starting point for a new exhibit.
-          download: Export data
+        heading: Import data
+        instructions: You can import an exhibit JSON file exported from this application to use that data file to define this exhibit.
+        button: Import data
+      export:
+        heading: Export data
+        instructions: You can create a backup of this exhibit by exporting the data that defines it to a JSON file. You can then import that JSON file into new exhibit to restore the exhibit data or to use as a starting point for a new exhibit.
+        download: Export data
       confirmation_status:
         confirmed: Confirmed.
         confirmation_sent: Confirmation sent.
@@ -327,7 +330,11 @@ en:
         locked: "This page is currently being edited by %{user} (%{created_at})"
       form:
         title_placeholder: "Title"
-        page_options: "Page options"
+        page_content: "Content"
+        page_options: "Options"
+        page_thumbnail: "Thumbnail"
+        thumbnail:
+          help: "You can select and crop an image to visually represent this page. It will be used as the thumbnail image if you include this page using the 'Highlight Featured Pages' widget."
     contacts:
       edit:
         header: "Edit Contact"
@@ -352,7 +359,7 @@ en:
         instructions: Enter details for each librarian, curator or other contact person for this exhibit. Select the contacts you want to be show in the sidebar of the About Pages. Drag and drop contacts to specify the order in which they are shown in the sidebar.
       nav_link: About
       page_options:
-        published: "Publish"
+        published: "Publish" # Possibly no longer used
       sidebar:
         nav_link: About
       contacts:
@@ -361,6 +368,18 @@ en:
       nav_link: Curated Features
       page_options:
         published: "Publish"
+    featured_images:
+      form:
+        source:
+          header: "Image source"
+          exhibit:
+            label: "From this exhibit"
+            help: "To find an image, start typing the title of an exhibit item."
+          remote:
+            label: "Upload an image"
+            header: "Cropped image"
+            help: 'Adjust the cropping box to cover the area of the image you want to use as the thumbnail image. Click "Save Changes" to save the cropped area.'
+
     resources:
       new:
         header: "Add Resource"
@@ -376,8 +395,8 @@ en:
           success: "'%{file_name}' has been uploaded.  An email will be sent to you once indexing is complete."
         new:
           header: "Add non-repository items"
-          single: "Single item"
-          multiple: "Multiple items using CSV file"
+          single_item_form: "Single item"
+          multi_item_form: "Multiple items using CSV file"
         error: "There was a problem uploading your object."
         multi_item_form:
           add_item: "Add item"
@@ -420,6 +439,15 @@ en:
           one: "%{count} item"
           other: "%{count} items"
         missing_description_html: "%{link} to add a description."
+      form:
+        search_description: "Description"
+        search_masthead: "Masthead"
+        search_thumbnail: "Thumbnail"
+        masthead:
+          help: "You can select and crop an image to use as a browse category-specific masthead, instead of the default site masthead, for this browse category's detail page."
+          help_secondary: "To create a browse category-specific masthead, you should use an image that is at least 120 pixels tall and 1200 pixels wide. For best results use an image at least 1800 pixels wide. You can crop larger images using the cropping tool below."
+        thumbnail:
+          help: "You can select and crop an image to visually represent this search."
     browse:
       nav_link: "Browse"
       index:

data/config/routes.rb

@@ -5,7 +5,6 @@ Spotlight::Engine.routes.draw do
   resources :exhibits, path: '/', except: [:index, :show] do
     member do
       get 'exhibit', to: 'exhibits#show', as: 'get'
-      get 'import', to: 'exhibits#import'
       post 'import', to: 'exhibits#process_import'
       patch 'import', to: 'exhibits#process_import'
       post 'reindex', to: 'exhibits#reindex'
@@ -90,7 +89,7 @@ Spotlight::Engine.routes.draw do
       end
     end
     resource :home_page, path: 'home', controller: "home_pages"
-    post '/pages/preview' => 'pages#preview', as: :preview_block
+    post '/pages/:id/preview' => 'pages#preview', as: :preview_block
 
     resources :lock, only: [:destroy]
 
@@ -99,7 +98,7 @@ Spotlight::Engine.routes.draw do
         patch :update_all
       end
     end
-
+    post 'solr/update' => 'solr#update'
   end
 
   post 'versions/:id/revert' => 'versions#revert', as: :revert_version

data/db/migrate/20150304071512_add_spotlight_featured_images.rb

@@ -0,0 +1,16 @@
+class AddSpotlightFeaturedImages < ActiveRecord::Migration
+  def change
+    create_table :spotlight_featured_images do |t|
+      t.string :type
+      t.boolean :display
+      t.string :image
+      t.string :source
+      t.string :document_global_id
+      t.integer :image_crop_x
+      t.integer :image_crop_y
+      t.integer :image_crop_w
+      t.integer :image_crop_h
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20150304111111_add_featured_image_to_spotlight_classes.rb

@@ -0,0 +1,10 @@
+class AddFeaturedImageToSpotlightClasses < ActiveRecord::Migration
+  
+  def change
+    add_column :spotlight_searches, :masthead_id, :integer
+    add_column :spotlight_searches, :thumbnail_id, :integer
+    add_column :spotlight_exhibits, :masthead_id, :integer
+    add_column :spotlight_exhibits, :thumbnail_id, :integer
+    add_column :spotlight_pages, :thumbnail_id, :integer
+  end
+end

data/db/migrate/20150306202300_add_display_to_spotlight_main_navigations.rb

@@ -0,0 +1,11 @@
+class AddDisplayToSpotlightMainNavigations < ActiveRecord::Migration
+  def up
+    add_column :spotlight_main_navigations, :display, :boolean, default: true
+
+    Spotlight::MainNavigation.reset_column_information
+    Spotlight::MainNavigation.update_all display: true
+  end
+  def down
+    remove_column :spotlight_main_navigations, :display
+  end
+end

data/db/migrate/20150313175432_add_field_type_to_custom_fields.rb

@@ -0,0 +1,11 @@
+class AddFieldTypeToCustomFields < ActiveRecord::Migration
+  def up
+    add_column :spotlight_custom_fields, :field_type, :string
+
+    Spotlight::CustomField.reset_column_information
+    Spotlight::CustomField.update_all field_type: 'text'
+  end
+  def down
+    remove_column :spotlight_custom_fields, :field_type
+  end
+end

data/lib/generators/spotlight/install_generator.rb

@@ -65,8 +65,12 @@ module Spotlight
       end
     end
 
+    def add_example_catalog_controller
+      copy_file "catalog_controller.rb", "app/controllers/catalog_controller.rb"
+    end
+
     def add_osd_viewer
-      gem 'blacklight-gallery'
+      gem 'blacklight-gallery', ">= 0.3.0"
       generate 'blacklight_gallery:install'
     end
 
@@ -91,5 +95,10 @@ module Spotlight
       gem 'social-share-button'
       directory 'config'
     end
+
+    def add_solr_config_resources
+      copy_file "jetty.rake", "lib/tasks/jetty.rake"
+      directory "solr_conf"
+    end
   end
 end

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

@@ -0,0 +1,27 @@
+# -*- encoding : utf-8 -*-
+require 'blacklight/catalog'
+
+class CatalogController < ApplicationController  
+
+  include Blacklight::Catalog
+
+  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: '*'
+    }
+
+    config.document_solr_path = 'get'
+    config.document_unique_id_param = 'ids'
+
+    # solr field configuration for search results/index views
+    config.index.title_field = 'full_title_tesim'
+
+    config.add_sort_field 'relevance', sort: 'score desc', label: 'Relevance'
+
+    config.add_field_configuration_to_solr_request!
+  end
+
+end

data/lib/generators/spotlight/templates/jetty.rake

@@ -0,0 +1,13 @@
+begin
+  require 'jettywrapper'
+
+  namespace :jetty do
+    desc "Copies the application's solr config into jetty"
+    task configure_solr: ['jetty:clean'] do
+      FileList['solr_conf/conf/*'].each do |f|  
+        cp("#{f}", 'jetty/solr/blacklight-core/conf/', verbose: true)
+      end
+    end
+  end
+rescue LoadError
+end

data/lib/generators/spotlight/templates/solr_conf/conf/schema.xml

@@ -0,0 +1,159 @@
+<?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"/>
+
+    <dynamicField name="*_bbox"   type="location_rpt" stored="true" indexed="true"/>
+    <dynamicField name="*_ng"   type="text_en_ng" 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="*_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"/>
+
+    <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="*_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"/>
+
+    <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="*_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"/>
+
+    <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"/>
+    
+    <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"/>
+    
+    <!-- double (_db...) -->
+    <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"/>
+
+    <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"/>
+
+    <dynamicField name="*_bs" type="boolean" stored="true" indexed="false" multiValued="false"/>
+    <dynamicField name="*_bsi" type="boolean" stored="true" indexed="true" multiValued="false"/>
+
+    <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"/>
+  <copyField source="*_ssim" 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"/>
+    
+    <!-- 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 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 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" />
+      </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>
+  </types>
+  
+</schema>