Get last version of acts_as_solr_reloaded

Changelog at git@github.com:brauliobo/acts_as_solr_reloaded.git

Get last version of acts_as_solr_reloaded
Changelog at git@github.com:brauliobo/acts_as_solr_reloaded.git
Rafael Martins
1 parent 3fbcccd5
Showing 40 changed files with 2269 additions and 1380 deletions Show diff stats
vendor/plugins/acts_as_solr_reloaded/.gitignore
vendor/plugins/acts_as_solr_reloaded/README.markdown
vendor/plugins/acts_as_solr_reloaded/README.rdoc
vendor/plugins/acts_as_solr_reloaded/config/solr.yml
vendor/plugins/acts_as_solr_reloaded/config/solr_environment.rb
vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr.rb
vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/acts_methods.rb
vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/class_methods.rb
vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/common_methods.rb
vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/deprecation.rb
vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/instance_methods.rb
vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/parser_methods.rb
vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/post.rb
vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/search_results.rb
vendor/plugins/acts_as_solr_reloaded/lib/solr/connection.rb
vendor/plugins/acts_as_solr_reloaded/lib/solr/document.rb
vendor/plugins/acts_as_solr_reloaded/lib/solr/field.rb
vendor/plugins/acts_as_solr_reloaded/lib/solr/request/add_document.rb
vendor/plugins/acts_as_solr_reloaded/lib/solr/request/dismax.rb
vendor/plugins/acts_as_solr_reloaded/lib/solr/request/standard.rb
+# inside solr
+solr/LICENSE.txt
+solr/NOTICE.txt
+solr/README.txt
+solr/etc/
+solr/work/
+solr/lib/
+solr/solr/README.txt
+solr/solr/solr.xml
+solr/start.jar
+solr/webapps/
+solr/solr/data/*
+
+acts_as_solr_reloaded-*.gem
 *.log
 *.log
 *_pid
+
+coverage
 coverage/*
 coverage.data
-solr/solr/data/*
-.svn
 test/db/*.db
 test/log/*.log
 pkg/*
 *.sw?
-.DS_Store
-coverage
 rdoc
 pkg
-acts_as_solr_reloaded-*.gem
 tags
+.svn
@@ -13,19 +13,20 @@ Install as a plugin
     script/plugin install git://github.com/brauliobo/acts_as_solr_reloaded.git
-Download Solr 3.1
+Download Solr 3.5
     rake solr:download
 Requirements
 ------
-* Java Runtime Environment(JRE) 1.6 aka 6.0 or newer [http://www.java.com/en/download/index.jsp](http://www.java.com/en/download/index.jsp) (use default-jre for Debian like distribution)
-* (Recommended) If you have libxml-ruby installed, make sure it's at least version 0.7
+* Java Runtime Environment(JRE) 6.0 (or newer) from Oracle or OpenJDK
 Configuration
 ======
 See config/solr.yml file.
+For solr configuration the important files are solrconfig.xml and schema.xml.
+
 Basic Usage
 ======
 <pre><code>
@@ -42,13 +43,21 @@ Basic Usage
 </code></pre>
+Pagination
+======
+ActsAsSolr implements in SearchResults class an interface compatible with will_paginate and maybe others.
-`acts_as_solr` in your tests
+In your tests
 ======
-To test code that uses `acts_as_solr` you must start a Solr server for the test environment. You can do that with `rake solr:start RAILS_ENV=test`
+To test code that uses `acts_as_solr` you must start a Solr server for the test environment.
+You can add to the beggining of your test/test_helper.rb the code:
+<pre><code>
+ENV["RAILS_ENV"] = "test"
+abort unless system 'rake solr:start' 
+at_exit { system 'rake solr:stop' }
+</pre></code>
 However, if you would like to mock out Solr calls so that a Solr server is not needed (and your tests will run much faster), just add this to your `test_helper.rb` or similar:
-
 <pre><code>
 class ActsAsSolr::Post
   def self.execute(request)
@@ -57,8 +66,6 @@ class ActsAsSolr::Post
 end
 </pre></code>
-([via](http://www.subelsky.com/2007/10/actsassolr-capistranhttpwwwbloggercomim.html#c1646308013209805416))
-
 Release Information
 ======
 Released under the MIT license.
@@ -1,96 +0,0 @@
-= DESCRIPTION
-
-This plugin adds full text search capabilities and many other nifty features from Apache's Solr[http://lucene.apache.org/solr/] to any Rails model, like:
-
-* faceting
-* dynamic attributes
-* integration with acts_as_taggable_on
-* integration with will_paginate
-* highlighting
-* geolocation
-* relevance
-* suggest
-
-Watch this screencast for a short demo of the latests features:
-
-http://www.vimeo.com/8728276
-
-== INSTALLATION
-
-    script/plugin install git://github.com/brauliobo/acts_as_solr_reloaded.git
-    rake solr:download
-
-== REQUIREMENTS
-
-* Java Runtime Environment(JRE) 1.5 aka 5.0 [http://www.java.com/en/download/index.jsp](http://www.java.com/en/download/index.jsp) (use default-jre for Debian like distribution)
-* (Recommended) If you have libxml-ruby installed, make sure it's at least version 0.7
-
-== CONFIGURATION
-
-See config/solr.yml file.
-
-== USAGE
-
-Just include the line below to any of your ActiveRecord models:
-  acts_as_solr
-
-Or if you want, you can specify only the fields that should be indexed:
-  acts_as_solr :fields => [:name, :author]
-
-Then to find instances of your model, just do:
-  Model.search(query) #query is a string representing your query
-  
-Case you want to use dynamic attributes or geolocalization, you can use this generators that setup the database:
-
-  script/generate dynamic_attributes_migration
-  script/generate local_migration
-  
-and then configure your model like this:
-
-  acts_as_solr :dynamic_attributes => true,
-               :spatial => true
-               
-If you want to integrate the model with acts_as_taggable_on, just add the option :taggable => true :
-
-  acts_as_solr :taggable => true
-
-Please see ActsAsSolr::ActsMethods for a complete info
-
-== PAGINATION
-
-In your controller:
-
-  @search = Product.search "beer", :page => 2, :per_page => 20
-
-And in your view:
-
-  will_paginate @search
-
-== TESTING
-
-To test code that uses acts_as_solr_reloaded you must start a Solr server for the test environment and also start MongoDB.
-
-== LICENSE
-
-(The MIT License)
-
-Copyright © 2010
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-‘Software’), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED ‘AS IS’, WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-# Config file for the acts_as_solr_reloaded plugin.
+# Config file for the acts_as_solr plugin.
 #
 # If you change the host or port number here, make sure you update 
 # them in your Solr config file
 development:
-  url: http://127.0.0.1:8982/solr
-  
-test:
-  url: http://127.0.0.1:8981/solr
+  url: http://0.0.0.0:8982/solr
+  jvm_options: -server -Xmx128M -Xms16M
+  timeout: 0
 production:
   url: http://127.0.0.1:8983/solr
-  jvm_options: -server -d64 -Xmx1024M -Xms64M
 \ No newline at end of file
+  jvm_options: -server -Xmx192M -Xms64M
+  timeout: 0
+
+test: &TEST
+  url: http://0.0.0.0:8981/solr
+  jvm_options: -server -Xmx128M -Xms16M
+  timeout: 0
+
+cucumber:
+  <<: *TEST
@@ -27,7 +27,7 @@ end
 unless defined? SOLR_PORT
   config = YAML::load_file(RAILS_ROOT+'/config/solr.yml')
-  raise("No solr environment defined for RAILS_ENV the #{ENV['RAILS_ENV'].inspect}") unless config[ENV['RAILS_ENV']]
+  raise("No solr environment defined for RAILS_ENV = #{ENV['RAILS_ENV'].inspect}") unless config[ENV['RAILS_ENV']]
   SOLR_HOST = ENV['HOST'] || URI.parse(config[ENV['RAILS_ENV']]['url']).host
   SOLR_PORT = ENV['PORT'] || URI.parse(config[ENV['RAILS_ENV']]['url']).port
@@ -19,36 +19,7 @@ require File.dirname(__FILE__) + &#39;/acts_as_solr/deprecation&#39;
 require File.dirname(__FILE__) + '/acts_as_solr/search_results'
 require File.dirname(__FILE__) + '/acts_as_solr/lazy_document'
 require File.dirname(__FILE__) + '/acts_as_solr/mongo_mapper'
-
-module ActsAsSolr
-  class Post
-    class << self
-      def config
-        return @config if @config
-        @config = {}
-        YAML::load_file("#{Rails.root}/config/solr.yml")[Rails.env].each{ |k,v| @config[k.to_sym] = v }
-        @config
-      end
-
-      def options
-        @options ||= credentials.merge config
-      end
-
-      def credentials
-        @credentials ||= {:username => config[:username], :password => config[:password]}
-      end
-
-      def url(core)
-        core.nil? ? config[:url] : "#{config[:url]}/#{core}"
-      end
-    
-      def execute(request, core = nil)
-        connection = Solr::Connection.new(url(core), options)
-        connection.send request
-      end
-    end
-  end
-end
+require File.dirname(__FILE__) + '/acts_as_solr/post'
 # reopen ActiveRecord and include the acts_as_solr method
 ActiveRecord::Base.extend ActsAsSolr::ActsMethods
@@ -164,8 +164,11 @@ module ActsAsSolr #:nodoc:
     # dynamic_attributes: Default false. When true, requires a has_many relationship to a DynamicAttribute
     #                     (:name, :value) model. Then, all dynamic attributes will be mapped as normal attributes
     #                    in Solr, so you can filter like this: Model.find_by_solr "#{dynamic_attribute.name}:Lorem"
+    #
     # taggable: Default false. When true, indexes tags with field name tag. Tags are taken from taggings.tag
+    #
     # spatial: Default false. When true, indexes model.local.latitude and model.local.longitude as coordinates.
+    # 
     def acts_as_solr(options={}, solr_options={}, &deferred_solr_configuration)
       $solr_indexed_models << self
@@ -262,20 +265,23 @@ module ActsAsSolr #:nodoc:
         :additional_fields => nil,
         :dynamic_attributes => false,
         :exclude_fields => [],
-        :auto_commit => true,
+        :auto_commit => ['production'].include?(Rails.env) ? false : true,
         :include => nil,
         :facets => nil,
         :boost => nil,
         :if => "true",
         :offline => false,
-        :spatial => false
+        :spatial => false,
       }
       self.solr_configuration = {
         :type_field => "type_s",
         :primary_key_field => "pk_s",
-        :default_boost => 1.0
+        :default_boost => 1.0,
       }
+      raise "Invalid options: #{(options.keys-configuration.keys).join(',')}" unless (options.keys-configuration.keys).empty?
+      raise "Invalid solr options: #{(solr_options.keys-solr_configuration.keys).join(',')}" unless (solr_options.keys-solr_configuration.keys).empty?
+
       configuration.update(options) if options.is_a?(Hash)
       solr_configuration.update(solr_options) if solr_options.is_a?(Hash)
       Deprecation.validate_index(configuration)
@@ -290,8 +296,18 @@ module ActsAsSolr #:nodoc:
         process_fields(configuration[:additional_fields])
       end
-      if configuration[:include].respond_to?(:each)
-        process_includes(configuration[:include])
+      process_includes(configuration[:include]) if configuration[:include]
+    end
+
+    def after_save_reindex(associations, options = {})
+      Array(associations).each do |association|
+        after_save do |ar|
+          if options[:with] == :delayed_job
+            delay(:run_at => (Date.today+1.day).to_time+4.hours).solr_batch_add_association ar, association
+          else
+            solr_batch_add_association ar, association
+          end
+        end
       end
     end
@@ -301,19 +317,13 @@ module ActsAsSolr #:nodoc:
       field_name, options = determine_field_name_and_options(field)
       configuration[:solr_fields][field_name] = options
-      define_method("#{field_name}_for_solr".to_sym) do
-        begin
-          value = self[field_name] || self.instance_variable_get("@#{field_name.to_s}".to_sym) || self.send(field_name.to_sym)
-          case options[:type]
-            # format dates properly; return nil for nil dates
-            when :date
-              value ? (value.respond_to?(:utc) ? value.utc : value).strftime("%Y-%m-%dT%H:%M:%SZ") : nil
-            else value
-          end
-        rescue
-          puts $!
-          logger.debug "There was a problem getting the value for the field '#{field_name}': #{$!}"
-          value = ''
+      define_method "#{field_name}_for_solr" do
+        value = self.send field_name
+        case options[:type]
+        when :date # format dates properly; return nil for nil dates
+          value ? (value.respond_to?(:utc) ? value.utc : value).strftime("%Y-%m-%dT%H:%M:%SZ") : nil
+        else
+          value
         end
       end
     end
@@ -328,11 +338,9 @@ module ActsAsSolr #:nodoc:
     end
     def process_includes(includes)
-      if includes.respond_to?(:each)
-        includes.each do |assoc|
-          field_name, options = determine_field_name_and_options(assoc)
-          configuration[:solr_includes][field_name] = options
-        end
+      Array(includes).each do |assoc|
+        field_name, options = determine_field_name_and_options(assoc)
+        configuration[:solr_includes][field_name] = options
       end
     end
@@ -197,7 +197,7 @@ module ActsAsSolr #:nodoc:
       data = parse_query(query, options)
       data.total_hits
     end
-            
+
     # It's used to rebuild the Solr index for a specific model. 
     #  Book.rebuild_solr_index
     # 
@@ -209,39 +209,75 @@ module ActsAsSolr #:nodoc:
     # If a finder block is given, it will be called to retrieve the items to index.
     # This can be very useful for things such as updating based on conditions or
     # using eager loading for indexed associations.
-    def rebuild_solr_index(batch_size=100, options = {}, &finder)
-      finder ||= lambda { |ar, options| ar.find(:all, options.merge({:order => self.primary_key})) }
+    def rebuild_solr_index(batch_size=300, options = {}, &finder)
+      finder ||= lambda do |ar, sql_options|
+        ar.all sql_options.merge!({:order => self.primary_key, :include => configuration[:solr_includes].keys})
+      end
       start_time = Time.now
       options[:offset] ||= 0
+      options[:threads] ||= 2
+      options[:delayed_job] &= defined?(Delayed::Job)
       if batch_size > 0
         items_processed = 0
-        limit = batch_size
         offset = options[:offset]
-        begin
-          iteration_start = Time.now
-          items = finder.call(self, {:limit => limit, :offset => offset})
+        end_reached = false
+        threads = []
+        mutex = Mutex.new
+        queue = Queue.new
+        loop do
+          items = finder.call(self, {:limit => batch_size, :offset => offset})
           add_batch = items.collect { |content| content.to_solr_doc }
-    
-          if items.size > 0
-            solr_add add_batch
-            solr_commit
-          end
-    
-          items_processed += items.size
-          last_id = items.last.id if items.last
-          time_so_far = Time.now - start_time
-          iteration_time = Time.now - iteration_start         
-          logger.info "#{Process.pid}: #{items_processed} items for #{self.name} have been batch added to index in #{'%.3f' % time_so_far}s at #{'%.3f' % (items_processed / time_so_far)} items/sec (#{'%.3f' % (items.size / iteration_time)} items/sec for the last batch). Last id: #{last_id}"
           offset += items.size
-        end while items.nil? || items.size > 0
+          end_reached = items.size == 0
+          break if end_reached
+
+          if options[:threads] == threads.size
+            threads.first.join 
+            threads.shift
+          end
+
+          queue << [items, add_batch]
+          threads << Thread.new do
+            iteration_start = Time.now
+
+            iteration_items, iteration_add_batch = queue.pop(true)
+            if options[:delayed_job]
+              delay.solr_add iteration_add_batch
+            else
+              solr_add iteration_add_batch
+              solr_commit
+            end
+
+            last_id = iteration_items.last.id
+            time_so_far = Time.now - start_time
+            iteration_time = Time.now - iteration_start         
+            mutex.synchronize do
+              items_processed += iteration_items.size
+              if options[:delayed_job]
+                logger.info "#{Process.pid}: #{items_processed} items for #{self.name} have been sent to Delayed::Job in #{'%.3f' % time_so_far}s at #{'%.3f' % (items_processed / time_so_far)} items/sec. Last id: #{last_id}"
+              else
+                logger.info "#{Process.pid}: #{items_processed} items for #{self.name} have been batch added to index in #{'%.3f' % time_so_far}s at #{'%.3f' % (items_processed / time_so_far)} items/sec. Last id: #{last_id}"
+              end
+            end
+          end
+        end
+
+        solr_commit if options[:delayed_job]
+        threads.each{ |t| t.join }
       else
         items = finder.call(self, {})
         items.each { |content| content.solr_save }
         items_processed = items.size
       end
-      solr_optimize
-      logger.info items_processed > 0 ? "Index for #{self.name} has been rebuilt" : "Nothing to index for #{self.name}"
+
+      if items_processed > 0
+        solr_optimize
+        time_elapsed = Time.now - start_time
+        logger.info "Index for #{self.name} has been rebuilt (took #{'%.3f' % time_elapsed}s)"
+      else
+        "Nothing to index for #{self.name}"
+      end
     end
     alias :rebuild_index :rebuild_solr_index
 module ActsAsSolr #:nodoc:
   module CommonMethods
-    
+
+    TypeMapping = {
+      :double => "do",
+      :float => "f",
+      :decimal => "f",
+      :integer => "i",
+      :boolean => "b",
+      :string => "s",
+      :date => "d",
+      :range_float => "rf",
+      :range_integer => "ri",
+      :facet => "facet",
+      :text => "t",
+    }
+
     # Converts field types into Solr types
     def get_solr_field_type(field_type)
       if field_type.is_a?(Symbol)
-        h = {
-          :float => "f",
-          :decimal => "f",
-          :integer => "i",
-          :boolean => "b",
-          :string => "s",
-          :date => "d",
-          :range_float => "rf",
-          :range_integer => "ri",
-          :facet => "facet",
-          :text => "t",
-        }
-        t = h[field_type]
+        t = TypeMapping[field_type]
         raise "Unknown field_type symbol: #{field_type}" if t.nil?
         t
       elsif field_type.is_a?(String)
@@ -34,7 +36,7 @@ module ActsAsSolr #:nodoc:
           return "false"
         when "s", "t", "d", :date, :string, :text
           return ""
-        when "f", "rf", :float, :range_float
+        when "f", "rf", :float, :range_float, :double, :decimal
           return 0.00
         when "i", "ri", :integer, :range_integer
           return 0
@@ -42,6 +44,14 @@ module ActsAsSolr #:nodoc:
         return ""
       end
     end
+
+    def solr_batch_add(objects)
+      solr_add Array(objects).map{ |a| a.to_solr_doc }
+    end
+
+    def solr_batch_add_association(ar, association)
+      solr_batch_add ar.send(association)
+    end
     # Sends an add command to Solr
     def solr_add(add_xml)
@@ -30,7 +30,7 @@ module ActsAsSolr #:nodoc:
       end
       if options[:sort_by]
         plog "The option :sort_by is deprecated, use :order instead!"
-        options[:order] ||= options[:sort_by]
+        options[:sort] ||= options[:sort_by]
       end
       if options[:start]
         plog "The option :start is deprecated, use :offset instead!"
@@ -45,8 +45,6 @@ module ActsAsSolr #:nodoc:
       # iterate through the fields and add them to the document,
       configuration[:solr_fields].each do |field_name, options|
-        #field_type = configuration[:facets] && configuration[:facets].include?(field) ? :facet : :text
-        
         field_boost = options[:boost] || solr_configuration[:default_boost]
         field_type = get_solr_field_type(options[:type])
         solr_name = options[:as] || field_name
@@ -66,8 +64,10 @@ module ActsAsSolr #:nodoc:
           next if value.nil? || value.to_s.strip.empty?
           [value].flatten.each do |v|
             v = set_value_if_nil(suffix) if value.to_s == ""
-            field = Solr::Field.new("#{solr_name}_#{suffix}" => ERB::Util.html_escape(v.to_s))
-            field.boost = validate_boost(field_boost)
+        
+            field = Solr::Field.new(:name => "#{solr_name}_#{suffix}", :value => ERB::Util.html_escape(v.to_s))
+            processed_boost = validate_boost(field_boost)
+            field.boost = processed_boost if processed_boost != solr_configuration[:default_boost]
             doc << field
           end
         end
@@ -78,38 +78,38 @@ module ActsAsSolr #:nodoc:
       add_tags(doc)
       add_space(doc)
-      debug doc.to_xml
+      debug doc.to_json
       doc
     end
-    
+
     private
     def debug(text)
       logger.debug text rescue nil
     end
-    
+
     def add_space(doc)
       if configuration[:spatial] and local
-        doc << Solr::Field.new("lat" => local.latitude)
-        doc << Solr::Field.new("lng" => local.longitude)
+        doc << Solr::Field.new(:name => "lat", :value => local.latitude)
+        doc << Solr::Field.new(:name => "lng", :value => local.longitude)
       end
     end
     def add_tags(doc)
       taggings.each do |tagging|
-        doc << Solr::Field.new("tag_facet" => tagging.tag.name)
-        doc << Solr::Field.new("tag_t" => tagging.tag.name)
+        doc << Solr::Field.new(:name => "tag_facet", :value => tagging.tag.name)
+        doc << Solr::Field.new(:name => "tag_t", :value => tagging.tag.name)
       end if configuration[:taggable]
     end
     def add_dynamic_attributes(doc)
       dynamic_attributes.each do |attribute|
         value = ERB::Util.html_escape(attribute.value)
-        doc << Solr::Field.new("#{attribute.name}_t" => value)
-        doc << Solr::Field.new("#{attribute.name}_facet" => value)
+        doc << Solr::Field.new(:name => "#{attribute.name}_t", :value => value)
+        doc << Solr::Field.new(:name => "#{attribute.name}_facet", :value => value)
       end if configuration[:dynamic_attributes]
     end
-    
+
     def add_includes(doc)
       if configuration[:solr_includes].respond_to?(:each)
         configuration[:solr_includes].each do |association, options|
@@ -120,12 +120,13 @@ module ActsAsSolr #:nodoc:
           suffix = get_solr_field_type(field_type)
           case self.class.reflect_on_association(association).macro
           when :has_many, :has_and_belongs_to_many
-            records = self.send(association).to_a
+            records = self.send(association).compact
             unless records.empty?
               records.each {|r| data << include_value(r, options)}
-              [data].flatten.each do |value|
-                field = Solr::Field.new("#{field_name}_#{suffix}" => value)
-                field.boost = validate_boost(field_boost)
+              Array(data).each do |value|
+                field = Solr::Field.new(:name => "#{field_name}_#{suffix}", :value => value)
+                processed_boost = validate_boost(field_boost)
+                field.boost = processed_boost if processed_boost != solr_configuration[:default_boost]
                 doc << field
               end
             end
@@ -145,7 +146,13 @@ module ActsAsSolr #:nodoc:
       elsif options[:using].is_a? Symbol
         record.send(options[:using])
       else
-        record.attributes.inject([]){|k,v| k << "#{v.first}=#{ERB::Util.html_escape(v.last)}"}.join(" ")
+        if options[:fields]
+          fields = {}
+          options[:fields].each{ |f| fields[f] = record.send(f) }
+        else
+          fields = record.attributes
+        end
+        fields.map{ |k,v| ERB::Util.html_escape(v) }.join(" ")
       end
     end
@@ -4,9 +4,10 @@ module ActsAsSolr #:nodoc:
     # Method used by mostly all the ClassMethods when doing a search
     def parse_query(query=nil, options={}, models=nil)
-      valid_options = [ :filter_queries, :offset, :limit, :facets, :models, :results_format, :order,
-        :scores, :operator, :include, :lazy, :joins, :select, :core,
-        :around, :relevance, :highlight, :page, :per_page]
+      valid_options = [ :alternate_query, :boost_functions, :filter_queries, :facets, :models, :sort,
+        :scores, :operator, :lazy, :core, :latitude, :longitude, :radius, :relevance, :highlight,
+        :offset, :per_page, :limit, :page,
+        :results_format, :sql_options]
       query_options = {}
       field_list = models.nil? ? solr_configuration[:primary_key_field] : "id"
@@ -20,8 +21,7 @@ module ActsAsSolr #:nodoc:
         query = sanitize_query(query)
         query_options[:filter_queries].push(solr_type_condition)
       end
-      query_options[:query] = query
-      order = options[:order].split(/\s*,\s*/).collect{|e| e.gsub(/\s+/,'_t ').gsub(/\bscore_t\b/, 'score')  }.join(',') if options[:order]
+      query_options[:query] = "#{options[:alternate_query]} #{query}"
       raise "Invalid parameters: #{(options.keys - valid_options).join(',')}" unless (options.keys - valid_options).empty?
       begin
