X-Git-Url: https://git.njae.me.uk/?a=blobdiff_plain;f=app%2Fcontrollers%2Ffeed_controller.rb;h=8e89663852aa502a7da8eead64a9726e22dc928c;hb=0c831f9107670526c653c82f182b0b6983f49c31;hp=819dab13c0dd344c376e38f73d544ba9a2fea61e;hpb=9afca4a2a5790ed8842a7e5f0a3a3c716d28bb24;p=feedcatcher.git

diff --git a/app/controllers/feed_controller.rb b/app/controllers/feed_controller.rb
index 819dab1..8e89663 100644
--- a/app/controllers/feed_controller.rb
+++ b/app/controllers/feed_controller.rb
@@ -1,9 +1,10 @@
 class FeedController < ApplicationController
-
+  
   skip_before_filter :verify_authenticity_token
 
   def index
-    @feeds = FeedItem.find(:all, :select => 'DISTINCT feed_name')
+    # @feeds = FeedItem.find(:all, :select => 'DISTINCT feed_name')
+    @feeds = FeedItem.select(:feed_name).distinct
     respond_to do |format|
       format.html
       format.rss { render :layout => false }
@@ -13,11 +14,11 @@ class FeedController < ApplicationController
   
   def show
     if FeedItem::valid_feed_name?(params[:feed_name])
-      @feed_items = FeedItem.find_all_by_feed_name(params[:feed_name])
       @feed_name = params[:feed_name]
+      @feed_items = FeedItem.in_feed(@feed_name)
       respond_to do |format|
         if @feed_items == []
-          flash[:notice] = "No items in feed #{params[:feed_name]}"
+          flash[:notice] = "No items in feed #{@feed_name}"
           format.html { redirect_to index_url }
           format.rss  { render :layout => false }
         else
@@ -37,9 +38,9 @@ class FeedController < ApplicationController
 
   def update
     if FeedItem::valid_feed_name?(params[:feed_name])
-      item = FeedItem.find_by_feed_name_and_title(params[:feed_name], params[:title])
+      item = FeedItem.in_feed(params[:feed_name]).entitled(params[:title]).take
       if item
-        if params[:description] == ''
+        if params[:description].empty?
           destroy_item(item)
         else
           update_item(item)