@@ -5,13 +5,4 @@ class Shout < ActiveRecord::Base belongs_to :company belongs_to :user - def self.full_text_search(q, options = {}) - return nil if q.nil? or q=="" - default_options = {:limit => 20, :page => 1} - options = default_options.merge options - options[:offset] = options[:limit] * (options.delete(:page).to_i-1) - results = WorkLog.find_with_ferret(q, options) - return [results.total_hits, results] - end - end app/models/shout.rb @@ -592,15 +592,6 @@ class Task < ActiveRecord::Base find_by_sql(sql) end - def self.full_text_search(q, options = {}) - return nil if q.nil? or q=="" - default_options = {:limit => 20, :page => 1} - options = default_options.merge options - options[:offset] = options[:limit] * (options.delete(:page).to_i-1) - results = Task.find_with_ferret(q, options) - return [results.total_hits, results] - end - def self.search(user, keys) tf = TaskFilter.new(:user => user) app/models/task.rb @@ -60,15 +60,6 @@ class WorkLog < ActiveRecord::Base } - def self.full_text_search(q, options = {}) - return nil if q.nil? or q=="" - default_options = {:limit => 10, :page => 1} - options = default_options.merge options - options[:offset] = options[:limit] * (options.delete(:page).to_i-1) - results = WorkLog.find_with_ferret(q, options) - return [results.total_hits, results] - end - ### # Creates and saves a worklog for the given task. # If comment is given, it will be escaped before saving. app/models/work_log.rb @@ -177,10 +177,6 @@ File.open("config/juggernaut_config.yml", "w") do |file| file.puts jug end -puts " Creating config/ferret_server.yml" -system("cp config/ferret_server.yml-example config/ferret_server.yml") -puts - puts "Creating directories..." puts " log..." @@ -297,7 +293,6 @@ puts "---------" puts puts "Please start the required services by entering the following in a console:" -puts " ./script/ferret_server -e production start" puts " nohup ./script/push_server &" puts "Make sure passenger and apache httpd are properly set up and a virtual host defined." puts setup.rb config/ferret_server.yml-example 1a5fe33ac93f535990a4e8491c059e4580212032 Ari Maniatis ari@ish.com.au http://github.com/ari/clockingit/commit/11edf1b532c2ed1fe74fe36f2d254135e84acbbb 11edf1b532c2ed1fe74fe36f2d254135e84acbbb 2009-10-17T19:16:15-07:00 2009-10-17T19:16:15-07:00 Remove leftover ferret bits. 507e96512db507cce6f1393334b17ee6dbe300ef Ari Maniatis ari@ish.com.au