Made content take precedence over anything else

Content usually contains the full entry, summary and description are
truncated.

django_website/aggregator/models.py

@@ -124,14 +124,19 @@ def feed_updated(sender, notification, **kwargs):
             log.error("Feed ID %s has an entry ('%s') without a link or guid. Skipping.", feed.id, title)
         link = getattr(entry, "link", guid)
 
+        content = u''
         if hasattr(entry, "summary"):
             content = entry.summary
-        elif hasattr(entry, "content"):
-            content = entry.content[0].value
-        elif hasattr(entry, "description"):
+
+        if hasattr(entry, "description"):
             content = entry.description
-        else:
-            content = u""
+
+        # 'content' takes precedence on anything else. 'summary' and
+        # 'description' are usually truncated so it's safe to overwrite them
+        if hasattr(entry, "content"):
+            content = u''
+            for item in entry.content:
+                content += item.value
 
         if entry.has_key('updated_parsed'):
             date_modified = datetime.datetime(*entry.updated_parsed[:6])