Changeset 267

Timestamp:

11/17/07 16:08:44 (1 year ago)

Author:

jk

Message:

#167

Files:

• trunk/plugin/acts_as_ferret/lib/class_methods.rb (modified) (7 diffs)
• trunk/plugin/acts_as_ferret/lib/local_index.rb (modified) (3 diffs)

trunk/plugin/acts_as_ferret/lib/class_methods.rb

@@ -158 +158 @@
-        limit = options[:per_page]
-        offset = (options[:page] - 1) * limit
-
+ && !options[:multi]
-          find_options[:limit] = limit
-          find_options[:offset] = offset
@@ -164 +164 @@
-          options.delete :offset
-        else
-
+
+
-          options[:limit] = limit
-          options[:offset] = offset
+        end
+      elsif find_options[:conditions]
+        if options[:multi]
+          # multisearch ignores find_options limit and offset
+          options[:limit] ||= find_options.delete(:limit)
+          options[:offset] ||= find_options.delete(:offset)
+        else
+          # let the db do the limiting and offsetting for single-table searches
+          find_options[:limit] ||= options.delete(:limit)
+          find_options[:offset] ||= options.delete(:offset)
+          options[:limit] = :all
-        end
-      end
@@ -185 +197 @@
-    # To count the results of a query across multiple models, specify an array of 
-    # class names with the :multi option.
+    #
+    # Note that since we don't query the database here, this method won't deliver 
+    # the expected results when used on an AR association.
-    def total_hits(q, options={})
-      if options[:models]
@@ -216 +231 @@
-    end
-
-    # Search across multiple classes each having their own index.
-    # requires the store_class_name option of acts_as_ferret to be true
-    # for all models queried this way.
-    #
-    # Pagination with the +page+ and +per_page+ options is not supported when
-    # combined with active_record +conditions+ in +find_options+.
-    def multi_search(query, additional_models = [], options = {}, find_options = {})
-      logger.warn "multi_search is deprecated. Use find_with_ferret with the :multi option instead."
-      total_hits, result = _multi_search query, additional_models, options, find_options
-      SearchResults.new(result, total_hits)
-    end
-
-    def _multi_search(query, additional_models = [], options = {}, find_options = {})
-      result = []
-
-      if options[:lazy]
-        logger.warn "find_options #{find_options} are ignored because :lazy => true" unless find_options.empty?
-        total_hits = id_multi_search(query, additional_models, options) do |model, id, score, data|
-          result << FerretResult.new(model, id, score, data)
-        end
-      else
-        id_arrays = {}
-        rank = 0
-        total_hits = id_multi_search(query, additional_models, options) do |model, id, score, data|
-          id_arrays[model] ||= {}
-          id_arrays[model][id] = [ rank += 1, score ]
-        end
-        limit, offset = [nil, nil]
-        if options[:per_page]
-          limit = find_options.delete :limit
-          offset = find_options.delete :offset
-        end
-        result = retrieve_records(id_arrays, find_options)
-        total_hits = result.size if find_options[:conditions]
-        if limit && offset
-          result = result[offset..limit+offset-1]
-        end
-      end
-      [total_hits, result]
-    end
-    
-    # returns an array of hashes, each containing :class_name,
@@ -271 +246 @@
-    protected
-
+    def _multi_search(query, additional_models = [], options = {}, find_options = {})
+      result = []
+
+      if options[:lazy]
+        logger.warn "find_options #{find_options} are ignored because :lazy => true" unless find_options.empty?
+        total_hits = id_multi_search(query, additional_models, options) do |model, id, score, data|
+          result << FerretResult.new(model, id, score, data)
+        end
+      else
+        id_arrays = {}
+        rank = 0
+
+        limit = options.delete(:limit)
+        offset = options.delete(:offset) || 0
+        options[:limit] = :all
+        total_hits = id_multi_search(query, additional_models, options) do |model, id, score, data|
+          id_arrays[model] ||= {}
+          id_arrays[model][id] = [ rank += 1, score ]
+        end
+        result = retrieve_records(id_arrays, find_options)
+        total_hits = result.size if find_options[:conditions]
+ #       total_hits += offset if offset
+        if limit && limit != :all
+          result = result[offset..limit+offset-1]
+        end
+      end
+      [total_hits, result]
+    end
+
-    def add_self_to_model_list_if_necessary(models)
-      models = [ models ] unless models.is_a? Array
@@ -289 +293 @@
-      result_ids = {}
-      total_hits = find_id_by_contents(q, options) do |model, id, score, data|
-of each id
-, and score
+and score of each hit
+
-        result_ids[id] = [ result_ids.size + 1, score ]
-      end
@@ -296 +300 @@
-      result = retrieve_records( { self.name => result_ids }, find_options )
-      
-
+
+
+
-        # chances are the ferret result count is not our total_hits value, so
-        # we correct this here.
-
+ || find_options[:limit] || find_options[:offset]
-          # our ferret result has been limited, so we need to re-run that
-          # search to get the full result set from ferret.

trunk/plugin/acts_as_ferret/lib/local_index.rb

@@ -1 +1 @@
-module ActsAsFerret
-  
-  class LocalIndex < AbstractIndex
-    include MoreLikeThis::IndexMethods
-
-
-    def initialize(aaf_configuration)
@@ -79 +77 @@
-    # Total number of hits for the given query. 
-    # To count the results of a multi_search query, specify an array of 
-odels
+ulti
-    def total_hits(query, options = {})
-      index = (models = options.delete(:multi)) ? multi_index(models) : ferret_index
@@ -101 +99 @@
-      result = []
-      index = ferret_index
-# TODO only enable this for debugging purposes
+if logger.debug?
-      lazy_fields = determine_lazy_fields options
-