From 33da084705828ef66b20327bf45880816c75ccfc Mon Sep 17 00:00:00 2001
From: Ronald Schaten <ronald@schatenseite.de>
Date: Wed, 27 Mar 2013 20:25:37 +0100
Subject: [PATCH] fixed missing import

---
 atomstrom.py | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/atomstrom.py b/atomstrom.py
index c40ccd5..8c1dfcd 100755
--- a/atomstrom.py
+++ b/atomstrom.py
@@ -3,7 +3,7 @@
 
 from models import Base, Feed, Feedinfo, Entry
 
-from sqlalchemy import create_engine
+from sqlalchemy import create_engine, desc
 from sqlalchemy.orm import sessionmaker
 from datetime import datetime, timedelta
 import feedparser
@@ -143,7 +143,7 @@ def process_feed_entry(session, feed, entry):
         session.commit()
         return 0
     else:
-        print '  new entry <%s>' % entry.title
+#         print '  new entry <%s>' % entry.title
         thisentry = Entry(entry)
         if feed.resolveredirects:
             print '    fetching final link <%s>' % entry.link
@@ -180,16 +180,24 @@ def fetch_single_feed(session, feed):
         nextfetch = (feed.feedinfo.lastfetched + timedelta(minutes=feed.frequency))
         if datetime.now() > nextfetch:
             print 'feed known, fetching...'
-            parser = feedparser.parse(feed.url)
-            fetched = True
-            feed.feedinfo.update(parser)
+            try:
+                parser = feedparser.parse(feed.url)
+                fetched = True
+                feed.feedinfo.update(parser)
+            except:
+                print 'ERROR parsing feed'
+                print sys.exc_info()
         else:
             print 'not fetching before: %s' % nextfetch
     else:
         print 'feed seems to be new, fetching...'
-        parser = feedparser.parse(feed.url)
-        fetched = True
-        feed.feedinfo = Feedinfo(parser)
+        try:
+            parser = feedparser.parse(feed.url)
+            fetched = True
+            feed.feedinfo = Feedinfo(parser)
+        except:
+            print 'ERROR parsing feed'
+            print sys.exc_info()
 
     if fetched:
         print 'processing feed entries:'