X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=XMLParse2.py;h=861b33322de0bd19c79489eea21da4369b5fc9a7;hb=dc7db379d1b11f9de8894865689f1c626d62a523;hp=e33858080355372bc456312542f62e2ef9b74e61;hpb=96388a504cd19fb9bdc93016d7c089ac59ec5086;p=planet-ucc.git

diff --git a/XMLParse2.py b/XMLParse2.py
index e338580..861b333 100644
--- a/XMLParse2.py
+++ b/XMLParse2.py
@@ -13,8 +13,11 @@ 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.blogName	= None
 		self.blogTitle	= None
 		self.blogURL	= None
 		self.feedURL	= None
@@ -45,7 +48,6 @@ class XMLParse:
 				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 +64,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'):