blacklight-spotlight 3.3.0 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6d38a0f303034a89f2a514617e5bc17b31ad2bb60a2dd865245a1822d5ef27c
-  data.tar.gz: 3a1e9f34a1f5bb1486843486dfc9bbb991b0c8504ae69898dbd852828fbb82f9
+  metadata.gz: fc89332ff348ea70e49058e10f7ae4ffe6513218603cb2b13741eefdc15c8f24
+  data.tar.gz: 76ff697064cedf09069292730e9bc3d7b1beac5a8e80e0ededdebbfc8f0008c5
 SHA512:
-  metadata.gz: a9e96166b8445ac6333e6a5fb2647b1688b2007dcdc5907fb81099c5476f6dc49f053a060dbea12c531fb91934ef5f2c3aa6051ae408c1f654155fc6cd7e9816
-  data.tar.gz: b72e0ccf54ad7969d11167df4aa8139533d4afd0acab8bfe05cd26f54170ca8b52bfe92575224e216dd1af32c537a0a2c2785f2b691567a0c7b176dc2b73e3ba
+  metadata.gz: 23cb9a0b04c40a53e75a91a25a7d1ce88a54b80fd5200fdee257081ed524bea31f77264d7a1a7f17ec82f5ede0dacf08c05707ddb122af99a0a071faa06824cf
+  data.tar.gz: 87dac4804ad58c1c2b08bd1e582dde8f492a68434f193f679a72737ae73bd6a3b2dcf2cded7281e50fd341d07e7a7b369539a0bf5efcfc981b0de5f1b795e59d

data/app/controllers/spotlight/pages_controller.rb

@@ -35,7 +35,7 @@ module Spotlight
 
     # GET /pages/1
     def show
-      fresh_when([@page.exhibit, @page, request.query_parameters.to_query])
+      fresh_when([@page.exhibit, @page])
     end
 
     def preview

data/app/helpers/spotlight/pages_helper.rb

@@ -16,6 +16,18 @@ module Spotlight
       end
     end
 
+    def sir_trevor_format(text, format: :markdown)
+      if format.to_s.to_sym == :html
+        sir_trevor_html(text)
+      else
+        sir_trevor_markdown(text)
+      end
+    end
+
+    def sir_trevor_html(text)
+      sanitize(text, tags: %w[b i a br p sup])
+    end
+
     ##
     # Override the default #sir_trevor_markdown so we can use
     # a more complete markdown rendered

data/app/helpers/spotlight/title_helper.rb

@@ -27,10 +27,8 @@ module Spotlight
       content_tag(:h1, html_content, class: 'page-header')
     end
 
-    # rubocop:disable Naming/AccessorMethodName
     def set_html_page_title(title = nil)
       @page_title = strip_tags(t(:'spotlight.html_title', title: title || t(:'.title', default: :'.header'), application_name: application_name)).html_safe
     end
-    # rubocop:enable Naming/AccessorMethodName
   end
 end

data/app/models/sir_trevor_rails/block.rb

