X-Git-Url: https://git.ucc.asn.au/?p=planet-ucc.git;a=blobdiff_plain;f=XMLParse2.py;h=3a14e2bc808e2af18998c1d838a5d46d002ece00;hp=689fecb07b30bfa686d8902fde9a096de389a598;hb=cf54270e1d8772fd0d4a54170a765cb45092c980;hpb=081de18b6ab54348dab29dea74d374052a333947

diff --git a/XMLParse2.py b/XMLParse2.py
index 689fecb..3a14e2b 100644
--- a/XMLParse2.py
+++ b/XMLParse2.py
@@ -13,6 +13,8 @@ import CacheHandler
 sys.path.insert(0, 'extra')
 import feedparser
 
+feedparser.USER_AGENT = "PlanetUCC/1.0b +http://planet.ucc.asn.au/ %s" % feedparser.USER_AGENT
+
 class Blog:
 	def __init__(self):
 		self.blogTitle	= None
@@ -38,14 +40,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'] == {}:
@@ -62,10 +63,17 @@ class XMLParse:
 		# create caching data
 		try:
 			cache		= CacheHandler.CacheObject()
-			cache.etag	= data['etag']
-			cache.date	= data['modified']
+			try:
+				cache.etag	= data['etag']
+			except:
+				cache.etag	= None
+			try:
+				cache.date	= data['modified']
+			except:
+				cache.date	= None
 			item.cache	= cache
 		except:
+			sys.stderr.write('DEBUG: XMLParse2: cache item generation failed\n')
 			item.cache	= None
 		# parse the return of data into a blog
 		if data['channel'].has_key('title'):