active-fedora 12.0.2 → 12.2.2

data/lib/active_fedora/indexing/field_mapper.rb

@@ -22,6 +22,7 @@ module ActiveFedora
       # @api
       # Given a field name, index_type, etc., returns the corresponding Solr name.
       # TODO field type is the input format, maybe we could just detect that?
+      # See https://github.com/samvera/active_fedora/issues/1338
       # @param [String] field_name the ruby (term) name which will get a suffix appended to become a Solr field name
       # @param opts - index_type is only needed if the FieldDescriptor requires it (e.g. :searcahble)
       # @return [String] name of the solr field, based on the params
@@ -69,6 +70,7 @@ module ActiveFedora
 
             # Is there a custom converter?
             # TODO instead of a custom converter, look for input data type and output data type. Create a few methods that can do that cast.
+            # See https://github.com/samvera/active_fedora/issues/1339
 
             value = if converter
                       if converter.arity == 1
@@ -87,7 +89,7 @@ module ActiveFedora
               values = (results[name] ||= [])
               values << value unless value.nil? || values.include?(value)
             else
-              Solrizer.logger.warn "Setting #{name} to `#{value}', but it already had `#{results[name]}'" if results[name] && Solrizer.logger
+              Rails.logger.warn "Setting #{name} to `#{value}', but it already had `#{results[name]}'" if results[name]
               results[name] = value
             end
           end
@@ -109,7 +111,7 @@ module ActiveFedora
                        when Descriptor
                          index_type
                        else
-                         raise Solrizer::InvalidIndexDescriptor, "#{index_type.class} is not a valid indexer_type. Use a String, Symbol or Descriptor."
+                         raise InvalidIndexDescriptor, "#{index_type.class} is not a valid indexer_type. Use a String, Symbol or Descriptor."
                        end
 
           raise InvalidIndexDescriptor, "index type should be an Descriptor, you passed: #{index_type.class}" unless index_type.is_a? Descriptor

data/lib/active_fedora/indexing/suffix.rb

@@ -28,7 +28,7 @@ module ActiveFedora
       end
 
       def to_s
-        raise Solrizer::InvalidIndexDescriptor, "Missing datatype for #{@fields}" unless data_type
+        raise InvalidIndexDescriptor, "Missing datatype for #{@fields}" unless data_type
 
         field_suffix = [config.suffix_delimiter]
 
@@ -45,12 +45,14 @@ module ActiveFedora
       end
 
       def self.config
+        # TODO: `:symbol' usage ought to be deprecated
+        # See https://github.com/samvera/active_fedora/issues/1334
         @config ||= OpenStruct.new fields: [:type, :stored, :indexed, :multivalued],
                                    suffix_delimiter: '_',
                                    type_suffix: (lambda do |fields|
                                                    type = fields.first
                                                    case type
-                                                   when :string, :symbol # TODO: `:symbol' usage ought to be deprecated
+                                                   when :string, :symbol
                                                      's'
                                                    when :text
                                                      't'
@@ -64,8 +66,10 @@ module ActiveFedora
                                                      'b'
                                                    when :long
                                                      'lt'
+                                                   when :float, :big_decimal
+                                                     'f'
                                                    else
-                                                     raise Solrizer::InvalidIndexDescriptor, "Invalid datatype `#{type.inspect}'. Must be one of: :date, :time, :text, :text_en, :string, :symbol, :integer, :boolean"
+                                                     raise InvalidIndexDescriptor, "Invalid datatype `#{type.inspect}'. Must be one of: :date, :time, :text, :text_en, :string, :symbol, :integer, :boolean"
                                                    end
                                                  end),
                                    stored_suffix: 's',

data/lib/active_fedora/inheritable_accessors.rb

@@ -1,5 +1,6 @@
 # Similar to ActiveSupport.class_attribute but with a setter that doesn't use the #{name}= syntax
 # This preserves backward compatibility with the API in ActiveTriples
+require "active_support/core_ext/module/remove_method"
 
 module ActiveFedora
   module InheritableAccessors

data/lib/active_fedora/loadable_from_json.rb

@@ -131,6 +131,7 @@ module ActiveFedora
       @resource = SolrBackedResource.new(self.class)
       self.attributes = adapt_attributes(attrs)
       # TODO: Should we clear the change tracking, or make this object Read-only?