@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+require 'ostruct'
+
+module SirTrevorRails
+  # Forked from (former) upstream sir-trevor-rails 0.6.2 gem:
+  # https://github.com/madebymany/sir-trevor-rails/blob/931b9554f5268158b4da8817477cdc82e4e2e69c/lib/sir_trevor_rails/block.rb
+  # Copyright (c) 2013-2014 by ITV plc - http://www.itv.com
+  class Block < OpenStruct
+    DEFAULT_FORMAT = :markdown
+
+    def self.from_hash(hash, parent = nil)
+      hash = hash.deep_dup.with_indifferent_access
+      type_klass(hash).new(hash, parent)
+    end
+
+    def format
+      send(:[], :format).present? ? send(:[], :format).to_sym : DEFAULT_FORMAT
+    end
+
+    # Sets a list of custom block types to speed up lookup at runtime.
+    def self.custom_block_types
+      # You can define your custom block types directly here or in your engine config.
+      Spotlight::Engine.config.sir_trevor_widgets
+    end
+
+    def initialize(hash, parent)
+      @raw_data = hash
+      @parent  = parent
+      @type    = hash[:type].to_sym
+      super(hash[:data])
+    end
+
+    attr_reader :parent, :type
+
+    def to_partial_path
+      "sir_trevor/blocks/#{self.class.name.demodulize.underscore}"
+    end
+
+    def as_json(*_attrs)
+      {
+        type: @type.to_s,
+        data: marshal_dump
+      }
+    end
+
+    # Infers the block class.
+    # Safe lookup that tries to identify user created block class.
+    #
+    # @param [Symbol] type
+    def self.block_class(type)
+      type_name = type.to_s.camelize
+      block_name = "#{type_name}Block"
+      if custom_block_types.include?(type_name)
+        begin
+          block_name.constantize
+        rescue NameError
+          block_class!(block_name)
+        end
+      else
+        block_class!(block_name)
+      end
+    end
+
+    # Infers the block class.
+    # Failover from block_class.
+    # Safe lookup against the SirTevor::Blocks namespace
+    # If no block is found, create one with given name and inherit from Block class
+    #
+    # @param [Constant] block_name
+    def self.block_class!(block_name)
+      SirTrevorRails::Blocks.const_get(block_name)
+    rescue NameError
+      SirTrevorRails::Blocks.const_set(block_name, Class.new(Block))
+    end
+
+    def self.type_klass(hash)
+      if self == Block
+        block_class(hash[:type].to_sym)
+      else
+        self
+      end
+    end
+  end
+end

data/app/models/sir_trevor_rails/blocks/displayable.rb

@@ -14,7 +14,7 @@ module SirTrevorRails
       end
 
       def ordered_items
-        items.sort_by { |x| x[:weight] }.map { |x| x[:id] }
+        items.sort_by { |x| x[:weight].to_i }.map { |x| x[:id] }
       end
 
       private

data/app/models/spotlight/page_content/sir_trevor.rb

@@ -5,12 +5,21 @@ module Spotlight
     # Sir-Trevor created content
     class SirTrevor
       def self.parse(page, attribute)
-        content = page.read_attribute(attribute)
-        content ||= [].to_json
+        blocks = page.read_attribute(attribute)
+        blocks ||= [].to_json
 
-        return SirTrevorRails::BlockArray.new if content.blank?
+        return [] if blocks.blank?
 
-        SirTrevorRails::BlockArray.from_json(content, page)
+        blocks = JSON.parse(blocks, symbolize_names: true) if blocks.is_a?(String)
+
+        if blocks.is_a?(Hash)
+          blocks = blocks[:data] || blocks['data'] or
+            raise IndexError, 'No block data found'
+        end
+
+        blocks.map do |obj|
+          SirTrevorRails::Block.from_hash(obj, page)
+        end
       end
     end
   end

data/app/models/translation.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+unless defined?(Translation)
+  Translation = I18n::Backend::ActiveRecord::Translation
+  Translation.include Spotlight::CustomTranslationExtension
+
+  # Work-around for https://github.com/svenfuchs/i18n-active_record/pull/133
+  if Translation.respond_to?(:to_hash)
+    class << Translation
+      alias to_h to_hash
+      remove_method :to_hash
+    end
+
+    I18n::Backend::ActiveRecord.define_method(:init_translations) do
+      @translations = Translation.to_h
+    end
+  end
+end

data/app/views/shared/_site_sidebar.html.erb

@@ -7,7 +7,7 @@
     <li class="nav-item"><%= link_to t(:'spotlight.sites.edit.page_title'), spotlight.edit_site_path, class: 'nav-link' %></li>
   <% end %>
 
-  <% if can? :manange, Spotlight::Exhibit %>
+  <% if can? :manage, Spotlight::Exhibit %>
     <li class="nav-item"><%= link_to t(:'spotlight.sites.edit_exhibits.page_title'), spotlight.edit_site_exhibits_path, class: 'nav-link' %></li>
     <li class="nav-item"><%= link_to t(:'spotlight.admin_users.index.page_title'), spotlight.admin_users_path, class: 'nav-link' %></li>
   <% end %>

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

