[scotedublog commit] r162 - trunk/seb/app/models

[codesite...@google.com]

Author: jonesieboy
Date: Sat Apr 26 07:15:29 2008
New Revision: 162

Modified:
trunk/seb/app/models/feed.rb

Log:
improving performance by simplifying creation of default global rss feed.

Modified: trunk/seb/app/models/feed.rb
==============================================================================
--- trunk/seb/app/models/feed.rb (original)
+++ trunk/seb/app/models/feed.rb Sat Apr 26 07:15:29 2008
@@ -134,11 +134,15 @@
end

def Feed.items_from_filtered_feeds(tags, authority, combinetype,
sortby, searchtext)
- items=[]
- Feed.filtered_feeds(tags, authority, combinetype, sortby,
searchtext).each do |feed|
- items=items+feed.live_items
+ if tags || authority || sortby ||searchtext
+ items=[]
+ Feed.filtered_feeds(tags, authority, combinetype, sortby,
searchtext).each do |feed|
+ items=items+feed.live_items
+ end
+ return items.sort_by{|i| i.pubDate}.reverse[0..20]
+ else
+ return Item.find(:all, :order=>"pubDate DESC", :limit=>21)
end
- return items.sort_by{|i| i.pubDate}.reverse[0..20]
end

def pubDate_from_items