+      # See https://github.com/samvera/active_fedora/issues/1342
 
       yield self if block_given?
 

data/lib/active_fedora/nested_attributes.rb

@@ -64,6 +64,7 @@ module ActiveFedora
             reflection.autosave = true
             define_autosave_association_callbacks(reflection)
             ## TODO this ought to work, but doesn't seem to do the class inheritance right
+            # See https://github.com/samvera/active_fedora/issues/1343
 
             nested_attributes_options = self.nested_attributes_options.dup
             nested_attributes_options[association_name.to_sym] = options

data/lib/active_fedora/persistence.rb

@@ -2,6 +2,13 @@ module ActiveFedora
   # = Active Fedora Persistence
   module Persistence
     extend ActiveSupport::Concern
+    extend ActiveSupport::Autoload
+    autoload :NullIdentifierService
+
+    included do
+      class_attribute :identifier_service_class
+      self.identifier_service_class = NullIdentifierService
+    end
 
     def new_record?
       return true if @ldp_source.subject.nil?
@@ -209,7 +216,13 @@ module ActiveFedora
       end
 
       # Override to tie in an ID minting service
-      def assign_id; end
+      def assign_id
+        identifier_service.mint
+      end
+
+      def identifier_service
+        @identifier_service ||= identifier_service_class.new
+      end
 
       # This is only used when creating a new record. If the object doesn't have an id
       # and assign_id can mint an id for the object, then assign it to the resource.

data/lib/active_fedora/persistence/null_identifier_service.rb

@@ -0,0 +1,11 @@
+module ActiveFedora
+  module Persistence
+    # An identifier service that doesn't mint IDs, so that the autocreated
+    # identifiers from Fedora will be used.
+    class NullIdentifierService
+      # Effectively a no-op
+      # @return [NilClass]
+      def mint; end
+    end
+  end
+end

data/lib/active_fedora/rake_support.rb

@@ -16,12 +16,12 @@ def with_server(environment)
 
   SolrWrapper.wrap(load_config(:solr, environment, solr_defaults)) do |solr|
     ENV["SOLR_#{environment.upcase}_PORT"] = solr.port.to_s
-    solr_config_path = File.join('solr', 'config')
+    solr_config_path = File.join('solr', 'conf')
     # Check to see if configs exist in a path relative to the working directory
     unless Dir.exist?(solr_config_path)
       $stderr.puts "Solr configuration not found at #{solr_config_path}. Using ActiveFedora defaults"
       # Otherwise use the configs delivered with ActiveFedora.
-      solr_config_path = File.join(File.expand_path("../..", File.dirname(__FILE__)), 'lib', 'generators', 'active_fedora', 'config', 'solr', 'templates', 'solr', 'config')
+      solr_config_path = File.join(File.expand_path("../..", File.dirname(__FILE__)), 'lib', 'generators', 'active_fedora', 'config', 'solr', 'templates', 'solr', 'conf')
     end
     solr.with_collection(name: "hydra-#{environment}", dir: solr_config_path) do
       FcrepoWrapper.wrap(load_config(:fcrepo, environment, fcrepo_defaults)) do |fcrepo|

data/lib/active_fedora/reflection.rb

@@ -314,7 +314,7 @@ module ActiveFedora
       def collect_join_chain
         [self]
       end
-      alias chain collect_join_chain # todo
+      alias chain collect_join_chain # TODO Remove alias, See https://github.com/samvera/active_fedora/issues/1347
 
       def has_inverse?
         inverse_name

data/lib/active_fedora/relation.rb

@@ -144,6 +144,20 @@ module ActiveFedora
       @scope_for_create ||= where_values_hash.merge(create_with_value)
     end
 
+    def each
+      if loaded?
+        @records.each { |item| yield item } if block_given?
+        @records.to_enum
+      else
+        find_each(where_values) { |item| yield item } if block_given?
+        enum_for(:find_each, where_values)
+      end
+    end
+
+    def empty?
+      !any?
+    end
+
     private
 
       VALID_FIND_OPTIONS = [:order, :limit, :start, :conditions, :cast].freeze

data/lib/active_fedora/relation/delegation.rb

@@ -13,7 +13,8 @@ module ActiveFedora
       :keep_if, :pop, :shift, :delete_at, :select!
     ].to_set
 