@@ -0,0 +1,5 @@
+<% if video.source == 'vimeo' %>
+  <%= render partial: '/spotlight/sir_trevor/blocks/videos/vimeo', vimeo: video %>
+<% elsif video.source == 'youtube' %>
+  <%= render partial: '/spotlight/sir_trevor/blocks/videos/youtube', youtube: video %>
+<% end %>

data/config/i18n-tasks.yml

@@ -65,6 +65,7 @@ ignore_unused:
   - helpers.action.{edit,edit_long,new,view} # app/helpers/spotlight/crud_link_helpers.rb
   - helpers.action.spotlight/search.edit_long # app/views/spotlight/searches/_search.html.erb
   - spotlight.about_pages.page_options.published # app/views/spotlight/about_pages/_page_options.html.erb
+  - spotlight.job_trackers.show.messages.status.{completed,enqueued,failed,missing,pending} # app/views/spotlight/job_trackers/show.html.erb
   - helpers.submit.contact_form.create # app/views/spotlight/shared/_report_a_problem.html.erb
   - activerecord.help.spotlight/exhibit.tag_list # app/views/spotlight/exhibits/_form.html.erb
   - helpers.label.solr_document.exhibit_tag_list # app/views/spotlight/catalog/_edit_default.html.erb

data/config/locales/spotlight.de.yml

@@ -0,0 +1,40 @@
+de:
+  activemodel:
+    attributes:
+      spotlight/contact_form:
+        email: E-Mail Adresse
+        message: Nachricht
+        name: Name
+  helpers:
+    action:
+      cancel: Abbrechen
+    submit:
+      contact_form:
+        create: Senden
+        created: Vielen Dank. Ihre Feedback wurde gesendet.
+  spotlight:
+    about_pages:
+      contacts:
+        header: Kontakt
+    header_links:
+      contact: Feedback
+    shared:
+      report_a_problem:
+        honeypot_field_explanation: Bitte ignorieren Sie dieses Textfeld. Es wird verwendet, um Spam zu erkennen. Wenn Sie etwas hier eingeben, wird Ihre Nachricht nicht gesendet.
+        title: Kontakten Sie Uns
+    browse:
+      search:
+        item_count:
+          one: "%{count} Suchergebnisse"
+          other: "%{count} Suchergebnisse"
+      search_box:
+        label: Innerhalb dieser Kategorie suchen
+        placeholder: Suchen…
+        reset: Zurücksetzen
+        submit: Innerhalb dieser Kategorie suchen
+        success:
+          expand_html: Suche erweitern <a href="%{expand_search_url}">"%{browse_query}"</a>.
+          result_number_html: <strong> %{search_size} Suchergebnisse von %{parent_search_count} Gesamteinheiten in dieser Suchkategorie gefunden</strong>.
+        zero_results:
+          expand_html: <a href="%{clear_search_url}">Suche zurücksetzen</a> oder <a href="%{expand_search_url}"> erweitern "%{browse_query}"</a>.
+          result_number: Es können keine Suchergebnisse gefunden werden.

data/lib/generators/spotlight/install_generator.rb

@@ -11,7 +11,7 @@ module Spotlight
     class_option :mailer_default_url_host, type: :string, default: '' # e.g. localhost:3000
 
     # we're not (yet) using webpacker, so we need to re-add sprockets functionality
-    def add_js
+    def add_js_rails6
       return unless Rails.version.to_i == 6
 
       gem 'coffee-rails', '~> 4.2'
@@ -29,6 +29,12 @@ module Spotlight
       run 'bundle exec rails webpacker:install'
     end
 
+    def add_js_rails7
+      return unless Rails.version.to_i == 7
+
+      append_to_file 'app/assets/javascripts/application.js', "\n//= require_tree .\n"
+    end
+
     def inject_spotlight_routes
       route "mount Spotlight::Engine, at: 'spotlight'"
       gsub_file 'config/routes.rb', /^\s*root.*/ do |match|
@@ -44,6 +50,8 @@ module Spotlight
     end
 
     def riiif
