[Logilogi-svn] SF.net SVN: logilogi: [294] projects/ogog/trunk/app/models/feed.rb

Revision: 294
          http://logilogi.svn.sourceforge.net/logilogi/?rev=294&view=rev
Author:   wybow
Date:     2007-05-20 15:56:38 -0700 (Sun, 20 May 2007)

Log Message:
-----------
Fixed a small bug, unparsable begin-rescue now encloses entire resolve.

Modified Paths:
--------------
    projects/ogog/trunk/app/models/feed.rb

Modified: projects/ogog/trunk/app/models/feed.rb
===================================================================
--- projects/ogog/trunk/app/models/feed.rb	2007-05-20 22:28:17 UTC (rev 293)
+++ projects/ogog/trunk/app/models/feed.rb	2007-05-20 22:56:38 UTC (rev 294)
@@ -68,44 +68,44 @@
     if !self.bad?
       begin
         f = FeedTools::Feed.open(self.url)
-      rescue
-        self.status = NOT_PARSABLE
-      end
-      if self.title != f.title
-        self.title = f.title
-      end
-      if self.site_url != f.link
-        self.site_url = f.link
-      end
-      if self.title.nil?
-        self.status = NO_TITLE
-      end
-      if self.site_url.nil?
-        self.status = NO_SITE_URL
-      end
-      if !self.bad? and f.items.detect {|i| i.published.nil?}
-        self.status = NO_PUBLISH_DATE
-      end
-      if !self.bad?
-        f.items.select {|i| !self.harvested_publication_time or 
-            i.published > self.harvested_publication_time}.sort_by {|i| i.published}.each do |new_item|
-          if !self.bad?
-            p = Post.new(:feed => self, :title => new_item.title, :body => new_item.content, 
-                :url => new_item.link, :published_at => new_item.published.utc)
-            if p.published_at > Time.now + 1.day
-              self.status = FUTURE_DATE
+        if self.title != f.title
+          self.title = f.title
+        end
+        if self.site_url != f.link
+          self.site_url = f.link
+        end
+        if self.title.nil?
+          self.status = NO_TITLE
+        end
+        if self.site_url.nil?
+          self.status = NO_SITE_URL
+        end
+        if f.items.detect {|i| i.published.nil?}
+          self.status = NO_PUBLISH_DATE
+        end
+        if !self.bad?
+          f.items.select {|i| !self.harvested_publication_time or 
+              i.published > self.harvested_publication_time}.sort_by {|i| i.published}.each do |new_item|
+            if !self.bad?
+              p = Post.new(:feed => self, :title => new_item.title, :body => new_item.content, 
+                  :url => new_item.link, :published_at => new_item.published.utc)
+              if p.published_at > Time.now + 1.day
+                self.status = FUTURE_DATE
+              end
+              if !p.valid? 
+                self.status = INCOMPLETE_POSTS
+              end 
             end
-            if !p.valid? 
-              self.status = INCOMPLETE_POSTS
-            end 
+            if !self.bad?
+              p.save
+              p.set_tags(Feed.get_item_tags(new_item) + self.tag_strings)
+              # At least one tag is set, guaranteed...
+              self.harvested_publication_time = p.published_at
+            end
           end
-          if !self.bad?
-            p.save
-            p.set_tags(Feed.get_item_tags(new_item) + self.tag_strings)
-            # At least one tag is set, guaranteed...
-            self.harvested_publication_time = p.published_at
-          end
         end
+      rescue
+        self.status = NOT_PARSABLE
       end
       self.save
     end


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.