-    delegate :length, :collect, :map, :each, :all?, :include?, :to_ary, to: :to_a
+    delegate :length, :map, :to_ary, to: :to_a
+    delegate :any?, :all?, :collect, :include?, to: :each
 
     protected
 

data/lib/active_fedora/relation/finder_methods.rb

@@ -262,6 +262,7 @@ module ActiveFedora
       def field_name_for(key)
         if @klass.delegated_attributes.key?(key)
           # TODO: Check to see if `key' is a possible solr field for this class, if it isn't try :searchable instead
+          # See https://github.com/samvera/active_fedora/issues/1344
           ActiveFedora.index_field_mapper.solr_name(key, :stored_searchable, type: :string)
         elsif key == :id
           ActiveFedora.id_field

data/lib/active_fedora/relation/merger.rb

@@ -14,6 +14,7 @@ module ActiveFedora
 
       def merge
         # TODO: merge order
+        # See https://github.com/samvera/active_fedora/issues/1329
         relation.where_values += other.where_values
         relation
       end

data/lib/active_fedora/validations.rb

@@ -92,5 +92,12 @@ module ActiveFedora
       def perform_validations(options = {}) # :nodoc:
         options[:validate] == false || valid?(options[:context])
       end
+
+    private
+
+      # Overwrite run validations to include callbacks.
+      def run_validations!
+        _run_validation_callbacks { super }
+      end
   end
 end

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "12.0.2".freeze
+  VERSION = '12.2.2'.freeze
 end

data/lib/active_fedora/with_metadata.rb

@@ -20,6 +20,7 @@ module ActiveFedora
 
     def create_or_update(*)
       return unless super && !new_record?
+      # TODOs captured as https://github.com/samvera/active_fedora/issues/1331
       metadata_node.metadata_uri = described_by # TODO: only necessary if the URI was < > before
       metadata_node.save # TODO if changed?
     end

data/lib/active_fedora/with_metadata/metadata_node.rb

@@ -15,6 +15,7 @@ module ActiveFedora
         @file = file
         super(file.uri, ldp_source.graph)
         return unless self.class.type && !type.include?(self.class.type)
+        attributes_changed_by_setter[:type] = true if type.present?
         # Workaround for https://github.com/ActiveTriples/ActiveTriples/issues/123
         get_values(:type) << self.class.type
       end
@@ -54,7 +55,7 @@ module ActiveFedora
 
       def changed_attributes
         super.tap do |changed|
-          changed['type'] = true if type.present? && new_record?
+          changed.merge('type' => true) if type.present? && new_record?
         end
       end
 

data/lib/generators/active_fedora/config/solr/templates/.solr_wrapper.yml

@@ -4,5 +4,5 @@
 instance_dir: tmp/solr-development
 collection:
   persist: true
-  dir: solr/config/
+  dir: solr/conf/
   name: hydra-development

data/lib/generators/active_fedora/config/solr/templates/solr/{config → conf}/schema.xml

@@ -48,43 +48,47 @@
 <schema name="Hydra 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
+       version="1.5" 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
+       1.5: omitNorms defaults to true for primitive field types (int, float, boolean, string...)
+# TODO 1.6: useDocValuesAsStored defaults to true.
+# See https://github.com/samvera/active_fedora/issues/1346
      -->
 
   <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"/>
-    
+    <fieldType name="int" class="solr.IntPointField" docValues="true"/>
+    <fieldType name="float" class="solr.FloatPointField" docValues="true"/>
+    <fieldType name="long" class="solr.LongPointField" docValues="true"/>
+    <fieldType name="double" class="solr.DoublePointField" docValues="true"/>
+
+    <!-- PointField numeric field types for faster range queries -->
+    <fieldType name="tint" class="solr.IntPointField" docValues="true"/>
+    <fieldType name="tfloat" class="solr.FloatPointField" docValues="true"/>
+    <fieldType name="tlong" class="solr.LongPointField" docValues="true"/>
+    <fieldType name="tdouble" class="solr.DoublePointField" docValues="true"/>
+
     <!-- 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"/>