+      gem 'riiif'
+      Bundler.with_clean_env { run 'bundle install' }
       route "mount Riiif::Engine => '/images', as: 'riiif'"
       copy_file 'config/initializers/riiif.rb'
     end
@@ -124,7 +132,7 @@ module Spotlight
     end
 
     def add_osd_viewer
-      gem 'blacklight-gallery', '~> 3.0'
+      gem 'blacklight-gallery', '~> 4.0'
       bundle_install
       generate 'blacklight_gallery:install'
     end
@@ -169,6 +177,36 @@ module Spotlight
       copy_file 'config/initializers/translation.rb'
     end
 
+    def configure_queue
+      insert_into_file 'config/application.rb', after: "< Rails::Application\n" do
+        <<-EOF
+        config.active_job.queue_adapter = ENV["RAILS_QUEUE"]&.to_sym || :sidekiq
+        EOF
+      end
+    end
+
+    def configure_logging
+      insert_into_file 'config/application.rb', after: "< Rails::Application\n" do
+        <<-EOF
+        # Logging
+        if ENV["RAILS_LOG_TO_STDOUT"].present?
+          config.log_level = :debug
+          config.log_formatter = ::Logger::Formatter.new
+          # log to stdout
+          logger               = ActiveSupport::Logger.new(STDOUT)
+          logger.formatter     = config.log_formatter
+          config.logger        = ActiveSupport::TaggedLogging.new(logger)
+          # Print deprecation notices to the Rails logger.
+          config.active_support.deprecation = :log
+          # Raise an error on page load if there are pending migrations.
+          config.active_record.migration_error = :page_load
+          # Highlight code that triggered database queries in logs.
+          config.active_record.verbose_query_logs = true
+        end
+        EOF
+      end
+    end
+
     private
 
     def bundle_install

data/lib/generators/spotlight/templates/config/initializers/translation.rb

@@ -3,17 +3,17 @@
 require 'i18n/backend/active_record'
 require 'i18n/backend/fallbacks'
 
-Translation = I18n::Backend::ActiveRecord::Translation
-
 ActiveSupport::Reloader.to_prepare do
-  if Translation.table_exists?
+  # Don't allow initializer to break if DB doesn't exist yet
+  # see: https://github.com/projectblacklight/spotlight/issues/2133
+  if ENV['SKIP_TRANSLATION'].blank?
+    raise unless Translation.table_exists?
+
     ##
     # Sets up the new Spotlight Translation backend, backed by ActiveRecord. To
     # turn on the ActiveRecord backend, uncomment the following lines.
-
     I18n.backend = I18n::Backend::ActiveRecord.new
     I18n::Backend::ActiveRecord.include I18n::Backend::Memoize
-    Translation.include Spotlight::CustomTranslationExtension
     I18n::Backend::Simple.include I18n::Backend::Memoize
     I18n::Backend::Simple.include I18n::Backend::Pluralization
     I18n::Backend::Simple.include I18n::Backend::Fallbacks

data/lib/generators/spotlight/templates/solr/config/schema.xml

@@ -3,14 +3,14 @@
   <!-- NOTE: various comments and unused configuration possibilities have been purged
      from this file.  Please refer to http://wiki.apache.org/solr/SchemaXml,
      as well as the default schema file included with Solr -->
-  
+
   <uniqueKey>id</uniqueKey>
-  
+
   <fields>
     <field name="id" type="string" stored="true" indexed="true" multiValued="false" required="true"/>
     <field name="_version_" type="long"     indexed="true"  stored="true"/>
     <field name="timestamp" type="date" indexed="true" stored="true" default="NOW" multiValued="false"/>
-    
+
     <field name="lat" type="tdouble" stored="true" indexed="true" multiValued="false"/>
     <field name="lng" type="tdouble" stored="true" indexed="true" multiValued="false"/>
     <field name="original_pid_tesim" type="pid_text" stored="true" indexed="true" multiValued="true"/>
@@ -36,7 +36,7 @@
 -->
     <dynamicField name="*_tsiv" type="text" stored="true" indexed="true" multiValued="false" termVectors="true" termPositions="true" termOffsets="true"/>
     <dynamicField name="*_tsimv" type="text" stored="true" indexed="true" multiValued="true" termVectors="true" termPositions="true" termOffsets="true"/>
