[#18] Replace Article#search_tank with guarded #search wrapper.

If Searchify is down or otherwise inaccessible, the world ends. This
stops the world ending and returns an empty result set.

app/controllers/search_controller.rb

@@ -18,7 +18,7 @@ def index
     # expand the query
     query_final = Article.expand_query( query )
     # perform the search
-    @results = Article.search_tank( query_final)#, :conditions => { :status => 'Published' } )
+    @results = Article.search(query_final)
     # Log the search results
     puts "search-request: IP:#{request.env['REMOTE_ADDR']}, params[:query]:#{query}, QUERY:#{query_final}, FIRST_RESULT:#{@results.first.title unless @results.empty?}, RESULTS_N:#{@results.size}" 
 

app/models/article.rb

@@ -78,13 +78,12 @@ def self.find_by_friendly_id( friendly_id )
   end
 
   def self.search( query )
-    return Article.all if query == '' or query == ' '
-    self.search_tank query
-  end
-
-  def self.search_titles( query )
-    return Article.all if query == '' or query == ' '
-    self.search_tank( '__type:Article', :conditions => {:title => query })
+    begin
+      self.search_tank query
+    rescue SocketError
+      logger.error "Could not communicate with IndexTank service"
+      []
+    end
   end
 
   def self.find_by_type( content_type )
@@ -194,7 +193,7 @@ def self.expand_query( query )
   def related
     Rails.cache.fetch("#{self.id}-related") {
       return [] if wordcounts.empty?
-      (Article.search_tank(self.wordcounts.all(:order => 'count DESC', :limit => 10).map(&:keyword).map(&:name).join(" OR ")) - [self]).first(4)
+      (Article.search(self.wordcounts.all(:order => 'count DESC', :limit => 10).map(&:keyword).map(&:name).join(" OR ")) - [self]).first(4)
     }
   end