Added feeds, caching tweaks and sorting feedlist alphabetically

[planet-ucc.git] / XMLParse2.py

diff --git a/XMLParse2.py b/XMLParse2.py
index e5c244d..8f6dc7e 100644 (file)
--- a/XMLParse2.py
+++ b/XMLParse2.py
@@ -38,14 +38,13 @@ class XMLParse:
        def parse(self):
                "Return a single Blog object"
                item            = Blog()
-               if self.blogObject:
+               if self.blogObject and self.blogObject.cache:
                        sys.stdout.write('Downloading feed %s...' % self.feedURL)
                        try:
                                data    = feedparser.parse(self.feedURL, self.blogObject.cache.etag, self.blogObject.cache.date)
                                sys.stdout.write('done.\n')
                        except:
                                sys.stdout.write('failed.\n')
-                               raise
                                return None
                        # check to see what we got returned
                        if data['items'] == [] and data['channel'] == {}:
@@ -87,7 +86,7 @@ class XMLParse:
                        else:
                                blogItem.itemURL        = item.blogURL
                        if entry.has_key('date_parsed'):
-                               blogItem.itemDate       = time.mktime(entry['date_parsed']) + 28000
+                               blogItem.itemDate       = time.mktime(entry['date_parsed']) + 28800
                        else:
                                blogItem.itemDate       = 0
                        if entry.has_key('description'):