-    
+
     <!-- English text (_te...) -->
 <!--
     <dynamicField name="*_tei" type="text_en" stored="false" indexed="true" multiValued="false"/>
@@ -52,7 +52,7 @@
 -->
     <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"/>
@@ -65,7 +65,7 @@
 <!--
     <dynamicField name="*_ssort" type="alphaSort" stored="false" indexed="true" multiValued="false"/>
 -->
-    
+
     <!-- integer (_i...) -->
 <!--
     <dynamicField name="*_ii" type="int" stored="false" indexed="true" multiValued="false"/>
@@ -75,7 +75,7 @@
     <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"/>
@@ -85,7 +85,7 @@
     <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 -->
@@ -97,7 +97,7 @@
     <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"/>
@@ -107,7 +107,7 @@
     <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"/>
@@ -117,7 +117,7 @@
     <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"/>
@@ -127,7 +127,7 @@
     <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"/>
@@ -137,7 +137,7 @@
     <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"/>
@@ -147,7 +147,7 @@
     <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"/>
@@ -157,7 +157,7 @@
     <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"/>
@@ -167,28 +167,13 @@
     <dynamicField name="*_ftsm" type="tfloat" stored="true" indexed="false" multiValued="true"/>
     <dynamicField name="*_ftsi" type="tfloat" stored="true" indexed="true" multiValued="false"/>
     <dynamicField name="*_ftsim" type="tfloat" stored="true" indexed="true" multiValued="true"/>
-    
+
     <!-- boolean (_b...) -->
 <!--
     <dynamicField name="*_bi" type="boolean" stored="false" indexed="true" multiValued="false"/>
 -->
     <dynamicField name="*_bs" type="boolean" stored="true" indexed="false" multiValued="false"/>
     <dynamicField name="*_bsi" type="boolean" stored="true" indexed="true" multiValued="false"/>
-    
-    <!-- Type used to index the lat and lon components for the "location" FieldType -->
-<!--
-    <dynamicField name="*_coordinate" type="tdouble" indexed="true"  stored="false" />
--->
-
-    <!-- location (_ll...) -->
-<!--
-    <dynamicField name="*_lli" type="location" stored="false" indexed="true" multiValued="false"/>
-    <dynamicField name="*_llim" type="location" stored="false" indexed="true" multiValued="true"/>
--->
-    <dynamicField name="*_lls" type="location" stored="true" indexed="false" multiValued="false"/>
-    <dynamicField name="*_llsm" type="location" stored="true" indexed="false" multiValued="true"/>
-    <dynamicField name="*_llsi" type="location" stored="true" indexed="true" multiValued="false"/>
-    <dynamicField name="*_llsim" type="location" stored="true" indexed="true" multiValued="true"/>
 
     <!-- you must define copyField source and dest fields explicity or schemaBrowser doesn't work -->
     <field name="all_text_timv" type="text" stored="false" indexed="true" multiValued="true" termVectors="true" termPositions="true" termOffsets="true"/>
@@ -208,32 +193,32 @@
 
   <types>
     <fieldType name="string" class="solr.StrField" sortMissingLast="true" />
-    <fieldType name="boolean" class="solr.BoolField" sortMissingLast="true"/>    
+    <fieldType name="boolean" class="solr.BoolField" sortMissingLast="true"/>
     <fieldType name="rand" class="solr.RandomSortField" omitNorms="true"/>
-    
+
     <!-- Default numeric field types.  -->
     <fieldType name="int" class="solr.TrieIntField" precisionStep="0" positionIncrementGap="0"/>
     <fieldType name="float" class="solr.TrieFloatField" precisionStep="0" positionIncrementGap="0"/>
     <fieldType name="long" class="solr.TrieLongField" precisionStep="0" positionIncrementGap="0"/>
     <fieldType name="double" class="solr.TrieDoubleField" precisionStep="0" positionIncrementGap="0"/>