@@ -34,8 +34,8 @@ module ActsAsSolr #:nodoc:
         query = add_relevance query, options[:relevance]
-        raise "Expecting and array of strings for :filter_queries" unless options[:filter_queries].nil? or options[:filter_queries].kind_of?(Array)
-        query_options[:filter_queries] += replace_types([*options[:filter_queries]].collect{|k| "#{k.dup.sub!(/ *: */,"_t:")}"}) if options[:filter_queries]
+        query_options[:filter_queries] += replace_types([*options[:filter_queries]], '') if options[:filter_queries]
+        query_options[:boost_functions] = replace_types([*options[:boost_functions]], '').join(' ') if options[:boost_functions]
         # first steps on the facet parameter processing
         if options[:facets]
@@ -47,9 +47,8 @@ module ActsAsSolr #:nodoc:
           # override the :zeros (it's deprecated anyway) if :mincount exists
           query_options[:facets][:mincount] = options[:facets][:mincount] if options[:facets][:mincount]
           query_options[:facets][:fields] = options[:facets][:fields].collect{|k| "#{k}_facet"} if options[:facets][:fields]
-          query_options[:filter_queries] += replace_types([*options[:facets][:browse]].collect{|k| "#{k.dup.sub!(/ *: */,"_t:")}"}) if options[:facets][:browse]
-          query_options[:facets][:queries] = replace_types(options[:facets][:query].collect{|k| "#{k.dup.sub!(/ *: */,"_t:")}"}) if options[:facets][:query]
-
+          query_options[:filter_queries] += replace_types([*options[:facets][:browse]]) if options[:facets][:browse]
+          query_options[:facets][:queries] = replace_types(options[:facets][:query]) if options[:facets][:query]
           if options[:facets][:dates]
             query_options[:date_facets] = {}
@@ -82,28 +81,25 @@ module ActsAsSolr #:nodoc:
           end
         end
-            if options[:highlight]
-            query_options[:highlighting] = {}
-            query_options[:highlighting][:field_list] = []
-            query_options[:highlighting][:field_list] << options[:highlight][:fields].collect {|k| "#{k}_t"} if options[:highlight][:fields]
-            query_options[:highlighting][:require_field_match] =  options[:highlight][:require_field_match] if options[:highlight][:require_field_match]
-            query_options[:highlighting][:max_snippets] = options[:highlight][:max_snippets] if options[:highlight][:max_snippets]
-            query_options[:highlighting][:prefix] = options[:highlight][:prefix] if options[:highlight][:prefix]
-            query_options[:highlighting][:suffix] = options[:highlight][:suffix] if options[:highlight][:suffix]
-           end
-
-        # TODO: set the sort parameter instead of the old ;order. style.
-        query_options[:sort] = replace_types([order], false)[0] if options[:order]
-
-        if options[:around]
-          query_options[:radius] = options[:around][:radius]
-          query_options[:latitude] = options[:around][:latitude]
-          query_options[:longitude] = options[:around][:longitude]
+        if options[:highlight]
+          query_options[:highlighting] = {}
+          query_options[:highlighting][:field_list] = []
+          query_options[:highlighting][:field_list] << options[:highlight][:fields].collect {|k| "#{k}_t"} if options[:highlight][:fields]
+          query_options[:highlighting][:require_field_match] =  options[:highlight][:require_field_match] if options[:highlight][:require_field_match]
+          query_options[:highlighting][:max_snippets] = options[:highlight][:max_snippets] if options[:highlight][:max_snippets]
+          query_options[:highlighting][:prefix] = options[:highlight][:prefix] if options[:highlight][:prefix]
+          query_options[:highlighting][:suffix] = options[:highlight][:suffix] if options[:highlight][:suffix]
         end
-        ActsAsSolr::Post.execute(Solr::Request::Standard.new(query_options), options[:core])
+        query_options[:sort] = replace_types([options[:sort]], '')[0] if options[:sort]
+
+        query_options[:radius] = options[:radius]
+        query_options[:latitude] = options[:latitude]
+        query_options[:longitude] = options[:longitude]
+
+        ActsAsSolr::Post.execute(Solr::Request::Dismax.new(query_options), options[:core])
       rescue
-        raise "There was a problem executing your search\n#{query_options.inspect}\n: #{$!} in #{$!.backtrace.first}"
+        raise "#{$query} There was a problem executing your search\n#{query_options.inspect}\n: #{$!} in #{$!.backtrace.first}"
       end
     end
@@ -158,11 +154,11 @@ module ActsAsSolr #:nodoc:
       result = if configuration[:lazy] && configuration[:format] != :ids
         ids.collect {|id| ActsAsSolr::LazyDocument.new(id, self)}
       elsif configuration[:format] == :objects
-        find_options = {}
-        find_options[:include] = options[:include] if options[:include]
-        find_options[:select] = options[:select] if options[:select]
-        find_options[:joins] = options[:joins] if options[:joins]
-        result = reorder(self.find(ids, find_options), ids)
+        find_options = options[:sql_options] || {}
+        find_options[:conditions] = self.send :merge_conditions, {:id => ids}, (find_options[:conditions] || [])
+        result = self.all(find_options)
+        result = reorder(result, ids) unless find_options[:order]
+        result
       else
         ids
       end
@@ -182,14 +178,13 @@ module ActsAsSolr #:nodoc:
     # Replaces the field types based on the types (if any) specified
     # on the acts_as_solr call
-    def replace_types(strings, include_colon=true)
-      suffix = include_colon ? ":" : ""
+    def replace_types(strings, suffix=':')
       if configuration[:solr_fields]
         configuration[:solr_fields].each do |name, options|
-          solr_name = options[:as] || name.to_s
+          solr_name = (options[:as] || name).to_s
           solr_type = get_solr_field_type(options[:type])
           field = "#{solr_name}_#{solr_type}#{suffix}"