-    
-    
+    <fieldType name="date" class="solr.DatePointField" docValues="true"/>
+    <!-- A PointField based date field for faster date range queries and date faceting. -->
+    <fieldType name="tdate" class="solr.DatePointField" docValues="true"/>
+    <!-- A DateRange based date field for truly faster date range queries. -->
+    <fieldType name="dateRange" class="solr.DateRangeField"/>
+
     <!-- 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.
@@ -94,17 +98,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.
+
+    <!-- A 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"/>
@@ -112,7 +113,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>
@@ -120,7 +121,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>
@@ -129,7 +130,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>
@@ -144,7 +145,7 @@
         <filter class="solr.TrimFilterFactory"/>
       </analyzer>
     </fieldType>
-        
+
     <!-- queries for paths match documents at that path, or in descendent paths -->
     <fieldType name="descendent_path" class="solr.TextField">
       <analyzer type="index">
@@ -154,7 +155,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">
@@ -168,7 +169,6 @@
     <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>
@@ -179,12 +179,12 @@
   <fields>
     <!-- If you remove this field, you must _also_ disable the update log in solrconfig.xml
     or Solr won't start. _version_ and update log are required for SolrCloud
-    --> 
+    -->
     <field name="_version_" type="long" indexed="true" stored="true"/>
-   
+
     <field name="id" type="string" stored="true" indexed="true" multiValued="false" required="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"/>
 
@@ -201,7 +201,7 @@
     <dynamicField name="*_timv" type="text" stored="false" indexed="true" multiValued="true" termVectors="true" termPositions="true" termOffsets="true"/>
     <dynamicField name="*_tsiv" type="text" stored="true" indexed="true" multiValued="false" termVectors="true" termPositions="true" termOffsets="true"/>
     <dynamicField name="*_tsimv" type="text" stored="true" indexed="true" multiValued="true" termVectors="true" termPositions="true" termOffsets="true"/>
-    
+
     <!-- English text (_te...) -->
     <dynamicField name="*_tei" type="text_en" stored="false" indexed="true" multiValued="false"/>
     <dynamicField name="*_teim" type="text_en" stored="false" indexed="true" multiValued="true"/>
@@ -213,7 +213,7 @@
     <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"/>
@@ -222,7 +222,7 @@
     <dynamicField name="*_ssi" type="string" stored="true" indexed="true" multiValued="false"/>
     <dynamicField name="*_ssim" type="string" stored="true" indexed="true" multiValued="true"/>
     <dynamicField name="*_ssort" type="alphaSort" stored="false" indexed="true" multiValued="false"/>
-    
+
     <!-- integer (_i...) -->
     <dynamicField name="*_ii" type="int" stored="false" indexed="true" multiValued="false"/>
     <dynamicField name="*_iim" type="int" stored="false" indexed="true" multiValued="true"/>
@@ -230,15 +230,15 @@
     <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) -->
+
+    <!-- IntegerPointField (_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 -->
@@ -248,15 +248,24 @@
     <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) -->
+
+    <!-- DatePointField (_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"/>
-    
+
+
+    <!-- date range (_dr...) (for faster AND better range queries) -->
+    <dynamicField name="*_dri" type="dateRange" stored="false" indexed="true" multiValued="false"/>
+    <dynamicField name="*_drim" type="dateRange" stored="false" indexed="true" multiValued="true"/>
+    <dynamicField name="*_drs" type="dateRange" stored="true" indexed="false" multiValued="false"/>
+    <dynamicField name="*_drsm" type="dateRange" stored="true" indexed="false" multiValued="true"/>
+    <dynamicField name="*_drsi" type="dateRange" stored="true" indexed="true" multiValued="false"/>
+    <dynamicField name="*_drsim" type="dateRange" 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"/>
@@ -264,15 +273,15 @@
     <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) -->
+
+    <!-- LongPointField (_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"/>
@@ -280,15 +289,15 @@
     <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) -->
+
+    <!-- DoublePointField (_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"/>
@@ -296,31 +305,23 @@
     <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) -->
+
+    <!-- FloatPointField (_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"/>
-
     <dynamicField name="*suggest" type="textSuggest" indexed="true" stored="false" multiValued="true" />
 
     <!-- you must define copyField source and dest fields explicity or schemaBrowser doesn't work -->
@@ -329,7 +330,7 @@
 
   </fields>
 
- <!-- Field to use to determine and enforce document uniqueness. 
+ <!-- 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>