-    
+
     <!-- trie numeric field types for faster range queries -->
     <fieldType name="tint" class="solr.TrieIntField" precisionStep="8" positionIncrementGap="0"/>
     <fieldType name="tfloat" class="solr.TrieFloatField" precisionStep="8" positionIncrementGap="0"/>
     <fieldType name="tlong" class="solr.TrieLongField" precisionStep="8" positionIncrementGap="0"/>
     <fieldType name="tdouble" class="solr.TrieDoubleField" precisionStep="8" positionIncrementGap="0"/>
-    
+
     <!-- The format for this date field is of the form 1995-12-31T23:59:59Z
          Optional fractional seconds are allowed: 1995-12-31T23:59:59.999Z
       -->
     <fieldType name="date" class="solr.TrieDateField" precisionStep="0" positionIncrementGap="0"/>
     <!-- A Trie based date field for faster date range queries and date faceting. -->
     <fieldType name="tdate" class="solr.TrieDateField" precisionStep="6" positionIncrementGap="0"/>
-    
-    
+
+
     <!-- This point type indexes the coordinates as separate fields (subFields)
       If subFieldType is defined, it references a type, and a dynamic field
-      definition is created matching *___<typename>.  Alternately, if 
+      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.
@@ -243,17 +228,14 @@
       users normally should not need to know about them.
      -->
     <fieldType name="point" class="solr.PointType" dimension="2" subFieldSuffix="_d"/>
-    
-    <!-- A specialized field for geospatial search. If indexed, this fieldType must not be multivalued. -->
-    <fieldType name="location" class="solr.LatLonType" subFieldSuffix="_coordinate"/>
-    
+
     <!-- An alternative geospatial field type new to Solr 4.  It supports multiValued and polygon shapes.
       For more information about this and other Spatial fields new to Solr 4, see:
       http://wiki.apache.org/solr/SolrAdaptersForLuceneSpatial4
     -->
     <fieldType name="location_rpt" class="solr.SpatialRecursivePrefixTreeFieldType"
       geo="true" distErrPct="0.025" maxDistErr="0.000009" distanceUnits="degrees" />
-    
+
     <fieldType name="text" class="solr.TextField" omitNorms="false">
       <analyzer>
         <tokenizer class="solr.ICUTokenizerFactory"/>
@@ -261,7 +243,7 @@
         <filter class="solr.TrimFilterFactory"/>
       </analyzer>
     </fieldType>
-    
+
     <!-- A text field that only splits on whitespace for exact matching of words -->
     <fieldType name="text_ws" class="solr.TextField" positionIncrementGap="100">
       <analyzer>
@@ -269,7 +251,7 @@
         <filter class="solr.TrimFilterFactory"/>
       </analyzer>
     </fieldType>
-        
+
     <!-- single token analyzed text, for sorting.  Punctuation is significant. -->
     <fieldtype name="alphaSort" class="solr.TextField" sortMissingLast="true" omitNorms="true">
       <analyzer>
@@ -278,7 +260,7 @@
         <filter class="solr.TrimFilterFactory" />
       </analyzer>
     </fieldtype>
-    
+
     <!-- A text field with defaults appropriate for English -->
     <fieldType name="text_en" class="solr.TextField" positionIncrementGap="100">
       <analyzer>
@@ -321,7 +303,7 @@
         <tokenizer class="solr.KeywordTokenizerFactory"/>
       </analyzer>
     </fieldType>
-        
+
     <!-- queries for paths match documents at that path, or in descendent paths -->
     <fieldType name="descendent_path" class="solr.TextField">
       <analyzer type="index">
@@ -331,7 +313,7 @@
         <tokenizer class="solr.KeywordTokenizerFactory" />
       </analyzer>
     </fieldType>
-    
+
     <!-- queries for paths match documents at that path, or in ancestor paths -->
     <fieldType name="ancestor_path" class="solr.TextField">
       <analyzer type="index">
@@ -341,7 +323,7 @@
         <tokenizer class="solr.PathHierarchyTokenizerFactory" delimiter="/" />
       </analyzer>
     </fieldType>
-    
+
   </types>
-  
+
 </schema>