Project: acts_as_ferret

Revision: 348

Author: jk

Date: 13 Jun 2008 06:26:35

Diff at Trac: http://projects.jkraemer.net/acts_as_ferret/changeset/348

• /trunk/plugin/acts_as_ferret/lib/acts_as_ferret.rb

  ......	@@ -321,7 +321,7 @@
  321	321	end
  322	322	elsif ar_options[:conditions]
  323	323	if multi
  324		# multisearch ignores find_options limit and offset
  	324	# multisearch ignores ar_options limit and offset
  325	325	options[:limit] ||= ar_options.delete(:limit)
  326	326	options[:offset] ||= ar_options.delete(:offset)
  327	327	else

• /trunk/plugin/acts_as_ferret/recipes/aaf_recipes.rb

  ......	@@ -65,7 +65,7 @@
  65	65	namespace :index do
  66	66
  67	67	desc "Rebuild the Ferret index. See aaf_recipes.rb for instructions."
  68		task :rebuild => :environment, :roles => :app do
  	68	task :rebuild, :roles => :app do
  69	69	rake = fetch(:rake, 'rake')
  70	70	rails_env = fetch(:rails_env, 'production')
  71	71	indexes = fetch(:ferret_indexes, nil)

• /trunk/plugin/acts_as_ferret/tasks/ferret.rake

  ......	@@ -5,8 +5,8 @@
  5	5	#
  6	6	# INDEXES="my_model shared" rake ferret:rebuild
  7	7	desc "Rebuild a Ferret index. Specify what model to rebuild with the MODEL environment variable."
  8		task :rebuild do
  9		require File.join(RAILS_ROOT, 'config', 'environment')
  	8	task :rebuild => :environment do
  	9	#require File.join(RAILS_ROOT, 'config', 'environment')
  10	10
  11	11	indexes = ENV['INDEXES'].split
  12	12	indexes.each do |index_name|