X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=XMLParse2.py;fp=XMLParse2.py;h=978b41829b10971a592fc4bc45be45ddc72466cd;hb=a4faa68ff5b4b2fd83a63aa16ab8572f8d9d7cf3;hp=d1ca81445f640223ed0cfff74b20336b29d9dc3e;hpb=c907f1dfe8becd4106a1544366d58b027ac89d2a;p=planet-ucc.git

diff --git a/XMLParse2.py b/XMLParse2.py
index d1ca814..978b418 100644
--- a/XMLParse2.py
+++ b/XMLParse2.py
@@ -31,6 +31,7 @@ class BlogItem:
 		self.itemTitle	= None
 		self.itemDate	= None
 		self.itemURL	= None
+		self.commentsURL = None
 		self.contents	= None
 
 class XMLParse:
@@ -86,6 +87,10 @@ class XMLParse:
 			item.blogURL	= data['channel']['link']
 		else:
 			item.blogURL	= self.feedURL
+		if data['feed'].has_key ('image') and data['feed']['image'].has_key ('url'):
+			item.imageURL	= data['feed']['image']['url']
+		if data['feed'].has_key ('image') and data['feed']['image'].has_key ('link'):
+			item.imageLink	= data['feed']['image']['link']
 		for entry in data['items']:
 			blogItem		= BlogItem()
 			if entry.has_key('title'):
@@ -96,13 +101,16 @@ class XMLParse:
 				blogItem.itemURL	= entry['link']
 			else:
 				blogItem.itemURL	= item.blogURL
-			if entry.has_key('date_parsed'):
-				blogItem.itemDate	= time.mktime(entry['date_parsed']) + 28800
+			if entry.has_key('modified_parsed'):
+				try: blogItem.itemDate	= time.mktime(entry['modified_parsed']) + 28800
+				except: blogItem.itemDate = 0
 			else:
 				blogItem.itemDate	= 0
 			if entry.has_key('description'):
 				blogItem.contents	= entry['description']
 			else:
 				blogItem.contents	= '(entry could not be retrieved)'
+			if entry.has_key ('comments'):
+				blogItem.commentsURL	= entry['comments']
 			item.items.append(blogItem)
 		return item