-          strings.each_with_index {|s,i| strings[i] = s.gsub(/#{solr_name.to_s}_t#{suffix}/,field) }
+          strings.each_with_index {|s,i| strings[i] = s.gsub(/\b#{solr_name}\b#{suffix}/,field) }
         end
       end
       if configuration[:solr_includes]
@@ -197,7 +192,7 @@ module ActsAsSolr #:nodoc:
           solr_name = options[:as] || association.to_s.singularize
           solr_type = get_solr_field_type(options[:type])
           field = "#{solr_name}_#{solr_type}#{suffix}"
-          strings.each_with_index {|s,i| strings[i] = s.gsub(/#{solr_name.to_s}_t#{suffix}/,field) }
+          strings.each_with_index {|s,i| strings[i] = s.gsub(/\b#{solr_name}\b#{suffix}/,field) }
         end
       end
       strings
@@ -0,0 +1,29 @@
+module ActsAsSolr
+  class Post
+    class << self
+      def config
+        return @config if @config
+        @config = {}
+        YAML::load_file("#{Rails.root}/config/solr.yml")[Rails.env].each{ |k,v| @config[k.to_sym] = v }
+        @config
+      end
+
+      def options
+        @options ||= credentials.merge config
+      end
+
+      def credentials
+        @credentials ||= {:username => config[:username], :password => config[:password]}
+      end
+
+      def url(core)
+        core.nil? ? config[:url] : "#{config[:url]}/#{core}"
+      end
+
+      def execute(request, core = nil)
+        connection = Solr::Connection.new(url(core), options)
+        connection.send request
+      end
+    end
+  end
+end
@@ -27,10 +27,17 @@ module ActsAsSolr #:nodoc:
   #
   #
   class SearchResults
+
+    include Enumerable
+
     def initialize(solr_data={})
       @solr_data = solr_data
     end
+    def each(&block)
+      self.results.each &block
+    end
+
     # Returns an array with the instances. This method
     # is also aliased as docs and records
     def results
@@ -60,7 +67,7 @@ module ActsAsSolr #:nodoc:
     # Returns the highlighted fields which one has asked for..
     def highlights
-        @solr_data[:highlights]
+      @solr_data[:highlights]
     end
     # Returns a suggested query
@@ -83,10 +90,45 @@ module ActsAsSolr #:nodoc:
       (@solr_data[:start].to_i / per_page) + 1
     end
+    def blank?
+      total_entries == 0
+    end
+
+    def size
+      total_entries
+    end
+
+    def offset
+      (current_page - 1) * per_page
+    end
+
+    def previous_page
+      if current_page > 1
+        current_page - 1
+      else
+        false
+      end
+    end
+
+    def next_page
+      if current_page < total_pages
+        current_page + 1
+      else
+        false
+      end
+    end
+
+    def method_missing(symbol, *args, &block)
+      self.results.send(symbol, *args, &block)
+    rescue NoMethodError
+      raise NoMethodError, "There is no method called #{symbol} at #{self.class.name} - #{self.inspect}"
+    end
+
     alias docs results
     alias records results
     alias num_found total
     alias total_hits total
+    alias total_entries total
     alias highest_score max_score
   end
@@ -40,8 +40,8 @@ class Solr::Connection
     # Not actually opening the connection yet, just setting up the persistent connection.
     @connection = Net::HTTP.new(@url.host, @url.port)
-    
-    @connection.read_timeout = opts[:timeout] if opts[:timeout]
+  
+    @connection.read_timeout = opts[:timeout].to_i || 0
     @username = opts[:username] if opts[:username]
     @password = opts[:password] if opts[:password]
   end
@@ -18,7 +18,7 @@ class Solr::Document
   # Create a new Solr::Document, optionally passing in a hash of 
   # key/value pairs for the fields
   #
-  #   doc = Solr::Document.new(:creator => 'Jorge Luis Borges')
+  #   doc = Solr::Document.new(:name => :creator, :value => 'Jorge Luis Borges')
   def initialize(hash={})
     @fields = []
     self << hash
@@ -26,19 +26,19 @@ class Solr::Document
   # Append a Solr::Field
   #
-  #   doc << Solr::Field.new(:creator => 'Jorge Luis Borges')
+  #   doc << Solr::Field.new(:name => :creator, :value => 'Jorge Luis Borges')
   #
   # If you are truly lazy you can simply pass in a hash:
   #
-  #   doc << {:creator => 'Jorge Luis Borges'}
+  #   doc << {:name => :creator, :value => 'Jorge Luis Borges'}
   def <<(fields)
     case fields
     when Hash
       fields.each_pair do |name,value|
         if value.respond_to?(:each) && !value.is_a?(String)
-          value.each {|v| @fields << Solr::Field.new(name => v)}
+          value.each {|v| @fields << Solr::Field.new(:name => name, :value => v)}
         else
-          @fields << Solr::Field.new(name => value)
+          @fields << Solr::Field.new(:name => name, :value => value)
         end
       end
     when Solr::Field
@@ -58,10 +58,20 @@ class Solr::Document
   # shorthand to assign as a hash
   def []=(name,value)
-    @fields << Solr::Field.new(name => value)
+    @fields << Solr::Field.new(:name => name, :value => value)
+  end
+
+  def to_jsonhash
+    hash = {'doc' => {}}
+    hash['boost'] = @boost if @boost
+    @fields.each{ |f| hash['doc'][f.name] = f.value_to_jsonhash }
+    hash
+  end
+
+  def to_json
+    to_jsonhash.to_json
   end
-  # convert the Document to a REXML::Element 
   def to_xml
     e = Solr::XML::Element.new 'doc'
     e.attributes['boost'] = @boost.to_s if @boost
@@ -18,18 +18,22 @@ class Solr::Field
   # Accepts an optional <tt>:boost</tt> parameter, used to boost the relevance of a particular field.
   def initialize(params)
-    @boost = params[:boost]
-    name_key = (params.keys - VALID_PARAMS).first
-    @name, @value = name_key.to_s, params[name_key]
+    @boost = params[:boost] == 1.0 ? nil : params[:boost]
+    @name = params[:name].to_s
+    @value = params[:value]
     # Convert any Time values into UTC/XML schema format (which Solr requires).
-    @value = @value.respond_to?(:utc) ? @value.utc.xmlschema : @value.to_str
+    @value = @value.respond_to?(:utc) ? @value.utc.xmlschema : @value
   end
+  def value_to_jsonhash
+    @boost.nil? ? @value : {'boost' => @boost, 'value' => @value}
+  end 
+
   def to_xml
     e = Solr::XML::Element.new 'field'
     e.attributes['name'] = @name
     e.attributes['boost'] = @boost.to_s if @boost
-    e.text = @value
+    e.text = @value.to_str
     return e
   end
@@ -10,19 +10,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
-class Solr::Request::AddDocument < Solr::Request::Update
+class Solr::Request::AddDocument < Solr::Request::JsonUpdate
   # create the request, optionally passing in a Solr::Document
   #
-  #   request = Solr::Request::AddDocument.new doc
+  #   request = Solr::Request::AddDocument.new(doc)
   #
   # as a short cut you can pass in a Hash instead:
   #
-  #   request = Solr::Request::AddDocument.new :creator => 'Jorge Luis Borges'
+  #   request = Solr::Request::AddDocument.new(:creator => 'Jorge Luis Borges')
   # 
   # or an array, to add multiple documents at the same time:
   # 
-  #   request = Solr::Request::AddDocument.new([doc1, doc2, doc3])
+  #   request = Solr::Request::AddDocument.new([doc1, doc2, doc3]))
   def initialize(doc={})
     @docs = []
@@ -33,15 +33,23 @@ class Solr::Request::AddDocument &lt; Solr::Request::Update
     end
   end
-  # returns the request as a string suitable for posting
-  
-  def to_s
+  def to_json
+    '{' + 
+    @docs.map{ |doc| "\"add\": #{doc.to_jsonhash.to_json}" }.join(',') +
+    '}'
+  end
+
+  def to_xml
     e = Solr::XML::Element.new 'add'
     for doc in @docs
       e.add_element doc.to_xml
     end
     return e.to_s
   end
+
+  def to_s
+    to_json
+  end
   private
   def add_doc(doc)
@@ -13,34 +13,25 @@
 class Solr::Request::Dismax < Solr::Request::Standard
   VALID_PARAMS.replace(VALID_PARAMS + [:tie_breaker, :query_fields, :minimum_match, :phrase_fields, :phrase_slop,
-                                       :boost_query, :boost_functions])
+                                       :alternate_query, :boost_query, :boost_functions])
   def initialize(params)
-    @alternate_query = params.delete(:alternate_query)
-    @sort_values = params.delete(:sort)
-    
-    super
-    
-    @query_type = "dismax"
+    super("search")
   end
   def to_hash
     hash = super
+    hash[:defType] = 'edismax'
     hash[:tie] = @params[:tie_breaker]
     hash[:mm]  = @params[:minimum_match]
     hash[:qf]  = @params[:query_fields]
     hash[:pf]  = @params[:phrase_fields]
     hash[:ps]  = @params[:phrase_slop]
     hash[:bq]  = @params[:boost_query]
-    hash[:bf]  = @params[:boost_functions]
-    hash["q.alt"] = @alternate_query
-    # FIXME: 2007-02-13 <coda.hale@gmail.com> --  This code is duplicated in
-    # Solr::Request::Standard. It should be refactored into a single location.
-    hash[:sort] = @sort_values.collect do |sort|
-      key = sort.keys[0]
-      "#{key.to_s} #{sort[key] == :descending ? 'desc' : 'asc'}"
-    end.join(',') if @sort_values
+    hash[:boost]  = @params[:boost_functions]
+    hash["q.alt"] = @params[:alternate_query]
+
     return hash
   end
-end
 \ No newline at end of file
+end
@@ -14,10 +14,10 @@ class Solr::Request::Standard &lt; Solr::Request::Select
   VALID_PARAMS = [:query, :sort, :default_field, :operator, :start, :rows, :shards, :date_facets,
     :filter_queries, :field_list, :debug_query, :explain_other, :facets, :highlighting, :mlt, :radius, 
-    :latitude, :longitude, :spellcheck]
+    :radius, :latitude, :longitude, :spellcheck]
   def initialize(params)
-    super(params[:radius].nil? ? 'standard' : 'geo')
+    super('search')
     raise "Invalid parameters: #{(params.keys - VALID_PARAMS).join(',')}" unless 
       (params.keys - VALID_PARAMS).empty?
@@ -51,6 +51,7 @@ class Solr::Request::Standard &lt; Solr::Request::Select
     hash[:q] = @params[:query]
     hash["q.op"] = @params[:operator]
     hash[:df] = @params[:default_field]
+    hash[:echoParams] = 'explicit'
     # common parameter processing
     hash[:start] = @params[:start]
@@ -61,11 +62,9 @@ class Solr::Request::Standard &lt; Solr::Request::Select
     hash[:explainOther] = @params[:explain_other]
     hash[:shards] = @params[:shards].join(',') unless @params[:shards].empty?
-    #if @params[:qt].eql? 'geo'
-      hash[:radius] = @params[:radius]
-      hash[:lat] = @params[:latitude]
-      hash[:long] = @params[:longitude]
-    #end
+    hash[:sfield] = 'latlng'
+    hash[:d] = @params[:radius]
+    hash[:pt] = "#{@params[:latitude]}, #{@params[:longitude]}"
     # facet parameter processing
     if @params[:facets]
@@ -1,27 +0,0 @@
-#!/usr/bin/env ruby
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# TODO: fill out Solr tasks: start, stop, ping, optimize, etc.
-
-require 'rake'
-require 'rake/tasklib'
-
-module Solr
-  namespace :solr do
-    desc "Start Solr"
-    task :start do
-      # TODO: actually start it up!
-      puts "Starting..."
-    end
-  end
-end
@@ -93,6 +93,12 @@ namespace :solr do
       puts "PID file not found at #{SOLR_PID_FILE}. Either Solr is not running or no PID file was written."
     end
   end
+
+  desc 'Restart Solr. Specify the environment by using: RAILS_ENV=your_env. Defaults to development if none.'
+  task :restart => :environment do
+    Rake::Task["solr:stop"].invoke 
+    Rake::Task["solr:start"].invoke 
+  end
   desc 'Remove Solr index'
   task :destroy_index => :environment do
@@ -111,39 +117,45 @@ namespace :solr do
   task :reindex => :environment do
     require File.expand_path("#{File.dirname(__FILE__)}/../../config/solr_environment")
-    optimize     = env_to_bool('OPTIMIZE', true)
+    delayed_job  = env_to_bool('DELAYED_JOB', false)
+    optimize     = env_to_bool('OPTIMIZE', !delayed_job)
     start_server = env_to_bool('START_SERVER', false)
     offset       = ENV['OFFSET'].to_i.nonzero? || 0
     clear_first  = env_to_bool('CLEAR', offset == 0)
     batch_size   = ENV['BATCH'].to_i.nonzero? || 300
     debug_output = env_to_bool("DEBUG", false)
+    models       = (ENV['MODELS'] || '').split(',').map{ |m| m.constantize }
+    threads      = (ENV['THREADS'] || '2').to_i
     logger = ActiveRecord::Base.logger = Logger.new(STDOUT)
     logger.level = ActiveSupport::BufferedLogger::INFO unless debug_output
+    Dir["#{Rails.root}/app/models/*.rb"].each{ |file| require file }
     if start_server
       puts "Starting Solr server..."
       Rake::Task["solr:start"].invoke 
     end
-    # Disable solr_optimize
+    # Disable optimize and commit
     module ActsAsSolr::CommonMethods
       def blank() end
       alias_method :deferred_solr_optimize, :solr_optimize
       alias_method :solr_optimize, :blank
+      alias_method :solr_commit, :blank
     end
-    $solr_indexed_models.each do |model|
-  
+    models = $solr_indexed_models unless models.count > 0
+    models.each do |model|
       if clear_first
         puts "Clearing index for #{model}..."
-        #ActsAsSolr::Post.execute(Solr::Request::Delete.new(:query => "#{model.solr_configuration[:type_field]}:#{model}")) 
-        #ActsAsSolr::Post.execute(Solr::Request::Commit.new)
+        ActsAsSolr::Post.execute(Solr::Request::Delete.new(:query => "#{model.solr_configuration[:type_field]}:#{model}")) 
+        ActsAsSolr::Post.execute(Solr::Request::Commit.new)
       end
       puts "Rebuilding index for #{model}..."
-      model.rebuild_solr_index batch_size, :offset => offset
-
+      model.rebuild_solr_index batch_size, :offset => offset, :threads => threads, :delayed_job => delayed_job
+      puts "Commiting changes..."
+      ActsAsSolr::Post.execute(Solr::Request::Commit.new)
     end 
     if $solr_indexed_models.empty?
@@ -0,0 +1,19 @@
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#-----------------------------------------------------------------------
+# Use a protected word file to protect against the stemmer reducing two
+# unrelated words to the same base word.
+
+# Some non-words that normally won't be encountered,
+# just to test that they won't be stemmed.
+
@@ -0,0 +1,19 @@
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#-----------------------------------------------------------------------
+# Use a protected word file to protect against the stemmer reducing two
+# unrelated words to the same base word.
+
+# Some non-words that normally won't be encountered,
+# just to test that they won't be stemmed.
+
@@ -1,21 +0,0 @@
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#-----------------------------------------------------------------------
-# Use a protected word file to protect against the stemmer reducing two
-# unrelated words to the same base word.
-
-# Some non-words that normally won't be encountered,
-# just to test that they won't be stemmed.
-dontstems
-zwhacky
-
@@ -41,7 +41,7 @@
     <fieldType name="slong" class="solr.SortableLongField" sortMissingLast="true" omitNorms="false"/>
     <fieldType name="sfloat" class="solr.SortableFloatField" sortMissingLast="true" omitNorms="false"/>
     <fieldType name="sdouble" class="solr.SortableDoubleField" sortMissingLast="true" omitNorms="false"/>
-    <fieldType name="date" class="solr.DateField" sortMissingLast="true" omitNorms="false"/>
+    <fieldType name="date" class="solr.TrieDateField" sortMissingLast="true" omitNorms="false"/>
     <fieldType name="text_ws" class="solr.TextField" positionIncrementGap="100">
       <analyzer>
         <tokenizer class="solr.WhitespaceTokenizerFactory"/>
@@ -50,24 +50,48 @@
     <fieldType name="text" class="solr.TextField" autoGeneratePhraseQueries="false">
       <analyzer type="index">
-        <tokenizer class="solr.KeywordTokenizerFactory"/>
+        <tokenizer class="solr.StandardTokenizerFactory"/>
         <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+
+	<filter class="solr.ASCIIFoldingFilterFactory"/>
         <filter class="solr.LowerCaseFilterFactory"/>
-        <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
+
+	<filter class="solr.StopFilterFactory" words="stopwords.pt.txt" />
+
+	<!-- stemming
+	-->
+	<filter class="solr.KeywordMarkerFilterFactory" protected="protwords.pt.txt" />
+	<filter class="solr.PortugueseStemFilterFactory" />
+	<!-- too slow
 	<filter class="solr.HunspellStemFilterFactory" dictionary="en_US.dic" affix="en_US.aff" ignoreCase="true" />
 	<filter class="solr.HunspellStemFilterFactory" dictionary="pt_PT.dic" affix="pt_PT.aff" ignoreCase="true" />
-	<filter class="solr.ASCIIFoldingFilterFactory"/>
+	-->
+
+	<!-- improvised stemming
 	<filter class="solr.EdgeNGramFilterFactory" minGramSize="3" maxGramSize="20" side="front"/>
+	-->
       </analyzer>
       <analyzer type="query">
-        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+        <tokenizer class="solr.StandardTokenizerFactory"/>
         <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+
+	<filter class="solr.ASCIIFoldingFilterFactory"/>
         <filter class="solr.LowerCaseFilterFactory"/>
-        <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="0" catenateNumbers="0" catenateAll="0"/>
+
+	<filter class="solr.StopFilterFactory" words="stopwords.pt.txt" />
+
+	<!-- stemming
+	-->
+	<filter class="solr.KeywordMarkerFilterFactory" protected="protwords.pt.txt" />
+	<filter class="solr.PortugueseStemFilterFactory" />
+	<!-- too slow
 	<filter class="solr.HunspellStemFilterFactory" dictionary="en_US.dic" affix="en_US.aff" ignoreCase="true" />
 	<filter class="solr.HunspellStemFilterFactory" dictionary="pt_PT.dic" affix="pt_PT.aff" ignoreCase="true" />
-	<filter class="solr.ASCIIFoldingFilterFactory"/>
+	-->
+
+	<!-- improvised stemming
 	<filter class="solr.EdgeNGramFilterFactory" minGramSize="3" maxGramSize="20" side="front"/>
+	-->
       </analyzer>
     </fieldType>
@@ -93,11 +117,18 @@
       </analyzer>
     </fieldType>
+    <fieldType name="location" class="solr.LatLonType" subFieldSuffix="_coordinate"/>
+
  </types>
  <fields>
+   <field name="latlng" type="location" indexed="true" stored="true" />
+   <field name="latlng_0_coordinate" type="sdouble" indexed="true" stored="true" multiValued="false"/>
+   <field name="latlng_1_coordinate" type="sdouble" indexed="true" stored="true" multiValued="false"/>
+
    <field name="id" type="string" indexed="true" stored="true" required="true" />
+   <field name="type_s" type="string" indexed="true" stored="false" />
    <field name="pk_i" type="integer" indexed="true" stored="true"/>
    <field name="pk_s" type="string" indexed="true" stored="true"/>
    <field name="text" type="text" indexed="true" stored="false" multiValued="true"/>
@@ -106,9 +137,10 @@
    <dynamicField name="*_i" type="integer" indexed="true" stored="false"/>
    <dynamicField name="*_t" type="text" indexed="true" stored="true"/>
    <dynamicField name="*_f" type="float" indexed="true" stored="false" multiValued="false"/>
+   <dynamicField name="*_do" type="double" indexed="true" stored="false" multiValued="false"/>
    <dynamicField name="*_b" type="boolean" indexed="true" stored="false"/>
    <dynamicField name="*_d" type="date" indexed="true" stored="false" multiValued="false"/>
-   <dynamicField name="*_s" type="string" indexed="true" stored="false" multiValued="false"/>
+   <dynamicField name="*_s" type="string" indexed="true" stored="true" multiValued="false"/>
    <dynamicField name="*_ri" type="sint" indexed="true" stored="false"/>
    <dynamicField name="*_rf" type="sfloat" indexed="true" stored="false"/>
    <dynamicField name="*_facet" type="string" indexed="true" stored="false"/>
@@ -125,6 +157,9 @@
  <uniqueKey>id</uniqueKey>
  <defaultSearchField>text</defaultSearchField>
+ <copyField source="lat_f" dest="latlng_0_coordinate"/>
+ <copyField source="lng_f" dest="latlng_1_coordinate"/>
+
  <copyField source="*_s" dest="text"/>
  <copyField source="*_s" dest="spell"/>
  <copyField source="*_t" dest="text"/>
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<config>
-  <!-- Set this to 'false' if you want solr to continue working after it has 
-       encountered an severe configuration error.  In a production environment, 
-       you may want solr to keep working even if one handler is mis-configured.
-
-       You may also set this to false using by setting the system property:
-         -Dsolr.abortOnConfigurationError=false
-     -->
-  <abortOnConfigurationError>${solr.abortOnConfigurationError:true}</abortOnConfigurationError>
-
-  <!-- Used to specify an alternate directory to hold all index data
-       other than the default ./data under the Solr home.
-       If replication is in use, this should match the replication configuration. -->
-  <dataDir>${solr.data.dir:./solr/data}</dataDir>
-
-
-  <indexDefaults>
-   <!-- Values here affect all index writers and act as a default unless overridden. -->
-    <useCompoundFile>false</useCompoundFile>
-
-    <mergeFactor>10</mergeFactor>
-    <!--
-     If both ramBufferSizeMB and maxBufferedDocs is set, then Lucene will flush based on whichever limit is hit first.
-
-     -->
-    <!--<maxBufferedDocs>1000</maxBufferedDocs>-->
-    <!-- Tell Lucene when to flush documents to disk.
-    Giving Lucene more memory for indexing means faster indexing at the cost of more RAM
-
-    If both ramBufferSizeMB and maxBufferedDocs is set, then Lucene will flush based on whichever limit is hit first.
-
-    -->
-    <ramBufferSizeMB>32</ramBufferSizeMB>
-    <maxMergeDocs>2147483647</maxMergeDocs>
-    <maxFieldLength>10000</maxFieldLength>
-    <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
-
-    <!--
-     Expert: Turn on Lucene's auto commit capability.
-     This causes intermediate segment flushes to write a new lucene
-     index descriptor, enabling it to be opened by an external
-     IndexReader.
-     NOTE: Despite the name, this value does not have any relation to Solr's autoCommit functionality
-     -->
-    <!--<luceneAutoCommit>false</luceneAutoCommit>-->
-    <!--
-     Expert:
-     The Merge Policy in Lucene controls how merging is handled by Lucene.  The default in 2.3 is the LogByteSizeMergePolicy, previous
-     versions used LogDocMergePolicy.
-
-     LogByteSizeMergePolicy chooses segments to merge based on their size.  The Lucene 2.2 default, LogDocMergePolicy chose when
-     to merge based on number of documents
-
-     Other implementations of MergePolicy must have a no-argument constructor
-     -->
-    <!--<mergePolicy>org.apache.lucene.index.LogByteSizeMergePolicy</mergePolicy>-->
-
-    <!--
-     Expert:
-     The Merge Scheduler in Lucene controls how merges are performed.  The ConcurrentMergeScheduler (Lucene 2.3 default)
-      can perform merges in the background using separate threads.  The SerialMergeScheduler (Lucene 2.2 default) does not.
-     -->
-    <!--<mergeScheduler>org.apache.lucene.index.ConcurrentMergeScheduler</mergeScheduler>-->
-
-    <!--
-      This option specifies which Lucene LockFactory implementation to use.
-      
-      single = SingleInstanceLockFactory - suggested for a read-only index
-               or when there is no possibility of another process trying
-               to modify the index.
-      native = NativeFSLockFactory
-      simple = SimpleFSLockFactory
-
-      (For backwards compatibility with Solr 1.2, 'simple' is the default
-       if not specified.)
-    -->
-    <lockType>single</lockType>
-  </indexDefaults>
-
-  <mainIndex>
-    <!-- options specific to the main on-disk lucene index -->
-    <useCompoundFile>false</useCompoundFile>
-    <ramBufferSizeMB>32</ramBufferSizeMB>
-    <mergeFactor>10</mergeFactor>
-    <!-- Deprecated -->
-    <!--<maxBufferedDocs>1000</maxBufferedDocs>-->
-    <maxMergeDocs>2147483647</maxMergeDocs>
-    <maxFieldLength>10000</maxFieldLength>
-
-    <!-- If true, unlock any held write or commit locks on startup. 
-         This defeats the locking mechanism that allows multiple
-         processes to safely access a lucene index, and should be
-         used with care.
-         This is not needed if lock type is 'none' or 'single'
-     -->
-    <unlockOnStartup>false</unlockOnStartup>
-    
-    <!-- If true, IndexReaders will be reopened (often more efficient) instead
-         of closed and then opened.
-    -->
-    <reopenReaders>true</reopenReaders>
-	  
-    <!--
-        Custom deletion policies can specified here. The class must
-        implement org.apache.lucene.index.IndexDeletionPolicy.
-
-        http://lucene.apache.org/java/2_3_2/api/org/apache/lucene/index/IndexDeletionPolicy.html
-
-        The standard Solr IndexDeletionPolicy implementation supports deleting
-        index commit points on number of commits, age of commit point and
-        optimized status.
-
-        The latest commit point should always be preserved regardless
-        of the criteria.
-    -->
-    <deletionPolicy class="solr.SolrDeletionPolicy">
-      <!-- Keep only optimized commit points -->
-      <str name="keepOptimizedOnly">false</str>
-      <!-- The maximum number of commit points to be kept -->
-      <str name="maxCommitsToKeep">1</str>
-      <!--
-          Delete all commit points once they have reached the given age.
-          Supports DateMathParser syntax e.g.
-          
-          <str name="maxCommitAge">30MINUTES</str>
-          <str name="maxCommitAge">1DAY</str>
-      -->
-    </deletionPolicy>
-
-  </mainIndex>
-
-  <!--	Enables JMX if and only if an existing MBeanServer is found, use 
-  		this if you want to configure JMX through JVM parameters. Remove
-  		this to disable exposing Solr configuration and statistics to JMX.
-
-		If you want to connect to a particular server, specify the agentId
-		e.g. <jmx agentId="myAgent" />
-
-		If you want to start a new MBeanServer, specify the serviceUrl
-		e.g <jmx serviceUrl="service:jmx:rmi:///jndi/rmi://localhost:9999/solr" />
-
-		For more details see http://wiki.apache.org/solr/SolrJmx
-  -->
-  <jmx />
-
-  <!-- the default high-performance update handler -->
-  <updateHandler class="solr.DirectUpdateHandler2">
-
-    <!-- A prefix of "solr." for class names is an alias that
-         causes solr to search appropriate packages, including
-         org.apache.solr.(search|update|request|core|analysis)
-     -->
-
-    <!-- Perform a <commit/> automatically under certain conditions:
-         maxDocs - number of updates since last commit is greater than this
-         maxTime - oldest uncommited update (in ms) is this long ago
-    <autoCommit> 
-      <maxDocs>10000</maxDocs>
-      <maxTime>1000</maxTime> 
-    </autoCommit>
-    -->
-
-    <!-- The RunExecutableListener executes an external command.
-         exe - the name of the executable to run
-         dir - dir to use as the current working directory. default="."
-         wait - the calling thread waits until the executable returns. default="true"
-         args - the arguments to pass to the program.  default=nothing
-         env - environment variables to set.  default=nothing
-      -->
-    <!-- A postCommit event is fired after every commit or optimize command
-    <listener event="postCommit" class="solr.RunExecutableListener">
-      <str name="exe">solr/bin/snapshooter</str>
-      <str name="dir">.</str>
-      <bool name="wait">true</bool>
-      <arr name="args"> <str>arg1</str> <str>arg2</str> </arr>
-      <arr name="env"> <str>MYVAR=val1</str> </arr>
-    </listener>
-    -->
-    <!-- A postOptimize event is fired only after every optimize command, useful
-         in conjunction with index distribution to only distribute optimized indicies 
-    <listener event="postOptimize" class="solr.RunExecutableListener">
-      <str name="exe">snapshooter</str>
-      <str name="dir">solr/bin</str>
-      <bool name="wait">true</bool>
-    </listener>
-    -->
-
-  </updateHandler>
-  
-  <!-- Use the following format to specify a custom IndexReaderFactory - allows for alternate
-       IndexReader implementations.
-  <indexReaderFactory name="IndexReaderFactory" class="package.class">
-    Parameters as required by the implementation
-  </indexReaderFactory >
-  -->
-
-  <updateRequestProcessorChain>
-   <processor class="solr.RunUpdateProcessorFactory" />    
-   <processor class="solr.LogUpdateProcessorFactory" /> 
-  </updateRequestProcessorChain>
-
-
-
-  <query>
-    <!-- Maximum number of clauses in a boolean query... can affect
-        range or prefix queries that expand to big boolean
-        queries.  An exception is thrown if exceeded.  -->
-    <maxBooleanClauses>1024</maxBooleanClauses>
-
-
-    <!-- There are two implementations of cache available for Solr,
-         LRUCache, based on a synchronized LinkedHashMap, and
-         FastLRUCache, based on a ConcurrentHashMap.  FastLRUCache has faster gets
-         and slower puts in single threaded operation and thus is generally faster
-         than LRUCache when the hit ratio of the cache is high (> 75%), and may be
-         faster under other scenarios on multi-cpu systems. -->
-    <!-- Cache used by SolrIndexSearcher for filters (DocSets),
-         unordered sets of *all* documents that match a query.
-         When a new searcher is opened, its caches may be prepopulated
-         or "autowarmed" using data from caches in the old searcher.
-         autowarmCount is the number of items to prepopulate.  For LRUCache,
-         the autowarmed items will be the most recently accessed items.
-       Parameters:
-         class - the SolrCache implementation LRUCache or FastLRUCache
-         size - the maximum number of entries in the cache
-         initialSize - the initial capacity (number of entries) of
-           the cache.  (seel java.util.HashMap)
-         autowarmCount - the number of entries to prepopulate from
-           and old cache.
-         -->
-    <filterCache
-      class="solr.FastLRUCache"
-      size="512"
-      initialSize="512"
-      autowarmCount="128"/>
-
-    <!-- Cache used to hold field values that are quickly accessible
-         by document id.  The fieldValueCache is created by default
-         even if not configured here.
-      <fieldValueCache
-        class="solr.FastLRUCache"
-        size="512"
-        autowarmCount="128"
-        showItems="32"
-      />
-    -->
-
-   <!-- queryResultCache caches results of searches - ordered lists of
-         document ids (DocList) based on a query, a sort, and the range
-         of documents requested.  -->
-    <queryResultCache
-      class="solr.LRUCache"
-      size="512"
-      initialSize="512"
-      autowarmCount="32"/>
-
-  <!-- documentCache caches Lucene Document objects (the stored fields for each document).
-       Since Lucene internal document ids are transient, this cache will not be autowarmed.  -->
-    <documentCache
-      class="solr.LRUCache"
-      size="512"
-      initialSize="512"
-      autowarmCount="0"/>
-
-    <!-- If true, stored fields that are not requested will be loaded lazily.
-
-    This can result in a significant speed improvement if the usual case is to
-    not load all stored fields, especially if the skipped fields are large compressed
-    text fields.
-    -->
-    <enableLazyFieldLoading>true</enableLazyFieldLoading>
-
-    <!-- Example of a generic cache.  These caches may be accessed by name
-         through SolrIndexSearcher.getCache(),cacheLookup(), and cacheInsert().
-         The purpose is to enable easy caching of user/application level data.
-         The regenerator argument should be specified as an implementation
-         of solr.search.CacheRegenerator if autowarming is desired.  -->
-    <!--
-    <cache name="myUserCache"
-      class="solr.LRUCache"
-      size="4096"
-      initialSize="1024"
-      autowarmCount="1024"
-      regenerator="org.mycompany.mypackage.MyRegenerator"
-      />
-    -->
-
-   <!-- An optimization that attempts to use a filter to satisfy a search.
-         If the requested sort does not include score, then the filterCache
-         will be checked for a filter matching the query. If found, the filter
-         will be used as the source of document ids, and then the sort will be
-         applied to that.
-    <useFilterForSortedQuery>true</useFilterForSortedQuery>
-   -->
-
-   <!-- An optimization for use with the queryResultCache.  When a search
-         is requested, a superset of the requested number of document ids
-         are collected.  For example, if a search for a particular query
-         requests matching documents 10 through 19, and queryWindowSize is 50,
-         then documents 0 through 49 will be collected and cached.  Any further
-         requests in that range can be satisfied via the cache.  -->
-    <queryResultWindowSize>50</queryResultWindowSize>
-
-    <!-- Maximum number of documents to cache for any entry in the
-         queryResultCache. -->
-    <queryResultMaxDocsCached>200</queryResultMaxDocsCached>
-
-    <!-- a newSearcher event is fired whenever a new searcher is being prepared
-         and there is a current searcher handling requests (aka registered). -->
-    <!-- QuerySenderListener takes an array of NamedList and executes a
-         local query request for each NamedList in sequence. -->
-    <listener event="newSearcher" class="solr.QuerySenderListener">
-      <arr name="queries">
-        <lst> <str name="q">solr</str> <str name="start">0</str> <str name="rows">10</str> </lst>
-        <lst> <str name="q">rocks</str> <str name="start">0</str> <str name="rows">10</str> </lst>
-        <lst><str name="q">static newSearcher warming query from solrconfig.xml</str></lst>
-      </arr>
-    </listener>
-
-    <!-- a firstSearcher event is fired whenever a new searcher is being
-         prepared but there is no current registered searcher to handle
-         requests or to gain autowarming data from. -->
-    <listener event="firstSearcher" class="solr.QuerySenderListener">
-      <arr name="queries">
-        <lst> <str name="q">fast_warm</str> <str name="start">0</str> <str name="rows">10</str> </lst>
-        <lst><str name="q">static firstSearcher warming query from solrconfig.xml</str></lst>
-      </arr>
-    </listener>
-
-    <!-- If a search request comes in and there is no current registered searcher,
-         then immediately register the still warming searcher and use it.  If
-         "false" then all requests will block until the first searcher is done
-         warming. -->
-    <useColdSearcher>false</useColdSearcher>
-
-    <!-- Maximum number of searchers that may be warming in the background
-      concurrently.  An error is returned if this limit is exceeded. Recommend
-      1-2 for read-only slaves, higher for masters w/o cache warming. -->
-    <maxWarmingSearchers>2</maxWarmingSearchers>
-
-  </query>
-
-  <!-- 
-    Let the dispatch filter handler /select?qt=XXX
-    handleSelect=true will use consistent error handling for /select and /update
-    handleSelect=false will use solr1.1 style error formatting
-    -->
-  <requestDispatcher handleSelect="true" >
-    <!--Make sure your system has some authentication before enabling remote streaming!  -->
-    <requestParsers enableRemoteStreaming="true" multipartUploadLimitInKB="2048000" />
-
-    <!-- Set HTTP caching related parameters (for proxy caches and clients).
-          
-         To get the behaviour of Solr 1.2 (ie: no caching related headers)
-         use the never304="true" option and do not specify a value for
-         <cacheControl>
-    -->
-    <!-- <httpCaching never304="true"> -->
-    <httpCaching lastModifiedFrom="openTime"
-                 etagSeed="Solr">
-       <!-- lastModFrom="openTime" is the default, the Last-Modified value
-            (and validation against If-Modified-Since requests) will all be
-            relative to when the current Searcher was opened.
-            You can change it to lastModFrom="dirLastMod" if you want the
-            value to exactly corrispond to when the physical index was last
-            modified.
-
-            etagSeed="..." is an option you can change to force the ETag
-            header (and validation against If-None-Match requests) to be
-            differnet even if the index has not changed (ie: when making
-            significant changes to your config file)
-
-            lastModifiedFrom and etagSeed are both ignored if you use the
-            never304="true" option.
-       -->
-       <!-- If you include a <cacheControl> directive, it will be used to
-            generate a Cache-Control header, as well as an Expires header
-            if the value contains "max-age="
-
-            By default, no Cache-Control header is generated.
-
-            You can use the <cacheControl> option even if you have set
-            never304="true"
-       -->
-       <!-- <cacheControl>max-age=30, public</cacheControl> -->
-    </httpCaching>
-  </requestDispatcher>
-
-
-  <!-- requestHandler plugins... incoming queries will be dispatched to the
-     correct handler based on the path or the qt (query type) param.
-     Names starting with a '/' are accessed with the a path equal to the 
-     registered name.  Names without a leading '/' are accessed with:
-      http://host/app/select?qt=name
-     If no qt is defined, the requestHandler that declares default="true"
-     will be used.
-  -->
-  <requestHandler name="standard" class="solr.SearchHandler" default="true">
-    <!-- default values for query parameters -->
-     <lst name="defaults">
-       <str name="echoParams">explicit</str>
-       <str name="json.nl">map</str>
-       <!--
-       <int name="rows">10</int>
-       <str name="fl">*</str>
-       <str name="version">2.1</str>
-        -->
-     </lst>
-     
-     <arr name="last-components">
-       <str>spellcheck</str>
-     </arr>
-  </requestHandler>
-
-<!-- Please refer to http://wiki.apache.org/solr/SolrReplication for details on configuring replication -->
-<!--Master config-->
-<!--
-<requestHandler name="/replication" class="solr.ReplicationHandler" >
-    <lst name="master">
-        <str name="replicateAfter">commit</str>
-         <str name="confFiles">schema.xml,stopwords.txt</str>
-    </lst>
-</requestHandler>
--->
-<!-- Slave config-->
-<!--
-<requestHandler name="/replication" class="solr.ReplicationHandler">
-    <lst name="slave">
-        <str name="masterUrl">http://localhost:8983/solr/replication</str>
-        <str name="pollInterval">00:00:60</str>  
-     </lst>
-</requestHandler>
--->
-
-  <!-- DisMaxRequestHandler allows easy searching across multiple fields
-       for simple user-entered phrases.  It's implementation is now
-       just the standard SearchHandler with a default query type
-       of "dismax". 
-       see http://wiki.apache.org/solr/DisMaxRequestHandler
-   -->
-  <requestHandler name="dismax" class="solr.SearchHandler" >
-    <lst name="defaults">
-     <str name="defType">dismax</str>
-     <str name="echoParams">explicit</str>
-     <float name="tie">0.01</float>
-     <str name="qf">
-        text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4
-     </str>
-     <str name="pf">
-        text^0.2 features^1.1 name^1.5 manu^1.4 manu_exact^1.9
-     </str>
-     <str name="bf">
-        ord(popularity)^0.5 recip(rord(price),1,1000,1000)^0.3
-     </str>
-     <str name="fl">
-        id,name,price,score
-     </str>
-     <str name="mm">
-        2&lt;-1 5&lt;-2 6&lt;90%
-     </str>
-     <int name="ps">100</int>
-     <str name="q.alt">*:*</str>
-     <!-- example highlighter config, enable per-query with hl=true -->
-     <str name="hl.fl">text features name</str>
-     <!-- for this field, we want no fragmenting, just highlighting -->
-     <str name="f.name.hl.fragsize">0</str>
-     <!-- instructs Solr to return the field itself if no query terms are
-          found -->
-     <str name="f.name.hl.alternateField">name</str>
-     <str name="f.text.hl.fragmenter">regex</str> <!-- defined below -->
-    </lst>
-  </requestHandler>
-
-  <!-- Note how you can register the same handler multiple times with
-       different names (and different init parameters)
-    -->
-  <requestHandler name="partitioned" class="solr.SearchHandler" >
-    <lst name="defaults">
-     <str name="defType">dismax</str>
-     <str name="echoParams">explicit</str>
-     <str name="qf">text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0</str>
-     <str name="mm">2&lt;-1 5&lt;-2 6&lt;90%</str>
-     <!-- This is an example of using Date Math to specify a constantly
-          moving date range in a config...
-       -->
-     <str name="bq">incubationdate_dt:[* TO NOW/DAY-1MONTH]^2.2</str>
-    </lst>
-    <!-- In addition to defaults, "appends" params can be specified
-         to identify values which should be appended to the list of
-         multi-val params from the query (or the existing "defaults").
-
-         In this example, the param "fq=instock:true" will be appended to
-         any query time fq params the user may specify, as a mechanism for
-         partitioning the index, independent of any user selected filtering
-         that may also be desired (perhaps as a result of faceted searching).
-
-         NOTE: there is *absolutely* nothing a client can do to prevent these
-         "appends" values from being used, so don't use this mechanism
-         unless you are sure you always want it.
-      -->
-    <lst name="appends">
-      <str name="fq">inStock:true</str>
-    </lst>
-    <!-- "invariants" are a way of letting the Solr maintainer lock down
-         the options available to Solr clients.  Any params values
-         specified here are used regardless of what values may be specified
-         in either the query, the "defaults", or the "appends" params.
-
-         In this example, the facet.field and facet.query params are fixed,
-         limiting the facets clients can use.  Faceting is not turned on by
-         default - but if the client does specify facet=true in the request,
-         these are the only facets they will be able to see counts for;
-         regardless of what other facet.field or facet.query params they
-         may specify.
-
-         NOTE: there is *absolutely* nothing a client can do to prevent these
-         "invariants" values from being used, so don't use this mechanism
-         unless you are sure you always want it.
-      -->
-    <lst name="invariants">
-      <str name="facet.field">cat</str>
-      <str name="facet.field">manu_exact</str>
-      <str name="facet.query">price:[* TO 500]</str>
-      <str name="facet.query">price:[500 TO *]</str>
-    </lst>
-  </requestHandler>
-
-
-  <!--
-   Search components are registered to SolrCore and used by Search Handlers
-   
-   By default, the following components are avaliable:
-    
-   <searchComponent name="query"     class="org.apache.solr.handler.component.QueryComponent" />
-   <searchComponent name="facet"     class="org.apache.solr.handler.component.FacetComponent" />
-   <searchComponent name="mlt"       class="org.apache.solr.handler.component.MoreLikeThisComponent" />
-   <searchComponent name="highlight" class="org.apache.solr.handler.component.HighlightComponent" />
-   <searchComponent name="stats"     class="org.apache.solr.handler.component.StatsComponent" />
-   <searchComponent name="debug"     class="org.apache.solr.handler.component.DebugComponent" />
-   
-   Default configuration in a requestHandler would look like:
-    <arr name="components">
-      <str>query</str>
-      <str>facet</str>
-      <str>mlt</str>
-      <str>highlight</str>
-      <str>stats</str>
-      <str>debug</str>
-    </arr>
-
-    If you register a searchComponent to one of the standard names, that will be used instead.
-    To insert components before or after the 'standard' components, use:
-    
-    <arr name="first-components">
-      <str>myFirstComponentName</str>
-    </arr>
-    
-    <arr name="last-components">
-      <str>myLastComponentName</str>
-    </arr>
-  -->
-
-   <!-- The spell check component can return a list of alternative spelling
-  suggestions.  -->
-  <searchComponent name="spellcheck" class="solr.SpellCheckComponent">
-
-    <str name="queryAnalyzerFieldType">textSpell</str>
-
-    <lst name="spellchecker">
-      <str name="name">default</str>
-      <str name="field">spell</str>
-      <str name="spellcheckIndexDir">./spellchecker1</str>
-      <str name="buildOnCommit">true</str>
-      <str name="buildOnOptimize">true</str>
-    </lst>
-    
-    <lst name="spellchecker">
-      <str name="name">jarowinkler</str>
-      <str name="field">spell</str>
-      <str name="distanceMeasure">org.apache.lucene.search.spell.JaroWinklerDistance</str>
-      <str name="spellcheckIndexDir">./spellchecker2</str>
-    </lst>
-
-    <lst name="spellchecker">
-      <str name="classname">solr.FileBasedSpellChecker</str>
-      <str name="name">file</str>
-      <str name="sourceLocation">spellings.txt</str>
-      <str name="characterEncoding">UTF-8</str>
-      <str name="spellcheckIndexDir">./spellcheckerFile</str>
-    </lst>
-  </searchComponent>
-
-  <!-- A request handler utilizing the spellcheck component.  
-  ################################################################################################
-  NOTE: This is purely as an example.  The whole purpose of the SpellCheckComponent is to hook it into
-  the request handler that handles (i.e. the standard or dismax SearchHandler)
-  queries such that a separate request is not needed to get suggestions.
-
-  IN OTHER WORDS, THERE IS REALLY GOOD CHANCE THE SETUP BELOW IS NOT WHAT YOU WANT FOR YOUR PRODUCTION SYSTEM!
-  ################################################################################################
-  -->
-  <requestHandler name="/spellCheckCompRH" class="solr.SearchHandler">
-    <lst name="defaults">
-      <!-- omp = Only More Popular -->
-      <str name="spellcheck.onlyMorePopular">false</str>
-      <!-- exr = Extended Results -->
-      <str name="spellcheck.extendedResults">false</str>
-      <!--  The number of suggestions to return -->
-      <str name="spellcheck.count">1</str>
-    </lst>
-    <arr name="last-components">
-      <str>spellcheck</str>
-    </arr>
-  </requestHandler>
-
-  <searchComponent name="tvComponent" class="org.apache.solr.handler.component.TermVectorComponent"/>
-  <!-- A Req Handler for working with the tvComponent.  This is purely as an example.
-  You will likely want to add the component to your already specified request handlers. -->
-  <requestHandler name="tvrh" class="org.apache.solr.handler.component.SearchHandler">
-    <lst name="defaults">
-      <bool name="tv">true</bool>
-    </lst>
-    <arr name="last-components">
-      <str>tvComponent</str>
-    </arr>
-  </requestHandler>
-
-<!--
-  <requestHandler name="/update/extract" class="org.apache.solr.handler.extraction.ExtractingRequestHandler">
-    <lst name="defaults">
-      <str name="ext.map.Last-Modified">last_modified</str>
-      <bool name="ext.ignore.und.fl">true</bool>
-    </lst>
-  </requestHandler>
--->
-
-
-  <!-- A component to return terms and document frequency of those terms.
-       This component does not yet support distributed search. -->
-  <searchComponent name="termsComponent" class="org.apache.solr.handler.component.TermsComponent"/>
-
-  <requestHandler name="/terms" class="org.apache.solr.handler.component.SearchHandler">
-     <lst name="defaults">
-      <bool name="terms">true</bool>
-    </lst>     
-    <arr name="components">
-      <str>termsComponent</str>
-    </arr>
-  </requestHandler>
-
-
-  <!-- a search component that enables you to configure the top results for
-       a given query regardless of the normal lucene scoring.-->
-  <searchComponent name="elevator" class="solr.QueryElevationComponent" >
-    <!-- pick a fieldType to analyze queries -->
-    <str name="queryFieldType">string</str>
-    <str name="config-file">elevate.xml</str>
-  </searchComponent>
-
-  <!-- a request handler utilizing the elevator component -->
-  <requestHandler name="/elevate" class="solr.SearchHandler" startup="lazy">
-    <lst name="defaults">
-      <str name="echoParams">explicit</str>
-    </lst>
-    <arr name="last-components">
-      <str>elevator</str>
-    </arr>
-  </requestHandler>
-
-
-  <!-- Update request handler.  
-
-       Note: Since solr1.1 requestHandlers requires a valid content type header if posted in
-       the body. For example, curl now requires: -H 'Content-type:text/xml; charset=utf-8'
-       The response format differs from solr1.1 formatting and returns a standard error code.
-
-       To enable solr1.1 behavior, remove the /update handler or change its path
-    -->
-  <requestHandler name="/update" class="solr.XmlUpdateRequestHandler" />
-
-
-  <requestHandler name="/update/javabin" class="solr.BinaryUpdateRequestHandler" />
-
-  <!--
-   Analysis request handler.  Since Solr 1.3.  Use to return how a document is analyzed.  Useful
-   for debugging and as a token server for other types of applications.
-
-   This is deprecated in favor of the improved DocumentAnalysisRequestHandler and FieldAnalysisRequestHandler
-
-   <requestHandler name="/analysis" class="solr.AnalysisRequestHandler" />
-   -->
-
-  <!--
-    An analysis handler that provides a breakdown of the analysis process of provided docuemnts. This handler expects a
-    (single) content stream with the following format:
-
-    <docs>
-      <doc>
-        <field name="id">1</field>
-        <field name="name">The Name</field>
-        <field name="text">The Text Value</field>
-      <doc>
-      <doc>...</doc>
-      <doc>...</doc>
-      ...
-    </docs>
-
-    Note: Each document must contain a field which serves as the unique key. This key is used in the returned
-    response to assoicate an analysis breakdown to the analyzed document.
-
-    Like the FieldAnalysisRequestHandler, this handler also supports query analysis by
-    sending either an "analysis.query" or "q" request paraemter that holds the query text to be analyized. It also
-    supports the "analysis.showmatch" parameter which when set to true, all field tokens that match the query
-    tokens will be marked as a "match".
-  -->
-  <requestHandler name="/analysis/document" class="solr.DocumentAnalysisRequestHandler" />
-
-  <!--
-    RequestHandler that provides much the same functionality as analysis.jsp. Provides the ability
-    to specify multiple field types and field names in the same request and outputs index-time and
-    query-time analysis for each of them.
-
-    Request parameters are:
-    analysis.fieldname - The field name whose analyzers are to be used
-    analysis.fieldtype - The field type whose analyzers are to be used
-    analysis.fieldvalue - The text for index-time analysis
-    q (or analysis.q) - The text for query time analysis
-    analysis.showmatch (true|false) - When set to true and when query analysis is performed, the produced
-                                      tokens of the field value analysis will be marked as "matched" for every
-                                      token that is produces by the query analysis
-   -->
-  <requestHandler name="/analysis/field" class="solr.FieldAnalysisRequestHandler" />
-
-
-  <!-- CSV update handler, loaded on demand -->
-  <requestHandler name="/update/csv" class="solr.CSVRequestHandler" startup="lazy" />
-
-
-  <!-- 
-   Admin Handlers - This will register all the standard admin RequestHandlers.  Adding 
-   this single handler is equivalent to registering:
-   
-  <requestHandler name="/admin/luke"       class="org.apache.solr.handler.admin.LukeRequestHandler" />
-  <requestHandler name="/admin/system"     class="org.apache.solr.handler.admin.SystemInfoHandler" />
-  <requestHandler name="/admin/plugins"    class="org.apache.solr.handler.admin.PluginInfoHandler" />
-  <requestHandler name="/admin/threads"    class="org.apache.solr.handler.admin.ThreadDumpHandler" />
-  <requestHandler name="/admin/properties" class="org.apache.solr.handler.admin.PropertiesRequestHandler" />
-  <requestHandler name="/admin/file"       class="org.apache.solr.handler.admin.ShowFileRequestHandler" >
-  
-  If you wish to hide files under ${solr.home}/conf, explicitly register the ShowFileRequestHandler using:
-  <requestHandler name="/admin/file" class="org.apache.solr.handler.admin.ShowFileRequestHandler" >
-    <lst name="invariants">
-     <str name="hidden">synonyms.txt</str> 
-     <str name="hidden">anotherfile.txt</str> 
-    </lst>
-  </requestHandler>
-  -->
-  <requestHandler name="/admin/" class="org.apache.solr.handler.admin.AdminHandlers" />
-
-  <!-- ping/healthcheck -->
-  <requestHandler name="/admin/ping" class="PingRequestHandler">
-    <lst name="defaults">
-      <str name="qt">standard</str>
-      <str name="q">solrpingquery</str>
-      <str name="echoParams">all</str>
-    </lst>
-  </requestHandler>
-
-  <!-- Echo the request contents back to the client -->
-  <requestHandler name="/debug/dump" class="solr.DumpRequestHandler" >
-    <lst name="defaults">
-     <str name="echoParams">explicit</str> <!-- for all params (including the default etc) use: 'all' -->
-     <str name="echoHandler">true</str>
-    </lst>
-  </requestHandler>
-
-  <highlighting>
-   <!-- Configure the standard fragmenter -->
-   <!-- This could most likely be commented out in the "default" case -->
-   <fragmenter name="gap" class="org.apache.solr.highlight.GapFragmenter" default="true">
-    <lst name="defaults">
-     <int name="hl.fragsize">100</int>
-    </lst>
-   </fragmenter>
-
-   <!-- A regular-expression-based fragmenter (f.i., for sentence extraction) -->
-   <fragmenter name="regex" class="org.apache.solr.highlight.RegexFragmenter">
-    <lst name="defaults">
-      <!-- slightly smaller fragsizes work better because of slop -->
-      <int name="hl.fragsize">70</int>
-      <!-- allow 50% slop on fragment sizes -->
-      <float name="hl.regex.slop">0.5</float>
-      <!-- a basic sentence pattern -->
-      <str name="hl.regex.pattern">[-\w ,/\n\"']{20,200}</str>
-    </lst>
-   </fragmenter>
-
-   <!-- Configure the standard formatter -->
-   <formatter name="html" class="org.apache.solr.highlight.HtmlFormatter" default="true">
-    <lst name="defaults">
-     <str name="hl.simple.pre"><![CDATA[<em>]]></str>
-     <str name="hl.simple.post"><![CDATA[</em>]]></str>
-    </lst>
-   </formatter>
-  </highlighting>
-
-  <!-- An example dedup update processor that creates the "id" field on the fly
-       based on the hash code of some other fields.  This example has overwriteDupes
-       set to false since we are using the id field as the signatureField and Solr
-       will maintain uniqueness based on that anyway. -->
-  <!--
-  <updateRequestProcessorChain name="dedupe">
-    <processor class="org.apache.solr.update.processor.SignatureUpdateProcessorFactory">
-      <bool name="enabled">true</bool>
-      <str name="signatureField">id</str>
-      <bool name="overwriteDupes">false</bool>
-      <str name="fields">name,features,cat</str>
-      <str name="signatureClass">org.apache.solr.update.processor.Lookup3Signature</str>
-    </processor>
-    <processor class="solr.LogUpdateProcessorFactory" />
-    <processor class="solr.RunUpdateProcessorFactory" />
-  </updateRequestProcessorChain>
-  -->
-
-
-  <!-- queryResponseWriter plugins... query responses will be written using the
-    writer specified by the 'wt' request parameter matching the name of a registered
-    writer.
-    The "default" writer is the default and will be used if 'wt' is not specified 
-    in the request. XMLResponseWriter will be used if nothing is specified here.
-    The json, python, and ruby writers are also available by default.
-
-    <queryResponseWriter name="xml" class="org.apache.solr.request.XMLResponseWriter" default="true"/>
-    <queryResponseWriter name="json" class="org.apache.solr.request.JSONResponseWriter"/>
-    <queryResponseWriter name="python" class="org.apache.solr.request.PythonResponseWriter"/>
-    <queryResponseWriter name="ruby" class="org.apache.solr.request.RubyResponseWriter"/>
-    <queryResponseWriter name="php" class="org.apache.solr.request.PHPResponseWriter"/>
-    <queryResponseWriter name="phps" class="org.apache.solr.request.PHPSerializedResponseWriter"/>
-
-    <queryResponseWriter name="custom" class="com.example.MyResponseWriter"/>
-  -->
-
-  <requestHandler name="geo" class="org.apache.solr.handler.component.SearchHandler">
-      <arr name="components">
-        <str>mlt</str>
-        <str>highlight</str>
-        <str>debug</str>
-      </arr>
-  </requestHandler>
-
-
-
-  <!-- XSLT response writer transforms the XML output by any xslt file found
-       in Solr's conf/xslt directory.  Changes to xslt files are checked for
-       every xsltCacheLifetimeSeconds.  
-   -->
-  <queryResponseWriter name="xslt" class="org.apache.solr.request.XSLTResponseWriter">
-    <int name="xsltCacheLifetimeSeconds">5</int>
-  </queryResponseWriter>
-
-
-  <!-- example of registering a query parser
-  <queryParser name="lucene" class="org.apache.solr.search.LuceneQParserPlugin"/>
-  -->
-
-  <!-- example of registering a custom function parser 
-  <valueSourceParser name="myfunc" class="com.mycompany.MyValueSourceParser" />
-  -->
-
-  <!-- config for the admin interface -->
-  <admin>
-    <defaultQuery>solr</defaultQuery>
-
-    <!-- configure a healthcheck file for servers behind a loadbalancer
-    <healthcheck type="file">server-enabled</healthcheck>
-    -->
-  </admin>
-
-</config>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- 
+     For more details about configurations options that may appear in
+     this file, see http://wiki.apache.org/solr/SolrConfigXml. 
+-->
+<config>
+  <!-- In all configuration below, a prefix of "solr." for class names
+       is an alias that causes solr to search appropriate packages,
+       including org.apache.solr.(search|update|request|core|analysis)
+
+       You may also specify a fully qualified Java classname if you
+       have your own custom plugins.
+    -->
+
+  <!-- Set this to 'false' if you want solr to continue working after
+       it has encountered an severe configuration error.  In a
+       production environment, you may want solr to keep working even
+       if one handler is mis-configured.
+
+       You may also set this to false using by setting the system
+       property:
+
+         -Dsolr.abortOnConfigurationError=false
+    -->
+  <abortOnConfigurationError>${solr.abortOnConfigurationError:true}</abortOnConfigurationError>
+  
+  <!-- Controls what version of Lucene various components of Solr
+       adhere to.  Generally, you want to use the latest version to
+       get all bug fixes and improvements. It is highly recommended
+       that you fully re-index after changing this setting as it can
+       affect both how text is indexed and queried.
+    -->
+  <luceneMatchVersion>LUCENE_35</luceneMatchVersion>
+
+  <!-- lib directives can be used to instruct Solr to load an Jars
+       identified and use them to resolve any "plugins" specified in
+       your solrconfig.xml or schema.xml (ie: Analyzers, Request
+       Handlers, etc...).
+
+       All directories and paths are resolved relative to the
+       instanceDir.
+
+       If a "./lib" directory exists in your instanceDir, all files
+       found in it are included as if you had used the following
+       syntax...
+       
+              <lib dir="./lib" />
+    -->
+
+  <!-- A dir option by itself adds any files found in the directory to
+       the classpath, this is useful for including all jars in a
+       directory.
+    -->
+  <lib dir="../../contrib/extraction/lib" />
+  <lib dir="../../contrib/clustering/lib/" />
+  <lib dir="../../contrib/velocity/lib" />
+
+  <!-- When a regex is specified in addition to a directory, only the
+       files in that directory which completely match the regex
+       (anchored on both ends) will be included.
+    -->
+  <lib dir="../../dist/" regex="apache-solr-cell-\d.*\.jar" />
+  <lib dir="../../dist/" regex="apache-solr-clustering-\d.*\.jar" />
+  <lib dir="../../dist/" regex="apache-solr-dataimporthandler-\d.*\.jar" />
+  <lib dir="../../dist/" regex="apache-solr-langid-\d.*\.jar" />
+  <lib dir="../../dist/" regex="apache-solr-velocity-\d.*\.jar" />
+
+  <!-- If a dir option (with or without a regex) is used and nothing
+       is found that matches, it will be ignored
+    -->
+  <lib dir="../../contrib/clustering/lib/" />
+  <lib dir="/total/crap/dir/ignored" />
+
+  <!-- an exact path can be used to specify a specific file.  This
+       will cause a serious error to be logged if it can't be loaded.
+    -->
+  <!--
+  <lib path="../a-jar-that-does-not-exist.jar" /> 
+  -->
+  
+  <!-- Data Directory
+
+       Used to specify an alternate directory to hold all index data
+       other than the default ./data under the Solr home.  If
+       replication is in use, this should match the replication
+       configuration.
+    -->
+  <dataDir>${solr.data.dir:}</dataDir>
+
+
+  <!-- The DirectoryFactory to use for indexes.
+       
+       solr.StandardDirectoryFactory, the default, is filesystem
+       based and tries to pick the best implementation for the current
+       JVM and platform.  One can force a particular implementation
+       via solr.MMapDirectoryFactory, solr.NIOFSDirectoryFactory, or
+       solr.SimpleFSDirectoryFactory.
+
+       solr.RAMDirectoryFactory is memory based, not
+       persistent, and doesn't work with replication.
+    -->
+  <directoryFactory name="DirectoryFactory" 
+                    class="${solr.directoryFactory:solr.StandardDirectoryFactory}"/>
+
+
+  <!-- Index Defaults
+
+       Values here affect all index writers and act as a default
+       unless overridden.
+
+       WARNING: See also the <mainIndex> section below for parameters
+       that overfor Solr's main Lucene index.
+    -->
+  <indexDefaults>
+
+    <useCompoundFile>false</useCompoundFile>
+
+    <mergeFactor>10</mergeFactor>
+    <!-- Sets the amount of RAM that may be used by Lucene indexing
+         for buffering added documents and deletions before they are
+         flushed to the Directory.  -->
+    <ramBufferSizeMB>128</ramBufferSizeMB>
+    <!-- If both ramBufferSizeMB and maxBufferedDocs is set, then
+         Lucene will flush based on whichever limit is hit first.  
+      -->
+    <maxBufferedDocs>1000</maxBufferedDocs> -->
+
+    <maxFieldLength>1001001</maxFieldLength>
+    <writeLockTimeout>1000</writeLockTimeout>
+
+    <!-- Expert: Merge Policy 
+
+         The Merge Policy in Lucene controls how merging is handled by
+         Lucene.  The default in Solr 3.3 is TieredMergePolicy.
+         
+         The default in 2.3 was the LogByteSizeMergePolicy,
+         previous versions used LogDocMergePolicy.
+         
+         LogByteSizeMergePolicy chooses segments to merge based on
+         their size.  The Lucene 2.2 default, LogDocMergePolicy chose
+         when to merge based on number of documents
+         
+         Other implementations of MergePolicy must have a no-argument
+         constructor
+      -->
+    <!--
+       <mergePolicy class="org.apache.lucene.index.TieredMergePolicy"/>
+       -->
+
+    <!-- Expert: Merge Scheduler
+
+         The Merge Scheduler in Lucene controls how merges are
+         performed.  The ConcurrentMergeScheduler (Lucene 2.3 default)
+         can perform merges in the background using separate threads.
+         The SerialMergeScheduler (Lucene 2.2 default) does not.
+     -->
+    <!-- 
+       <mergeScheduler class="org.apache.lucene.index.ConcurrentMergeScheduler"/>
+       -->
+	  
+    <!-- LockFactory 
+
+         This option specifies which Lucene LockFactory implementation
+         to use.
+      
+         single = SingleInstanceLockFactory - suggested for a
+                  read-only index or when there is no possibility of
+                  another process trying to modify the index.
+         native = NativeFSLockFactory - uses OS native file locking.
+                  Do not use when multiple solr webapps in the same
+                  JVM are attempting to share a single index.
+         simple = SimpleFSLockFactory  - uses a plain file for locking
+
+         (For backwards compatibility with Solr 1.2, 'simple' is the
+         default if not specified.)
+
+         More details on the nuances of each LockFactory...
+         http://wiki.apache.org/lucene-java/AvailableLockFactories
+    -->
+    <lockType>native</lockType>
+
+    <!-- Expert: Controls how often Lucene loads terms into memory
+         Default is 128 and is likely good for most everyone.
+      -->
+    <!-- <termIndexInterval>256</termIndexInterval> -->
+  </indexDefaults>
+
+  <!-- Main Index
+
+       Values here override the values in the <indexDefaults> section
+       for the main on disk index.
+    -->
+  <mainIndex>
+
+    <mergeFactor>10</mergeFactor>
+    <!-- Sets the amount of RAM that may be used by Lucene indexing
+         for buffering added documents and deletions before they are
+         flushed to the Directory.  -->
+    <ramBufferSizeMB>128</ramBufferSizeMB>
+    <!-- If both ramBufferSizeMB and maxBufferedDocs is set, then
+         Lucene will flush based on whichever limit is hit first.  
+      -->
+    <maxBufferedDocs>1000</maxBufferedDocs> -->
+
+    <!-- Unlock On Startup
+
+         If true, unlock any held write or commit locks on startup.
+         This defeats the locking mechanism that allows multiple
+         processes to safely access a lucene index, and should be used
+         with care.
+
+         This is not needed if lock type is 'none' or 'single'
+     -->
+    <unlockOnStartup>false</unlockOnStartup>
+    
+    <!-- If true, IndexReaders will be reopened (often more efficient)
+         instead of closed and then opened.
+      -->
+    <reopenReaders>true</reopenReaders>
+
+    <!-- Commit Deletion Policy
+
+         Custom deletion policies can specified here. The class must
+         implement org.apache.lucene.index.IndexDeletionPolicy.
+
+         http://lucene.apache.org/java/2_9_1/api/all/org/apache/lucene/index/IndexDeletionPolicy.html
+
+         The standard Solr IndexDeletionPolicy implementation supports
+         deleting index commit points on number of commits, age of
+         commit point and optimized status.
+         
+         The latest commit point should always be preserved regardless
+         of the criteria.
+    -->
+    <deletionPolicy class="solr.SolrDeletionPolicy">
+      <!-- The number of commit points to be kept -->
+      <str name="maxCommitsToKeep">1</str>
+      <!-- The number of optimized commit points to be kept -->
+      <str name="maxOptimizedCommitsToKeep">0</str>
+      <!--
+          Delete all commit points once they have reached the given age.
+          Supports DateMathParser syntax e.g.
+        -->
+      <!--
+         <str name="maxCommitAge">30MINUTES</str>
+         <str name="maxCommitAge">1DAY</str>
+      -->
+    </deletionPolicy>
+
+    <!-- Lucene Infostream
+       
+         To aid in advanced debugging, Lucene provides an "InfoStream"
+         of detailed information when indexing.
+
+         Setting The value to true will instruct the underlying Lucene
+         IndexWriter to write its debugging info the specified file
+      -->
+     <infoStream file="INFOSTREAM.txt">false</infoStream> 
+
+  </mainIndex>
+
+  <!-- JMX
+       
+       This example enables JMX if and only if an existing MBeanServer
+       is found, use this if you want to configure JMX through JVM
+       parameters. Remove this to disable exposing Solr configuration
+       and statistics to JMX.
+
+       For more details see http://wiki.apache.org/solr/SolrJmx
+    -->
+  <jmx />
+  <!-- If you want to connect to a particular server, specify the
+       agentId 
+    -->
+  <!-- <jmx agentId="myAgent" /> -->
+  <!-- If you want to start a new MBeanServer, specify the serviceUrl -->
+  <!-- <jmx serviceUrl="service:jmx:rmi:///jndi/rmi://localhost:9999/solr"/>
+    -->
+
+  <!-- The default high-performance update handler -->
+  <updateHandler class="solr.DirectUpdateHandler2">
+
+    <!-- AutoCommit
+
+         Perform a <commit/> automatically under certain conditions.
+         Instead of enabling autoCommit, consider using "commitWithin"
+         when adding documents. 
+
+         http://wiki.apache.org/solr/UpdateXmlMessages
+
+         maxDocs - Maximum number of documents to add since the last
+                   commit before automatically triggering a new commit.
+
+         maxTime - Maximum amount of time that is allowed to pass
+                   since a document was added before automaticly
+                   triggering a new commit. 
+      -->
+       <autoCommit> 
+         <maxDocs>1000</maxDocs>
+         <maxTime>1800000</maxTime> 
+       </autoCommit>
+
+    <!-- Update Related Event Listeners
+         
+         Various IndexWriter related events can trigger Listeners to
+         take actions.
+
+         postCommit - fired after every commit or optimize command
+         postOptimize - fired after every optimize command
+      -->
+    <!-- The RunExecutableListener executes an external command from a
+         hook such as postCommit or postOptimize.
+         
+         exe - the name of the executable to run
+         dir - dir to use as the current working directory. (default=".")
+         wait - the calling thread waits until the executable returns. 
+                (default="true")
+         args - the arguments to pass to the program.  (default is none)
+         env - environment variables to set.  (default is none)
+      -->
+    <!-- This example shows how RunExecutableListener could be used
+         with the script based replication...
+         http://wiki.apache.org/solr/CollectionDistribution
+      -->
+    <!--
+       <listener event="postCommit" class="solr.RunExecutableListener">
+         <str name="exe">solr/bin/snapshooter</str>
+         <str name="dir">.</str>
+         <bool name="wait">true</bool>
+         <arr name="args"> <str>arg1</str> <str>arg2</str> </arr>
+         <arr name="env"> <str>MYVAR=val1</str> </arr>
+       </listener>
+      -->
+  </updateHandler>
+  
+  <!-- IndexReaderFactory
+
+       Use the following format to specify a custom IndexReaderFactory,
+       which allows for alternate IndexReader implementations.
+
+       ** Experimental Feature **
+
+       Please note - Using a custom IndexReaderFactory may prevent
+       certain other features from working. The API to
+       IndexReaderFactory may change without warning or may even be
+       removed from future releases if the problems cannot be
+       resolved.
+
+
+       ** Features that may not work with custom IndexReaderFactory **
+
+       The ReplicationHandler assumes a disk-resident index. Using a
+       custom IndexReader implementation may cause incompatibility
+       with ReplicationHandler and may cause replication to not work
+       correctly. See SOLR-1366 for details.
+
+    -->
+  <!--
+  <indexReaderFactory name="IndexReaderFactory" class="package.class">
+    <str name="someArg">Some Value</str>
+  </indexReaderFactory >
+  -->
+  <!-- By explicitly declaring the Factory, the termIndexDivisor can
+       be specified.
+    -->
+  <!--
+     <indexReaderFactory name="IndexReaderFactory" 
+                         class="solr.StandardIndexReaderFactory">
+       <int name="setTermIndexDivisor">12</int>
+     </indexReaderFactory >
+    -->
+
+
+  <query>
+    <!-- Max Boolean Clauses
+
+         Maximum number of clauses in each BooleanQuery,  an exception
+         is thrown if exceeded.
+
+         ** WARNING **
+         
+         This option actually modifies a global Lucene property that
+         will affect all SolrCores.  If multiple solrconfig.xml files
+         disagree on this property, the value at any given moment will
+         be based on the last SolrCore to be initialized.
+         
+      -->
+    <maxBooleanClauses>1024</maxBooleanClauses>
+
+
+    <!-- Solr Internal Query Caches
+
+         There are two implementations of cache available for Solr,
+         LRUCache, based on a synchronized LinkedHashMap, and
+         FastLRUCache, based on a ConcurrentHashMap.  
+
+         FastLRUCache has faster gets and slower puts in single
+         threaded operation and thus is generally faster than LRUCache
+         when the hit ratio of the cache is high (> 75%), and may be
+         faster under other scenarios on multi-cpu systems.
+    -->
+
+    <!-- Filter Cache
+
+         Cache used by SolrIndexSearcher for filters (DocSets),
+         unordered sets of *all* documents that match a query.  When a
+         new searcher is opened, its caches may be prepopulated or
+         "autowarmed" using data from caches in the old searcher.
+         autowarmCount is the number of items to prepopulate.  For
+         LRUCache, the autowarmed items will be the most recently
+         accessed items.
+
+         Parameters:
+           class - the SolrCache implementation LRUCache or
+               (LRUCache or FastLRUCache)
+           size - the maximum number of entries in the cache
+           initialSize - the initial capacity (number of entries) of
+               the cache.  (see java.util.HashMap)
+           autowarmCount - the number of entries to prepopulate from
+               and old cache.  
+      -->
+    <filterCache class="solr.FastLRUCache"
+                 size="512"
+                 initialSize="512"
+                 autowarmCount="0"/>
+
+    <!-- Query Result Cache
+         
+         Caches results of searches - ordered lists of document ids
+         (DocList) based on a query, a sort, and the range of documents requested.  
+      -->
+    <queryResultCache class="solr.LRUCache"
+                     size="512"
+                     initialSize="512"
+                     autowarmCount="0"/>
+   
+    <!-- Document Cache
+
+         Caches Lucene Document objects (the stored fields for each
+         document).  Since Lucene internal document ids are transient,
+         this cache will not be autowarmed.  
+      -->
+    <documentCache class="solr.LRUCache"
+                   size="512"
+                   initialSize="512"
+                   autowarmCount="0"/>
+    
+    <!-- Field Value Cache
+         
+         Cache used to hold field values that are quickly accessible
+         by document id.  The fieldValueCache is created by default
+         even if not configured here.
+      -->
+    <!--
+       <fieldValueCache class="solr.FastLRUCache"
+                        size="512"
+                        autowarmCount="128"
+                        showItems="32" />
+      -->
+
+    <!-- Custom Cache
+
+         Example of a generic cache.  These caches may be accessed by
+         name through SolrIndexSearcher.getCache(),cacheLookup(), and
+         cacheInsert().  The purpose is to enable easy caching of
+         user/application level data.  The regenerator argument should
+         be specified as an implementation of solr.CacheRegenerator 
+         if autowarming is desired.  
+      -->
+    <!--
+       <cache name="myUserCache"
+              class="solr.LRUCache"
+              size="4096"
+              initialSize="1024"
+              autowarmCount="1024"
+              regenerator="com.mycompany.MyRegenerator"
+              />
+      -->
+
+
+    <!-- Lazy Field Loading
+
+         If true, stored fields that are not requested will be loaded
+         lazily.  This can result in a significant speed improvement
+         if the usual case is to not load all stored fields,
+         especially if the skipped fields are large compressed text
+         fields.
+    -->
+    <enableLazyFieldLoading>true</enableLazyFieldLoading>
+
+   <!-- Use Filter For Sorted Query
+
+        A possible optimization that attempts to use a filter to
+        satisfy a search.  If the requested sort does not include
+        score, then the filterCache will be checked for a filter
+        matching the query. If found, the filter will be used as the
+        source of document ids, and then the sort will be applied to
+        that.
+
+        For most situations, this will not be useful unless you
+        frequently get the same search repeatedly with different sort
+        options, and none of them ever use "score"
+     -->
+   <!--
+      <useFilterForSortedQuery>true</useFilterForSortedQuery>
+     -->
+
+   <!-- Result Window Size
+
+        An optimization for use with the queryResultCache.  When a search
+        is requested, a superset of the requested number of document ids
+        are collected.  For example, if a search for a particular query
+        requests matching documents 10 through 19, and queryWindowSize is 50,
+        then documents 0 through 49 will be collected and cached.  Any further
+        requests in that range can be satisfied via the cache.  
+     -->
+   <queryResultWindowSize>20</queryResultWindowSize>
+
+   <!-- Maximum number of documents to cache for any entry in the
+        queryResultCache. 
+     -->
+   <queryResultMaxDocsCached>200</queryResultMaxDocsCached>
+
+   <!-- Query Related Event Listeners
+
+        Various IndexSearcher related events can trigger Listeners to
+        take actions.
+
+        newSearcher - fired whenever a new searcher is being prepared
+        and there is a current searcher handling requests (aka
+        registered).  It can be used to prime certain caches to
+        prevent long request times for certain requests.
+
+        firstSearcher - fired whenever a new searcher is being
+        prepared but there is no current registered searcher to handle
+        requests or to gain autowarming data from.
+
+        
+     -->
+    <!-- QuerySenderListener takes an array of NamedList and executes a
+         local query request for each NamedList in sequence. 
+      -->
+    <listener event="newSearcher" class="solr.QuerySenderListener">
+      <arr name="queries">
+        <!--
+           <lst><str name="q">solr</str><str name="sort">price asc</str></lst>
+           <lst><str name="q">rocks</str><str name="sort">weight asc</str></lst>
+          -->
+      </arr>
+    </listener>
+    <listener event="firstSearcher" class="solr.QuerySenderListener">
+      <arr name="queries">
+        <lst>
+          <str name="q">static firstSearcher warming in solrconfig.xml</str>
+        </lst>
+      </arr>
+    </listener>
+
+    <!-- Use Cold Searcher
+
+         If a search request comes in and there is no current
+         registered searcher, then immediately register the still
+         warming searcher and use it.  If "false" then all requests
+         will block until the first searcher is done warming.
+      -->
+    <useColdSearcher>false</useColdSearcher>
+
+    <!-- Max Warming Searchers
+         
+         Maximum number of searchers that may be warming in the
+         background concurrently.  An error is returned if this limit
+         is exceeded.
+
+         Recommend values of 1-2 for read-only slaves, higher for
+         masters w/o cache warming.
+      -->
+    <maxWarmingSearchers>4</maxWarmingSearchers>
+
+  </query>
+
+
+  <!-- Request Dispatcher
+
+       This section contains instructions for how the SolrDispatchFilter
+       should behave when processing requests for this SolrCore.
+
+       handleSelect affects the behavior of requests such as /select?qt=XXX
+
+       handleSelect="true" will cause the SolrDispatchFilter to process
+       the request and will result in consistent error handling and
+       formatting for all types of requests.
+
+       handleSelect="false" will cause the SolrDispatchFilter to
+       ignore "/select" requests and fallback to using the legacy
+       SolrServlet and it's Solr 1.1 style error formatting
+    -->
+  <requestDispatcher handleSelect="true" >
+    <!-- Request Parsing
+
+         These settings indicate how Solr Requests may be parsed, and
+         what restrictions may be placed on the ContentStreams from
+         those requests
+
+         enableRemoteStreaming - enables use of the stream.file
+         and stream.url parameters for specifying remote streams.
+
+         multipartUploadLimitInKB - specifies the max size of
+         Multipart File Uploads that Solr will allow in a Request.
+         
+         *** WARNING ***
+         The settings below authorize Solr to fetch remote files, You
+         should make sure your system has some authentication before
+         using enableRemoteStreaming="true"
+
+      --> 
+    <requestParsers enableRemoteStreaming="true" 
+                    multipartUploadLimitInKB="2048000" />
+
+    <!-- HTTP Caching
+
+         Set HTTP caching related parameters (for proxy caches and clients).
+
+         The options below instruct Solr not to output any HTTP Caching
+         related headers
+      -->
+    <httpCaching never304="true" />
+    <!-- If you include a <cacheControl> directive, it will be used to
+         generate a Cache-Control header (as well as an Expires header
+         if the value contains "max-age=")
+         
+         By default, no Cache-Control header is generated.
+         
+         You can use the <cacheControl> option even if you have set
+         never304="true"
+      -->
+    <!--
+       <httpCaching never304="true" >
+         <cacheControl>max-age=30, public</cacheControl> 
+       </httpCaching>
+      -->
+    <!-- To enable Solr to respond with automatically generated HTTP
+         Caching headers, and to response to Cache Validation requests
+         correctly, set the value of never304="false"
+         
+         This will cause Solr to generate Last-Modified and ETag
+         headers based on the properties of the Index.
+
+         The following options can also be specified to affect the
+         values of these headers...
+
+         lastModFrom - the default value is "openTime" which means the
+         Last-Modified value (and validation against If-Modified-Since
+         requests) will all be relative to when the current Searcher
+         was opened.  You can change it to lastModFrom="dirLastMod" if
+         you want the value to exactly correspond to when the physical
+         index was last modified.
+
+         etagSeed="..." is an option you can change to force the ETag
+         header (and validation against If-None-Match requests) to be
+         different even if the index has not changed (ie: when making
+         significant changes to your config file)
+
+         (lastModifiedFrom and etagSeed are both ignored if you use
+         the never304="true" option)
+      -->
+    <!--
+       <httpCaching lastModifiedFrom="openTime"
+                    etagSeed="Solr">
+         <cacheControl>max-age=30, public</cacheControl> 
+       </httpCaching>
+      -->
+  </requestDispatcher>
+
+  <!-- Request Handlers 
+
+       http://wiki.apache.org/solr/SolrRequestHandler
+
+       incoming queries will be dispatched to the correct handler
+       based on the path or the qt (query type) param.
+
+       Names starting with a '/' are accessed with the a path equal to
+       the registered name.  Names without a leading '/' are accessed
+       with: http://host/app/[core/]select?qt=name
+
+       If a /select request is processed with out a qt param
+       specified, the requestHandler that declares default="true" will
+       be used.
+       
+       If a Request Handler is declared with startup="lazy", then it will
+       not be initialized until the first request that uses it.
+
+    -->
+  <!-- SearchHandler
+
+       http://wiki.apache.org/solr/SearchHandler
+
+       For processing Search Queries, the primary Request Handler
+       provided with Solr is "SearchHandler" It delegates to a sequent
+       of SearchComponents (see below) and supports distributed
+       queries across multiple shards
+    -->
+  <requestHandler name="search" class="solr.SearchHandler" default="true">
+    <!-- default values for query parameters can be specified, these
+         will be overridden by parameters in the request
+      -->
+     <lst name="defaults">
+       <str name="echoParams">none</str>
+       <int name="rows">10</int>
+     </lst>
+    <!-- In addition to defaults, "appends" params can be specified
+         to identify values which should be appended to the list of
+         multi-val params from the query (or the existing "defaults").
+      -->
+    <!-- In this example, the param "fq=instock:true" would be appended to
+         any query time fq params the user may specify, as a mechanism for
+         partitioning the index, independent of any user selected filtering
+         that may also be desired (perhaps as a result of faceted searching).
+
+         NOTE: there is *absolutely* nothing a client can do to prevent these
+         "appends" values from being used, so don't use this mechanism
+         unless you are sure you always want it.
+      -->
+    <!--
+       <lst name="appends">
+         <str name="fq">inStock:true</str>
+       </lst>
+      -->
+    <!-- "invariants" are a way of letting the Solr maintainer lock down
+         the options available to Solr clients.  Any params values
+         specified here are used regardless of what values may be specified
+         in either the query, the "defaults", or the "appends" params.
+
+         In this example, the facet.field and facet.query params would
+         be fixed, limiting the facets clients can use.  Faceting is
+         not turned on by default - but if the client does specify
+         facet=true in the request, these are the only facets they
+         will be able to see counts for; regardless of what other
+         facet.field or facet.query params they may specify.
+
+         NOTE: there is *absolutely* nothing a client can do to prevent these
+         "invariants" values from being used, so don't use this mechanism
+         unless you are sure you always want it.
+      -->
+    <!--
+       <lst name="invariants">
+         <str name="facet.field">cat</str>
+         <str name="facet.field">manu_exact</str>
+         <str name="facet.query">price:[* TO 500]</str>
+         <str name="facet.query">price:[500 TO *]</str>
+       </lst>
+      -->
+    <!-- If the default list of SearchComponents is not desired, that
+         list can either be overridden completely, or components can be
+         prepended or appended to the default list.  (see below)
+      -->
+    <!--
+       <arr name="components">
+         <str>nameOfCustomComponent1</str>
+         <str>nameOfCustomComponent2</str>
+       </arr>
+      -->
+    </requestHandler>
+
+  <!-- DisMaxRequestHandler allows easy searching across multiple fields
+       for simple user-entered phrases.  It's implementation is now
+       just the standard SearchHandler with a default query type
+       of "dismax". 
+       see http://wiki.apache.org/solr/DisMaxRequestHandler
+   -->
+  <requestHandler name="dismax" class="solr.SearchHandler" >
+    <lst name="defaults">
+     <str name="defType">edismax</str>
+     <str name="echoParams">none</str>
+
+     <!-- Highlighting defaults -->
+     <str name="hl">on</str>
+     <str name="hl.fl">text features name</str>
+     <str name="f.name.hl.fragsize">0</str>
+     <str name="f.name.hl.alternateField">name</str>
+    </lst>
+  </requestHandler>
+
+  <!-- A Robust Example
+
+       This example SearchHandler declaration shows off usage of the
+       SearchHandler with many defaults declared
+
+       Note that multiple instances of the same Request Handler
+       (SearchHandler) can be registered multiple times with different
+       names (and different init parameters)
+    -->
+  <requestHandler name="/browse" class="solr.SearchHandler">
+     <lst name="defaults">
+       <str name="echoParams">none</str>
+
+       <!-- VelocityResponseWriter settings -->
+       <str name="wt">velocity</str>
+
+       <str name="v.template">browse</str>
+       <str name="v.layout">layout</str>
+
+       <str name="defType">edismax</str>
+       <str name="rows">10</str>
+       <str name="fl">*,score</str>
+
+       <!-- Highlighting defaults -->
+       <str name="hl">on</str>
+       <str name="hl.fl">text features name</str>
+       <str name="f.name.hl.fragsize">0</str>
+       <str name="f.name.hl.alternateField">name</str>
+     </lst>
+     <arr name="last-components">
+       <str>spellcheck</str>
+     </arr>
+     <!--
+     <str name="url-scheme">httpx</str>
+     -->
+  </requestHandler>
+
+  <!-- XML Update Request Handler.  
+       
+       http://wiki.apache.org/solr/UpdateXmlMessages
+
+       The canonical Request Handler for Modifying the Index through
+       commands specified using XML.
+
+       Note: Since solr1.1 requestHandlers requires a valid content
+       type header if posted in the body. For example, curl now
+       requires: -H 'Content-type:text/xml; charset=utf-8'
+    -->
+  <requestHandler name="/update" 
+                  class="solr.XmlUpdateRequestHandler">
+    <!-- See below for information on defining 
+         updateRequestProcessorChains that can be used by name 
+         on each Update Request
+      -->
+    <!--
+       <lst name="defaults">
+         <str name="update.chain">dedupe</str>
+       </lst>
+       -->
+    </requestHandler>
+  <!-- Binary Update Request Handler
+       http://wiki.apache.org/solr/javabin
+    -->
+  <requestHandler name="/update/javabin" 
+                  class="solr.BinaryUpdateRequestHandler" />
+
+  <!-- CSV Update Request Handler
+       http://wiki.apache.org/solr/UpdateCSV
+    -->
+  <requestHandler name="/update/csv" 
+                  class="solr.CSVRequestHandler" 
+                  startup="lazy" />
+
+  <!-- JSON Update Request Handler
+       http://wiki.apache.org/solr/UpdateJSON
+    -->
+  <requestHandler name="/update/json" 
+                  class="solr.JsonUpdateRequestHandler" 
+                  startup="lazy" />
+
+  <!-- Solr Cell Update Request Handler
+
+       http://wiki.apache.org/solr/ExtractingRequestHandler 
+
+    -->
+  <requestHandler name="/update/extract" 
+                  startup="lazy"
+                  class="solr.extraction.ExtractingRequestHandler" >
+    <lst name="defaults">
+      <!-- All the main content goes into "text"... if you need to return
+           the extracted text or do highlighting, use a stored field. -->
+      <str name="fmap.content">text</str>
+      <str name="lowernames">true</str>
+      <str name="uprefix">ignored_</str>
+
+      <!-- capture link hrefs but ignore div attributes -->
+      <str name="captureAttr">true</str>
+      <str name="fmap.a">links</str>
+      <str name="fmap.div">ignored_</str>
+    </lst>
+  </requestHandler>
+
+  <!-- XSLT Update Request Handler
+       Transforms incoming XML with stylesheet identified by tr=
+  -->
+  <requestHandler name="/update/xslt"
+                   startup="lazy"
+                   class="solr.XsltUpdateRequestHandler"/>
+
+  <!-- Field Analysis Request Handler
+
+       RequestHandler that provides much the same functionality as
+       analysis.jsp. Provides the ability to specify multiple field
+       types and field names in the same request and outputs
+       index-time and query-time analysis for each of them.
+
+       Request parameters are:
+       analysis.fieldname - field name whose analyzers are to be used
+
+       analysis.fieldtype - field type whose analyzers are to be used
+       analysis.fieldvalue - text for index-time analysis
+       q (or analysis.q) - text for query time analysis
+       analysis.showmatch (true|false) - When set to true and when
+           query analysis is performed, the produced tokens of the
+           field value analysis will be marked as "matched" for every
+           token that is produces by the query analysis
+   -->
+  <requestHandler name="/analysis/field" 
+                  startup="lazy"
+                  class="solr.FieldAnalysisRequestHandler" />
+
+
+  <!-- Document Analysis Handler
+
+       http://wiki.apache.org/solr/AnalysisRequestHandler
+
+       An analysis handler that provides a breakdown of the analysis
+       process of provided docuemnts. This handler expects a (single)
+       content stream with the following format:
+
+       <docs>
+         <doc>
+           <field name="id">1</field>
+           <field name="name">The Name</field>
+           <field name="text">The Text Value</field>
+         </doc>
+         <doc>...</doc>
+         <doc>...</doc>
+         ...
+       </docs>
+
+    Note: Each document must contain a field which serves as the
+    unique key. This key is used in the returned response to associate
+    an analysis breakdown to the analyzed document.
+
+    Like the FieldAnalysisRequestHandler, this handler also supports
+    query analysis by sending either an "analysis.query" or "q"
+    request parameter that holds the query text to be analyzed. It
+    also supports the "analysis.showmatch" parameter which when set to
+    true, all field tokens that match the query tokens will be marked
+    as a "match". 
+  -->
+  <requestHandler name="/analysis/document" 
+                  class="solr.DocumentAnalysisRequestHandler" 
+                  startup="lazy" />
+
+  <!-- Admin Handlers
+
+       Admin Handlers - This will register all the standard admin
+       RequestHandlers.  
+    -->
+  <requestHandler name="/admin/" 
+                  class="solr.admin.AdminHandlers" />
+  <!-- This single handler is equivalent to the following... -->
+  <!--
+     <requestHandler name="/admin/luke"       class="solr.admin.LukeRequestHandler" />
+     <requestHandler name="/admin/system"     class="solr.admin.SystemInfoHandler" />
+     <requestHandler name="/admin/plugins"    class="solr.admin.PluginInfoHandler" />
+     <requestHandler name="/admin/threads"    class="solr.admin.ThreadDumpHandler" />
+     <requestHandler name="/admin/properties" class="solr.admin.PropertiesRequestHandler" />
+     <requestHandler name="/admin/file"       class="solr.admin.ShowFileRequestHandler" >
+    -->
+  <!-- If you wish to hide files under ${solr.home}/conf, explicitly
+       register the ShowFileRequestHandler using: 
+    -->
+  <!--
+     <requestHandler name="/admin/file" 
+                     class="solr.admin.ShowFileRequestHandler" >
+       <lst name="invariants">
+         <str name="hidden">synonyms.txt</str> 
+         <str name="hidden">anotherfile.txt</str> 
+       </lst>
+     </requestHandler>
+    -->
+
+  <!-- ping/healthcheck -->
+  <requestHandler name="/admin/ping" class="solr.PingRequestHandler">
+    <lst name="invariants">
+      <str name="qt">search</str>
+      <str name="q">solrpingquery</str>
+    </lst>
+    <lst name="defaults">
+      <str name="echoParams">all</str>
+    </lst>
+  </requestHandler>
+
+  <!-- Echo the request contents back to the client -->
+  <requestHandler name="/debug/dump" class="solr.DumpRequestHandler" >
+    <lst name="defaults">
+     <str name="echoParams">explicit</str> 
+     <str name="echoHandler">true</str>
+    </lst>
+  </requestHandler>
+  
+  <!-- Solr Replication
+
+       The SolrReplicationHandler supports replicating indexes from a
+       "master" used for indexing and "salves" used for queries.
+
+       http://wiki.apache.org/solr/SolrReplication 
+
+       In the example below, remove the <lst name="master"> section if
+       this is just a slave and remove  the <lst name="slave"> section
+       if this is just a master.
+    -->
+  <!--
+     <requestHandler name="/replication" class="solr.ReplicationHandler" >
+       <lst name="master">
+         <str name="replicateAfter">commit</str>
+         <str name="replicateAfter">startup</str>
+         <str name="confFiles">schema.xml,stopwords.txt</str>
+       </lst>
+       <lst name="slave">
+         <str name="masterUrl">http://localhost:8983/solr/replication</str>
+         <str name="pollInterval">00:00:60</str>
+       </lst>
+     </requestHandler>
+    -->
+
+  <!-- Search Components
+
+       Search components are registered to SolrCore and used by 
+       instances of SearchHandler (which can access them by name)
+       
+       By default, the following components are available:
+       
+       <searchComponent name="query"     class="solr.QueryComponent" />
+       <searchComponent name="facet"     class="solr.FacetComponent" />
+       <searchComponent name="mlt"       class="solr.MoreLikeThisComponent" />
+       <searchComponent name="highlight" class="solr.HighlightComponent" />
+       <searchComponent name="stats"     class="solr.StatsComponent" />
+       <searchComponent name="debug"     class="solr.DebugComponent" />
+   
+       Default configuration in a requestHandler would look like:
+
+       <arr name="components">
+         <str>query</str>
+         <str>facet</str>
+         <str>mlt</str>
+         <str>highlight</str>
+         <str>stats</str>
+         <str>debug</str>
+       </arr>
+
+       If you register a searchComponent to one of the standard names, 
+       that will be used instead of the default.
+
+       To insert components before or after the 'standard' components, use:
+    
+       <arr name="first-components">
+         <str>myFirstComponentName</str>
+       </arr>
+    
+       <arr name="last-components">
+         <str>myLastComponentName</str>
+       </arr>
+
+       NOTE: The component registered with the name "debug" will
+       always be executed after the "last-components" 
+       
+     -->
+
+   <!-- Spell Check
+
+        The spell check component can return a list of alternative spelling
+        suggestions.  
+
+        http://wiki.apache.org/solr/SpellCheckComponent
+     -->
+  <searchComponent name="spellcheck" class="solr.SpellCheckComponent">
+
+    <str name="queryAnalyzerFieldType">textSpell</str>
+
+    <!-- Multiple "Spell Checkers" can be declared and used by this
+         component
+      -->
+
+    <!-- a spellchecker built from a field of the main index, and
+         written to disk
+      -->
+    <lst name="spellchecker">
+      <str name="name">default</str>
+      <str name="field">name</str>
+      <str name="spellcheckIndexDir">spellchecker</str>
+      <!-- uncomment this to require terms to occur in 1% of the documents in order to be included in the dictionary
+      	<float name="thresholdTokenFrequency">.01</float>
+      -->
+    </lst>
+
+    <!-- a spellchecker that uses a different distance measure -->
+    <!--
+       <lst name="spellchecker">
+         <str name="name">jarowinkler</str>
+         <str name="field">spell</str>
+         <str name="distanceMeasure">
+           org.apache.lucene.search.spell.JaroWinklerDistance
+         </str>
+         <str name="spellcheckIndexDir">spellcheckerJaro</str>
+       </lst>
+     -->
+
+    <!-- a spellchecker that use an alternate comparator 
+
+         comparatorClass be one of:
+          1. score (default)
+          2. freq (Frequency first, then score)
+          3. A fully qualified class name
+      -->
+    <!--
+       <lst name="spellchecker">
+         <str name="name">freq</str>
+         <str name="field">lowerfilt</str>
+         <str name="spellcheckIndexDir">spellcheckerFreq</str>
+         <str name="comparatorClass">freq</str>
+         <str name="buildOnCommit">true</str>
+      -->
+
+    <!-- A spellchecker that reads the list of words from a file -->
+    <!--
+       <lst name="spellchecker">
+         <str name="classname">solr.FileBasedSpellChecker</str>
+         <str name="name">file</str>
+         <str name="sourceLocation">spellings.txt</str>
+         <str name="characterEncoding">UTF-8</str>
+         <str name="spellcheckIndexDir">spellcheckerFile</str>
+       </lst>
+      -->
+  </searchComponent>
+
+  <!-- A request handler for demonstrating the spellcheck component.  
+
+       NOTE: This is purely as an example.  The whole purpose of the
+       SpellCheckComponent is to hook it into the request handler that
+       handles your normal user queries so that a separate request is
+       not needed to get suggestions.
+
+       IN OTHER WORDS, THERE IS REALLY GOOD CHANCE THE SETUP BELOW IS
+       NOT WHAT YOU WANT FOR YOUR PRODUCTION SYSTEM!
+       
+       See http://wiki.apache.org/solr/SpellCheckComponent for details
+       on the request parameters.
+    -->
+  <requestHandler name="/spell" class="solr.SearchHandler" startup="lazy">
+    <lst name="defaults">
+      <str name="spellcheck.onlyMorePopular">false</str>
+      <str name="spellcheck.extendedResults">false</str>
+      <str name="spellcheck.count">1</str>
+    </lst>
+    <arr name="last-components">
+      <str>spellcheck</str>
+    </arr>
+  </requestHandler>
+
+  <!-- Term Vector Component
+
+       http://wiki.apache.org/solr/TermVectorComponent
+    -->
+  <searchComponent name="tvComponent" class="solr.TermVectorComponent"/>
+
+  <!-- A request handler for demonstrating the term vector component
+
+       This is purely as an example.
+
+       In reality you will likely want to add the component to your 
+       already specified request handlers. 
+    -->
+  <requestHandler name="tvrh" class="solr.SearchHandler" startup="lazy">
+    <lst name="defaults">
+      <bool name="tv">true</bool>
+    </lst>
+    <arr name="last-components">
+      <str>tvComponent</str>
+    </arr>
+  </requestHandler>
+
+  <!-- Clustering Component
+
+       http://wiki.apache.org/solr/ClusteringComponent
+
+       This relies on third party jars which are notincluded in the
+       release.  To use this component (and the "/clustering" handler)
+       Those jars will need to be downloaded, and you'll need to set
+       the solr.cluster.enabled system property when running solr...
+
+          java -Dsolr.clustering.enabled=true -jar start.jar
+    -->
+  <searchComponent name="clustering" 
+                   enable="${solr.clustering.enabled:false}"
+                   class="solr.clustering.ClusteringComponent" >
+    <!-- Declare an engine -->
+    <lst name="engine">
+      <!-- The name, only one can be named "default" -->
+      <str name="name">default</str>
+
+      <!-- Class name of Carrot2 clustering algorithm. 
+           
+           Currently available algorithms are:
+           
+           * org.carrot2.clustering.lingo.LingoClusteringAlgorithm
+           * org.carrot2.clustering.stc.STCClusteringAlgorithm
+           * org.carrot2.clustering.kmeans.BisectingKMeansClusteringAlgorithm
+           
+           See http://project.carrot2.org/algorithms.html for the
+           algorithm's characteristics.
+        -->
+      <str name="carrot.algorithm">org.carrot2.clustering.lingo.LingoClusteringAlgorithm</str>
+
+      <!-- Overriding values for Carrot2 default algorithm attributes.
+
+           For a description of all available attributes, see:
+           http://download.carrot2.org/stable/manual/#chapter.components.
+           Use attribute key as name attribute of str elements
+           below. These can be further overridden for individual
+           requests by specifying attribute key as request parameter
+           name and attribute value as parameter value.
+        -->
+      <str name="LingoClusteringAlgorithm.desiredClusterCountBase">20</str>
+      
+      <!-- Location of Carrot2 lexical resources.
+
+           A directory from which to load Carrot2-specific stop words
+           and stop labels. Absolute or relative to Solr config directory.
+           If a specific resource (e.g. stopwords.en) is present in the
+           specified dir, it will completely override the corresponding
+           default one that ships with Carrot2.
+
+           For an overview of Carrot2 lexical resources, see:
+           http://download.carrot2.org/head/manual/#chapter.lexical-resources
+        -->
+      <str name="carrot.lexicalResourcesDir">clustering/carrot2</str>
+
+      <!-- The language to assume for the documents.
+           
+           For a list of allowed values, see:
+           http://download.carrot2.org/stable/manual/#section.attribute.lingo.MultilingualClustering.defaultLanguage
+       -->
+      <str name="MultilingualClustering.defaultLanguage">ENGLISH</str>
+    </lst>
+    <lst name="engine">
+      <str name="name">stc</str>
+      <str name="carrot.algorithm">org.carrot2.clustering.stc.STCClusteringAlgorithm</str>
+    </lst>
+  </searchComponent>
+
+  <!-- A request handler for demonstrating the clustering component
+
+       This is purely as an example.
+
+       In reality you will likely want to add the component to your 
+       already specified request handlers. 
+    -->
+  <requestHandler name="/clustering"
+                  startup="lazy"
+                  enable="${solr.clustering.enabled:false}"
+                  class="solr.SearchHandler">
+    <lst name="defaults">
+      <bool name="clustering">true</bool>
+      <str name="clustering.engine">default</str>
+      <bool name="clustering.results">true</bool>
+      <!-- The title field -->
+      <str name="carrot.title">name</str>
+      <str name="carrot.url">id</str>
+      <!-- The field to cluster on -->
+       <str name="carrot.snippet">features</str>
+       <!-- produce summaries -->
+       <bool name="carrot.produceSummary">true</bool>
+       <!-- the maximum number of labels per cluster -->
+       <!--<int name="carrot.numDescriptions">5</int>-->
+       <!-- produce sub clusters -->
+       <bool name="carrot.outputSubClusters">false</bool>
+       
+       <str name="defType">edismax</str>
+       <str name="qf">
+          text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4
+       </str>
+       <str name="q.alt">*:*</str>
+       <str name="rows">10</str>
+       <str name="fl">*,score</str>
+    </lst>     
+    <arr name="last-components">
+      <str>clustering</str>
+    </arr>
+  </requestHandler>
+  
+  <!-- Terms Component
+
+       http://wiki.apache.org/solr/TermsComponent
+
+       A component to return terms and document frequency of those
+       terms
+    -->
+  <searchComponent name="terms" class="solr.TermsComponent"/>
+
+  <!-- A request handler for demonstrating the terms component -->
+  <requestHandler name="/terms" class="solr.SearchHandler" startup="lazy">
+     <lst name="defaults">
+      <bool name="terms">true</bool>
+    </lst>     
+    <arr name="components">
+      <str>terms</str>
+    </arr>
+  </requestHandler>
+
+
+  <!-- Query Elevation Component
+
+       http://wiki.apache.org/solr/QueryElevationComponent
+
+       a search component that enables you to configure the top
+       results for a given query regardless of the normal lucene
+       scoring.
+    -->
+  <searchComponent name="elevator" class="solr.QueryElevationComponent" >
+    <!-- pick a fieldType to analyze queries -->
+    <str name="queryFieldType">string</str>
+    <str name="config-file">elevate.xml</str>
+  </searchComponent>
+
+  <!-- A request handler for demonstrating the elevator component -->
+  <requestHandler name="/elevate" class="solr.SearchHandler" startup="lazy">
+    <lst name="defaults">
+      <str name="echoParams">explicit</str>
+    </lst>
+    <arr name="last-components">
+      <str>elevator</str>
+    </arr>
+  </requestHandler>
+
+  <!-- Highlighting Component
+
+       http://wiki.apache.org/solr/HighlightingParameters
+    -->
+  <searchComponent class="solr.HighlightComponent" name="highlight">
+    <highlighting>
+      <!-- Configure the standard fragmenter -->
+      <!-- This could most likely be commented out in the "default" case -->
+      <fragmenter name="gap" 
+                  default="true"
+                  class="solr.highlight.GapFragmenter">
+        <lst name="defaults">
+          <int name="hl.fragsize">100</int>
+        </lst>
+      </fragmenter>
+
+      <!-- A regular-expression-based fragmenter 
+           (for sentence extraction) 
+        -->
+      <fragmenter name="regex" 
+                  class="solr.highlight.RegexFragmenter">
+        <lst name="defaults">
+          <!-- slightly smaller fragsizes work better because of slop -->
+          <int name="hl.fragsize">70</int>
+          <!-- allow 50% slop on fragment sizes -->
+          <float name="hl.regex.slop">0.5</float>
+          <!-- a basic sentence pattern -->
+          <str name="hl.regex.pattern">[-\w ,/\n\&quot;&apos;]{20,200}</str>
+        </lst>
+      </fragmenter>
+
+      <!-- Configure the standard formatter -->
+      <formatter name="html" 
+                 default="true"
+                 class="solr.highlight.HtmlFormatter">
+        <lst name="defaults">
+          <str name="hl.simple.pre"><![CDATA[<em>]]></str>
+          <str name="hl.simple.post"><![CDATA[</em>]]></str>
+        </lst>
+      </formatter>
+
+      <!-- Configure the standard encoder -->
+      <encoder name="html" 
+               class="solr.highlight.HtmlEncoder" />
+
+      <!-- Configure the standard fragListBuilder -->
+      <fragListBuilder name="simple" 
+                       default="true"
+                       class="solr.highlight.SimpleFragListBuilder"/>
+
+      <!-- Configure the single fragListBuilder -->
+      <fragListBuilder name="single" 
+                       class="solr.highlight.SingleFragListBuilder"/>
+
+      <!-- default tag FragmentsBuilder -->
+      <fragmentsBuilder name="default" 
+                        default="true"
+                        class="solr.highlight.ScoreOrderFragmentsBuilder">
+        <!-- 
+        <lst name="defaults">
+          <str name="hl.multiValuedSeparatorChar">/</str>
+        </lst>
+        -->
+      </fragmentsBuilder>
+
+      <!-- multi-colored tag FragmentsBuilder -->
+      <fragmentsBuilder name="colored" 
+                        class="solr.highlight.ScoreOrderFragmentsBuilder">
+        <lst name="defaults">
+          <str name="hl.tag.pre"><![CDATA[
+               <b style="background:yellow">,<b style="background:lawgreen">,
+               <b style="background:aquamarine">,<b style="background:magenta">,
+               <b style="background:palegreen">,<b style="background:coral">,
+               <b style="background:wheat">,<b style="background:khaki">,
+               <b style="background:lime">,<b style="background:deepskyblue">]]></str>
+          <str name="hl.tag.post"><![CDATA[</b>]]></str>
+        </lst>
+      </fragmentsBuilder>
+      
+      <boundaryScanner name="default" 
+                       default="true"
+                       class="solr.highlight.SimpleBoundaryScanner">
+        <lst name="defaults">
+          <str name="hl.bs.maxScan">10</str>
+          <str name="hl.bs.chars">.,!? &#9;&#10;&#13;</str>
+        </lst>
+      </boundaryScanner>
+      
+      <boundaryScanner name="breakIterator" 
+                       class="solr.highlight.BreakIteratorBoundaryScanner">
+        <lst name="defaults">
+          <!-- type should be one of CHARACTER, WORD(default), LINE and SENTENCE -->
+          <str name="hl.bs.type">WORD</str>
+          <!-- language and country are used when constructing Locale object.  -->
+          <!-- And the Locale object will be used when getting instance of BreakIterator -->
+          <str name="hl.bs.language">en</str>
+          <str name="hl.bs.country">US</str>
+        </lst>
+      </boundaryScanner>
+    </highlighting>
+  </searchComponent>
+
+  <!-- Update Processors
+
+       Chains of Update Processor Factories for dealing with Update
+       Requests can be declared, and then used by name in Update
+       Request Processors
+
+       http://wiki.apache.org/solr/UpdateRequestProcessor
+
+    --> 
+  <!-- Deduplication
+
+       An example dedup update processor that creates the "id" field
+       on the fly based on the hash code of some other fields.  This
+       example has overwriteDupes set to false since we are using the
+       id field as the signatureField and Solr will maintain
+       uniqueness based on that anyway.  
+       
+    -->
+  <!--
+     <updateRequestProcessorChain name="dedupe">
+       <processor class="solr.processor.SignatureUpdateProcessorFactory">
+         <bool name="enabled">true</bool>
+         <str name="signatureField">id</str>
+         <bool name="overwriteDupes">false</bool>
+         <str name="fields">name,features,cat</str>
+         <str name="signatureClass">solr.processor.Lookup3Signature</str>
+       </processor>
+       <processor class="solr.LogUpdateProcessorFactory" />
+       <processor class="solr.RunUpdateProcessorFactory" />
+     </updateRequestProcessorChain>
+    -->
+
+    <!--
+       This example update chain identifies the language of the incoming
+       documents using the langid contrib. The detected language is
+       written to field language_s. No field name mapping is done.
+       The fields used for detection are text, title, subject and description,
+       making this example suitable for detecting languages form full-text
+       rich documents injected via ExtractingRequestHandler.
+       See more about langId at http://wiki.apache.org/solr/LanguageDetection
+    -->
+    <!--
+     <updateRequestProcessorChain name="langid">
+       <processor class="org.apache.solr.update.processor.TikaLanguageIdentifierUpdateProcessorFactory">
+         <str name="langid.fl">text,title,subject,description</str>
+         <str name="langid.langField">language_s</str>
+         <str name="langid.fallback">en</str>
+       </processor>
+       <processor class="solr.LogUpdateProcessorFactory" />
+       <processor class="solr.RunUpdateProcessorFactory" />
+     </updateRequestProcessorChain>
+    -->
+ 
+  <!-- Response Writers
+
+       http://wiki.apache.org/solr/QueryResponseWriter
+
+       Request responses will be written using the writer specified by
+       the 'wt' request parameter matching the name of a registered
+       writer.
+
+       The "default" writer is the default and will be used if 'wt' is
+       not specified in the request.
+    -->
+  <!-- The following response writers are implicitly configured unless
+       overridden...
+    -->
+  <!--
+     <queryResponseWriter name="xml" 
+                          default="true"
+                          class="solr.XMLResponseWriter" />
+     <queryResponseWriter name="json" class="solr.JSONResponseWriter"/>
+     <queryResponseWriter name="python" class="solr.PythonResponseWriter"/>
+     <queryResponseWriter name="ruby" class="solr.RubyResponseWriter"/>
+     <queryResponseWriter name="php" class="solr.PHPResponseWriter"/>
+     <queryResponseWriter name="phps" class="solr.PHPSerializedResponseWriter"/>
+     <queryResponseWriter name="csv" class="solr.CSVResponseWriter"/>
+    -->
+
+  <queryResponseWriter name="json" class="solr.JSONResponseWriter">
+     <!-- For the purposes of the tutorial, JSON responses are written as
+      plain text so that they are easy to read in *any* browser.
+      If you expect a MIME type of "application/json" just remove this override.
+     -->
+    <str name="content-type">text/plain; charset=UTF-8</str>
+  </queryResponseWriter>
+  
+  <!--
+     Custom response writers can be declared as needed...
+    -->
+    <!-- The solr.velocity.enabled flag is used by Solr's test cases so that this response writer is not
+         loaded (causing an error if contrib/velocity has not been built fully) -->
+    <!--
+    <queryResponseWriter name="velocity" class="solr.VelocityResponseWriter" enable="${solr.velocity.enabled:true}"/>
+    -->
+  
+
+  <!-- XSLT response writer transforms the XML output by any xslt file found
+       in Solr's conf/xslt directory.  Changes to xslt files are checked for
+       every xsltCacheLifetimeSeconds.  
+    -->
+  <queryResponseWriter name="xslt" class="solr.XSLTResponseWriter">
+    <int name="xsltCacheLifetimeSeconds">5</int>
+  </queryResponseWriter>
+
+  <!-- Query Parsers
+
+       http://wiki.apache.org/solr/SolrQuerySyntax
+
+       Multiple QParserPlugins can be registered by name, and then
+       used in either the "defType" param for the QueryComponent (used
+       by SearchHandler) or in LocalParams
+    -->
+  <!-- example of registering a query parser -->
+  <!--
+     <queryParser name="myparser" class="com.mycompany.MyQParserPlugin"/>
+    -->
+
+  <!-- Function Parsers
+
+       http://wiki.apache.org/solr/FunctionQuery
+
+       Multiple ValueSourceParsers can be registered by name, and then
+       used as function names when using the "func" QParser.
+    -->
+  <!-- example of registering a custom function parser  -->
+  <!--
+     <valueSourceParser name="myfunc" 
+                        class="com.mycompany.MyValueSourceParser" />
+    -->
+
+  <!-- Legacy config for the admin interface -->
+  <admin>
+    <defaultQuery>*:*</defaultQuery>
+
+    <!-- configure a healthcheck file for servers behind a
+         loadbalancer 
+      -->
+    <!--
+       <healthcheck type="file">server-enabled</healthcheck>
+      -->
+  </admin>
+
+</config>
@@ -0,0 +1,2 @@
+pizza
+history
 \ No newline at end of file
@@ -1,2 +0,0 @@
-pizza
-history
 \ No newline at end of file
@@ -0,0 +1,58 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#-----------------------------------------------------------------------
+# a couple of test stopwords to test that the words are really being
+# configured from this file:
+stopworda
+stopwordb
+
+#Standard english stop words taken from Lucene's StopAnalyzer
+a
+an
+and
+are
+as
+at
+be
+but
+by
+for
+if
+in
+into
+is
+it
+no
+not
+of
+on
+or
+s
+such
+t
+that
+the
+their
+then
+there
+these
+they
+this
+to
+was
+will
+with
+
@@ -0,0 +1,128 @@
+a
+ainda
+alem
+ambas
+ambos
+antes
+ao
+aonde
+aos
+apos
+aquele
+aqueles
+as
+assim
+com
+como
+contra
+contudo
+cuja
+cujas
+cujo
+cujos
+da
+das
+de
+dela
+dele
+deles
+demais
+depois
+desde
+desta
+deste
+dispoe
+dispoem
+diversa
+diversas
+diversos
+do
+dos
+durante
+e
+ela
+elas
+ele
+eles
+em
+entao
+entre
+essa
+essas
+esse
+esses
+esta
+estas
+este
+estes
+ha
+isso
+isto
+logo
+mais
+mas
+mediante
+menos
+mesma
+mesmas
+mesmo
+mesmos
+na
+nas
+nao
+nas
+nem
+nesse
+neste
+nos
+o
+os
+ou
+outra
+outras
+outro
+outros
+pelas
+pelas
+pelo
+pelos
+perante
+pois
+por
+porque
+portanto
+proprio
+propios
+quais
+qual
+qualquer
+quando
+quanto
+que
+quem
+quer
+se
+seja
+sem
+sendo
+seu
+seus
+sob
+sobre
+sua
+suas
+tal
+tambem
+teu
+teus
+toda
+todas
+todo
+todos
+tua
+tuas
+tudo
+um
+uma
+umas
+uns
@@ -1,58 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#-----------------------------------------------------------------------
-# a couple of test stopwords to test that the words are really being
-# configured from this file:
-stopworda
-stopwordb
-
-#Standard english stop words taken from Lucene's StopAnalyzer
-a
-an
-and
-are
-as
-at
-be
-but
-by
-for
-if
-in
-into
-is
-it
-no
-not
-of
-on
-or
-s
-such
-t
-that
-the
-their
-then
-there
-these
-they
-this
-to
-was
-will
-with
-
@@ -0,0 +1,31 @@
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#-----------------------------------------------------------------------
+#some test synonym mappings unlikely to appear in real input text
+aaa => aaaa
+bbb => bbbb1 bbbb2
+ccc => cccc1,cccc2
+a\=>a => b\=>b
+a\,a => b\,b
+fooaaa,baraaa,bazaaa
+
+# Some synonym groups specific to this example
+GB,gib,gigabyte,gigabytes
+MB,mib,megabyte,megabytes
+Television, Televisions, TV, TVs
+#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming
+#after us won't split it into two words.
+
+# Synonym mappings can be used for spelling correction too
+pixima => pixma
+
@@ -1,31 +0,0 @@
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#-----------------------------------------------------------------------
-#some test synonym mappings unlikely to appear in real input text
-aaa => aaaa
-bbb => bbbb1 bbbb2
-ccc => cccc1,cccc2
-a\=>a => b\=>b
-a\,a => b\,b
-fooaaa,baraaa,bazaaa
-
-# Some synonym groups specific to this example
-GB,gib,gigabyte,gigabytes
-MB,mib,megabyte,megabytes
-Television, Televisions, TV, TVs
-#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming
-#after us won't split it into two words.
-
-# Synonym mappings can be used for spelling correction too
-pixima => pixma
-
@@ -438,16 +438,12 @@ class ActsAsSolrTest &lt; Test::Unit::TestCase
   end
   def test_search_given_a_radius
-    records = Advertise.search "bike", :around => {:latitude => '-39.36',
-                                                   :longitude => '77.4027',
-                                                   :radius => 1}
+    records = Advertise.search "bike", :latitude => '-39.36', :longitude => '77.4027', :radius => 1
     assert_equal 0, records.total
   end
   def test_records_are_found_in_a_radius
-    records = Advertise.search "bike", :around => {:latitude => '39.36',
-                                                   :longitude => '-77.4027',
-                                                   :radius => 1}
+    records = Advertise.search "bike", :latitude => '39.36', :longitude => '-77.4027', :radius => 1
     assert_equal 1, records.total
   end
@@ -263,36 +263,28 @@ class ParserMethodsTest &lt; Test::Unit::TestCase
       ActsAsSolr::Post.expects(:execute).with {|request, core|
         request.to_hash[:qt] == ('geo')
       }
-      @parser.parse_query "foo" , :around => {:latitude => '-39.36',
-        :longitude => '77.4027',
-        :radius => 1}
+      @parser.parse_query "foo" , :latitude => '-39.36', :longitude => '77.4027', :radius => 1
     end
     should "set the radius" do
       ActsAsSolr::Post.expects(:execute).with {|request, core|
         request.to_hash[:radius] == 12
       }
-      @parser.parse_query "foo" , :around => {:latitude => '-39.36',
-        :longitude => '77.4027',
-        :radius => 12}
+      @parser.parse_query "foo" , :latitude => '-39.36', :longitude => '77.4027', :radius => 12
     end
     should "set the latitude" do
       ActsAsSolr::Post.expects(:execute).with {|request, core|
         request.to_hash[:lat] == '-39.36'
       }
-      @parser.parse_query "foo" , :around => {:latitude => '-39.36',
-        :longitude => '77.4027',
-        :radius => 12}
+      @parser.parse_query "foo" , :latitude => '-39.36', :longitude => '77.4027', :radius => 12
     end
     should "set the longitude" do
       ActsAsSolr::Post.expects(:execute).with {|request, core|
         request.to_hash[:long] == '77.4027'
       }
-      @parser.parse_query "foo" , :around => {:latitude => '-39.36',
-        :longitude => '77.4027',
-        :radius => 12}
+      @parser.parse_query "foo" , :latitude => '-39.36', :longitude => '77.4027', :radius => 12
     end
   end
	@@ -1,96 +0,0 @@	@@ -1,96 +0,0 @@
1	-= DESCRIPTION
2	-
3	-This plugin adds full text search capabilities and many other nifty features from Apache's Solr[http://lucene.apache.org/solr/] to any Rails model, like:
4	-
5	-* faceting
6	-* dynamic attributes
7	-* integration with acts_as_taggable_on
8	-* integration with will_paginate
9	-* highlighting
10	-* geolocation
11	-* relevance
12	-* suggest
13	-
14	-Watch this screencast for a short demo of the latests features:
15	-
16	-http://www.vimeo.com/8728276
17	-
18	-== INSTALLATION
19	-
20	- script/plugin install git://github.com/brauliobo/acts_as_solr_reloaded.git
21	- rake solr:download
22	-
23	-== REQUIREMENTS
24	-
25	-* Java Runtime Environment(JRE) 1.5 aka 5.0 [http://www.java.com/en/download/index.jsp](http://www.java.com/en/download/index.jsp) (use default-jre for Debian like distribution)
26	-* (Recommended) If you have libxml-ruby installed, make sure it's at least version 0.7
27	-
28	-== CONFIGURATION
29	-
30	-See config/solr.yml file.
31	-
32	-== USAGE
33	-
34	-Just include the line below to any of your ActiveRecord models:
35	- acts_as_solr
36	-
37	-Or if you want, you can specify only the fields that should be indexed:
38	- acts_as_solr :fields => [:name, :author]
39	-
40	-Then to find instances of your model, just do:
41	- Model.search(query) #query is a string representing your query
42	-
43	-Case you want to use dynamic attributes or geolocalization, you can use this generators that setup the database:
44	-
45	- script/generate dynamic_attributes_migration
46	- script/generate local_migration
47	-
48	-and then configure your model like this:
49	-
50	- acts_as_solr :dynamic_attributes => true,
51	- :spatial => true
52	-
53	-If you want to integrate the model with acts_as_taggable_on, just add the option :taggable => true :
54	-
55	- acts_as_solr :taggable => true
56	-
57	-Please see ActsAsSolr::ActsMethods for a complete info
58	-
59	-== PAGINATION
60	-
61	-In your controller:
62	-
63	- @search = Product.search "beer", :page => 2, :per_page => 20
64	-
65	-And in your view:
66	-
67	- will_paginate @search
68	-
69	-== TESTING
70	-
71	-To test code that uses acts_as_solr_reloaded you must start a Solr server for the test environment and also start MongoDB.
72	-
73	-== LICENSE
74	-
75	-(The MIT License)
76	-
77	-Copyright © 2010
78	-
79	-Permission is hereby granted, free of charge, to any person obtaining
80	-a copy of this software and associated documentation files (the
81	-‘Software’), to deal in the Software without restriction, including
82	-without limitation the rights to use, copy, modify, merge, publish,
83	-distribute, sublicense, and/or sell copies of the Software, and to
84	-permit persons to whom the Software is furnished to do so, subject to
85	-the following conditions:
86	-
87	-The above copyright notice and this permission notice shall be
88	-included in all copies or substantial portions of the Software.
89	-
90	-THE SOFTWARE IS PROVIDED ‘AS IS’, WITHOUT WARRANTY OF ANY KIND,
91	-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
92	-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
93	-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
94	-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
95	-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
96	-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
	@@ -27,7 +27,7 @@ end		@@ -27,7 +27,7 @@ end
27		27
28	unless defined? SOLR_PORT	28	unless defined? SOLR_PORT
29	config = YAML::load_file(RAILS_ROOT+'/config/solr.yml')	29	config = YAML::load_file(RAILS_ROOT+'/config/solr.yml')
30	- raise("No solr environment defined for RAILS_ENV the #{ENV['RAILS_ENV'].inspect}") unless config[ENV['RAILS_ENV']]	30	+ raise("No solr environment defined for RAILS_ENV = #{ENV['RAILS_ENV'].inspect}") unless config[ENV['RAILS_ENV']]
31		31
32	SOLR_HOST = ENV['HOST'] \|\| URI.parse(config[ENV['RAILS_ENV']]['url']).host	32	SOLR_HOST = ENV['HOST'] \|\| URI.parse(config[ENV['RAILS_ENV']]['url']).host
33	SOLR_PORT = ENV['PORT'] \|\| URI.parse(config[ENV['RAILS_ENV']]['url']).port	33	SOLR_PORT = ENV['PORT'] \|\| URI.parse(config[ENV['RAILS_ENV']]['url']).port
	@@ -19,36 +19,7 @@ require File.dirname(__FILE__) + '/acts_as_solr/deprecation'		@@ -19,36 +19,7 @@ require File.dirname(__FILE__) + '/acts_as_solr/deprecation'
19	require File.dirname(__FILE__) + '/acts_as_solr/search_results'	19	require File.dirname(__FILE__) + '/acts_as_solr/search_results'
20	require File.dirname(__FILE__) + '/acts_as_solr/lazy_document'	20	require File.dirname(__FILE__) + '/acts_as_solr/lazy_document'
21	require File.dirname(__FILE__) + '/acts_as_solr/mongo_mapper'	21	require File.dirname(__FILE__) + '/acts_as_solr/mongo_mapper'
22	-
23	-module ActsAsSolr
24	- class Post
25	- class << self
26	- def config
27	- return @config if @config
28	- @config = {}
29	- YAML::load_file("#{Rails.root}/config/solr.yml")[Rails.env].each{ \|k,v\| @config[k.to_sym] = v }
30	- @config
31	- end
32	-
33	- def options
34	- @options \|\|= credentials.merge config
35	- end
36	-
37	- def credentials
38	- @credentials \|\|= {:username => config[:username], :password => config[:password]}
39	- end
40	-
41	- def url(core)
42	- core.nil? ? config[:url] : "#{config[:url]}/#{core}"
43	- end
44	-
45	- def execute(request, core = nil)
46	- connection = Solr::Connection.new(url(core), options)
47	- connection.send request
48	- end
49	- end
50	- end
51	-end	22	+require File.dirname(__FILE__) + '/acts_as_solr/post'
52		23
53	# reopen ActiveRecord and include the acts_as_solr method	24	# reopen ActiveRecord and include the acts_as_solr method
54	ActiveRecord::Base.extend ActsAsSolr::ActsMethods	25	ActiveRecord::Base.extend ActsAsSolr::ActsMethods
	@@ -197,7 +197,7 @@ module ActsAsSolr #:nodoc:		@@ -197,7 +197,7 @@ module ActsAsSolr #:nodoc:
197	data = parse_query(query, options)	197	data = parse_query(query, options)
198	data.total_hits	198	data.total_hits
199	end	199	end
200	-	200	+
201	# It's used to rebuild the Solr index for a specific model.	201	# It's used to rebuild the Solr index for a specific model.
202	# Book.rebuild_solr_index	202	# Book.rebuild_solr_index
203	#	203	#
	@@ -209,39 +209,75 @@ module ActsAsSolr #:nodoc:		@@ -209,39 +209,75 @@ module ActsAsSolr #:nodoc:
209	# If a finder block is given, it will be called to retrieve the items to index.	209	# If a finder block is given, it will be called to retrieve the items to index.
210	# This can be very useful for things such as updating based on conditions or	210	# This can be very useful for things such as updating based on conditions or
211	# using eager loading for indexed associations.	211	# using eager loading for indexed associations.
212	- def rebuild_solr_index(batch_size=100, options = {}, &finder)
213	- finder \|\|= lambda { \|ar, options\| ar.find(:all, options.merge({:order => self.primary_key})) }	212	+ def rebuild_solr_index(batch_size=300, options = {}, &finder)
		213	+ finder \|\|= lambda do \|ar, sql_options\|
		214	+ ar.all sql_options.merge!({:order => self.primary_key, :include => configuration[:solr_includes].keys})
		215	+ end
214	start_time = Time.now	216	start_time = Time.now
215	options[:offset] \|\|= 0	217	options[:offset] \|\|= 0
		218	+ options[:threads] \|\|= 2
		219	+ options[:delayed_job] &= defined?(Delayed::Job)
216		220
217	if batch_size > 0	221	if batch_size > 0
218	items_processed = 0	222	items_processed = 0
219	- limit = batch_size
220	offset = options[:offset]	223	offset = options[:offset]
221	- begin
222	- iteration_start = Time.now
223	- items = finder.call(self, {:limit => limit, :offset => offset})	224	+ end_reached = false
		225	+ threads = []
		226	+ mutex = Mutex.new
		227	+ queue = Queue.new
		228	+ loop do
		229	+ items = finder.call(self, {:limit => batch_size, :offset => offset})
224	add_batch = items.collect { \|content\| content.to_solr_doc }	230	add_batch = items.collect { \|content\| content.to_solr_doc }
225	-
226	- if items.size > 0
227	- solr_add add_batch
228	- solr_commit
229	- end
230	-
231	- items_processed += items.size
232	- last_id = items.last.id if items.last
233	- time_so_far = Time.now - start_time
234	- iteration_time = Time.now - iteration_start
235	- logger.info "#{Process.pid}: #{items_processed} items for #{self.name} have been batch added to index in #{'%.3f' % time_so_far}s at #{'%.3f' % (items_processed / time_so_far)} items/sec (#{'%.3f' % (items.size / iteration_time)} items/sec for the last batch). Last id: #{last_id}"
236	offset += items.size	231	offset += items.size
237	- end while items.nil? \|\| items.size > 0	232	+ end_reached = items.size == 0
		233	+ break if end_reached
		234	+
		235	+ if options[:threads] == threads.size
		236	+ threads.first.join
		237	+ threads.shift
		238	+ end
		239	+
		240	+ queue << [items, add_batch]
		241	+ threads << Thread.new do
		242	+ iteration_start = Time.now
		243	+
		244	+ iteration_items, iteration_add_batch = queue.pop(true)
		245	+ if options[:delayed_job]
		246	+ delay.solr_add iteration_add_batch
		247	+ else
		248	+ solr_add iteration_add_batch
		249	+ solr_commit
		250	+ end
		251	+
		252	+ last_id = iteration_items.last.id
		253	+ time_so_far = Time.now - start_time
		254	+ iteration_time = Time.now - iteration_start
		255	+ mutex.synchronize do
		256	+ items_processed += iteration_items.size
		257	+ if options[:delayed_job]
		258	+ logger.info "#{Process.pid}: #{items_processed} items for #{self.name} have been sent to Delayed::Job in #{'%.3f' % time_so_far}s at #{'%.3f' % (items_processed / time_so_far)} items/sec. Last id: #{last_id}"
		259	+ else
		260	+ logger.info "#{Process.pid}: #{items_processed} items for #{self.name} have been batch added to index in #{'%.3f' % time_so_far}s at #{'%.3f' % (items_processed / time_so_far)} items/sec. Last id: #{last_id}"
		261	+ end
		262	+ end
		263	+ end
		264	+ end
		265	+
		266	+ solr_commit if options[:delayed_job]
		267	+ threads.each{ \|t\| t.join }
238	else	268	else
239	items = finder.call(self, {})	269	items = finder.call(self, {})
240	items.each { \|content\| content.solr_save }	270	items.each { \|content\| content.solr_save }
241	items_processed = items.size	271	items_processed = items.size
242	end	272	end
243	- solr_optimize
244	- logger.info items_processed > 0 ? "Index for #{self.name} has been rebuilt" : "Nothing to index for #{self.name}"	273	+
		274	+ if items_processed > 0
		275	+ solr_optimize
		276	+ time_elapsed = Time.now - start_time
		277	+ logger.info "Index for #{self.name} has been rebuilt (took #{'%.3f' % time_elapsed}s)"
		278	+ else
		279	+ "Nothing to index for #{self.name}"
		280	+ end
245	end	281	end
246		282
247	alias :rebuild_index :rebuild_solr_index	283	alias :rebuild_index :rebuild_solr_index
	@@ -30,7 +30,7 @@ module ActsAsSolr #:nodoc:		@@ -30,7 +30,7 @@ module ActsAsSolr #:nodoc:
30	end	30	end
31	if options[:sort_by]	31	if options[:sort_by]
32	plog "The option :sort_by is deprecated, use :order instead!"	32	plog "The option :sort_by is deprecated, use :order instead!"
33	- options[:order] \|\|= options[:sort_by]	33	+ options[:sort] \|\|= options[:sort_by]
34	end	34	end
35	if options[:start]	35	if options[:start]
36	plog "The option :start is deprecated, use :offset instead!"	36	plog "The option :start is deprecated, use :offset instead!"
@@ -0,0 +1,29 @@		@@ -0,0 +1,29 @@
	1	+module ActsAsSolr
	2	+ class Post
	3	+ class << self
	4	+ def config
	5	+ return @config if @config
	6	+ @config = {}
	7	+ YAML::load_file("#{Rails.root}/config/solr.yml")[Rails.env].each{ \|k,v\| @config[k.to_sym] = v }
	8	+ @config
	9	+ end
	10	+
	11	+ def options
	12	+ @options \|\|= credentials.merge config
	13	+ end
	14	+
	15	+ def credentials
	16	+ @credentials \|\|= {:username => config[:username], :password => config[:password]}
	17	+ end
	18	+
	19	+ def url(core)
	20	+ core.nil? ? config[:url] : "#{config[:url]}/#{core}"
	21	+ end
	22	+
	23	+ def execute(request, core = nil)
	24	+ connection = Solr::Connection.new(url(core), options)
	25	+ connection.send request
	26	+ end
	27	+ end
	28	+ end
	29	+end
	@@ -27,10 +27,17 @@ module ActsAsSolr #:nodoc:		@@ -27,10 +27,17 @@ module ActsAsSolr #:nodoc:
27	#	27	#
28	#	28	#
29	class SearchResults	29	class SearchResults
		30	+
		31	+ include Enumerable
		32	+
30	def initialize(solr_data={})	33	def initialize(solr_data={})
31	@solr_data = solr_data	34	@solr_data = solr_data
32	end	35	end
33		36
		37	+ def each(&block)
		38	+ self.results.each &block
		39	+ end
		40	+
34	# Returns an array with the instances. This method	41	# Returns an array with the instances. This method
35	# is also aliased as docs and records	42	# is also aliased as docs and records
36	def results	43	def results
	@@ -60,7 +67,7 @@ module ActsAsSolr #:nodoc:		@@ -60,7 +67,7 @@ module ActsAsSolr #:nodoc:
60		67
61	# Returns the highlighted fields which one has asked for..	68	# Returns the highlighted fields which one has asked for..
62	def highlights	69	def highlights
63	- @solr_data[:highlights]	70	+ @solr_data[:highlights]
64	end	71	end
65		72
66	# Returns a suggested query	73	# Returns a suggested query
	@@ -83,10 +90,45 @@ module ActsAsSolr #:nodoc:		@@ -83,10 +90,45 @@ module ActsAsSolr #:nodoc:
83	(@solr_data[:start].to_i / per_page) + 1	90	(@solr_data[:start].to_i / per_page) + 1
84	end	91	end
85		92
		93	+ def blank?
		94	+ total_entries == 0
		95	+ end
		96	+
		97	+ def size
		98	+ total_entries
		99	+ end
		100	+
		101	+ def offset
		102	+ (current_page - 1) * per_page
		103	+ end
		104	+
		105	+ def previous_page
		106	+ if current_page > 1
		107	+ current_page - 1
		108	+ else
		109	+ false
		110	+ end
		111	+ end
		112	+
		113	+ def next_page
		114	+ if current_page < total_pages
		115	+ current_page + 1
		116	+ else
		117	+ false
		118	+ end
		119	+ end
		120	+
		121	+ def method_missing(symbol, *args, &block)
		122	+ self.results.send(symbol, *args, &block)
		123	+ rescue NoMethodError
		124	+ raise NoMethodError, "There is no method called #{symbol} at #{self.class.name} - #{self.inspect}"
		125	+ end
		126	+
86	alias docs results	127	alias docs results
87	alias records results	128	alias records results
88	alias num_found total	129	alias num_found total
89	alias total_hits total	130	alias total_hits total
		131	+ alias total_entries total
90	alias highest_score max_score	132	alias highest_score max_score
91	end	133	end
92		134
	@@ -1,27 +0,0 @@	@@ -1,27 +0,0 @@
1	-#!/usr/bin/env ruby
2	-# The ASF licenses this file to You under the Apache License, Version 2.0
3	-# (the "License"); you may not use this file except in compliance with
4	-# the License. You may obtain a copy of the License at
5	-#
6	-# http://www.apache.org/licenses/LICENSE-2.0
7	-#
8	-# Unless required by applicable law or agreed to in writing, software
9	-# distributed under the License is distributed on an "AS IS" BASIS,
10	-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11	-# See the License for the specific language governing permissions and
12	-# limitations under the License.
13	-
14	-# TODO: fill out Solr tasks: start, stop, ping, optimize, etc.
15	-
16	-require 'rake'
17	-require 'rake/tasklib'
18	-
19	-module Solr
20	- namespace :solr do
21	- desc "Start Solr"
22	- task :start do
23	- # TODO: actually start it up!
24	- puts "Starting..."
25	- end
26	- end
27	-end
@@ -0,0 +1,19 @@		@@ -0,0 +1,19 @@
	1	+# The ASF licenses this file to You under the Apache License, Version 2.0
	2	+# (the "License"); you may not use this file except in compliance with
	3	+# the License. You may obtain a copy of the License at
	4	+#
	5	+# http://www.apache.org/licenses/LICENSE-2.0
	6	+#
	7	+# Unless required by applicable law or agreed to in writing, software
	8	+# distributed under the License is distributed on an "AS IS" BASIS,
	9	+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	10	+# See the License for the specific language governing permissions and
	11	+# limitations under the License.
	12	+
	13	+#-----------------------------------------------------------------------
	14	+# Use a protected word file to protect against the stemmer reducing two
	15	+# unrelated words to the same base word.
	16	+
	17	+# Some non-words that normally won't be encountered,
	18	+# just to test that they won't be stemmed.
	19	+
	@@ -1,21 +0,0 @@	@@ -1,21 +0,0 @@
1	-# The ASF licenses this file to You under the Apache License, Version 2.0
2	-# (the "License"); you may not use this file except in compliance with
3	-# the License. You may obtain a copy of the License at
4	-#
5	-# http://www.apache.org/licenses/LICENSE-2.0
6	-#
7	-# Unless required by applicable law or agreed to in writing, software
8	-# distributed under the License is distributed on an "AS IS" BASIS,
9	-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
10	-# See the License for the specific language governing permissions and
11	-# limitations under the License.
12	-
13	-#-----------------------------------------------------------------------
14	-# Use a protected word file to protect against the stemmer reducing two
15	-# unrelated words to the same base word.
16	-
17	-# Some non-words that normally won't be encountered,
18	-# just to test that they won't be stemmed.
19	-dontstems
20	-zwhacky
21	-