X-Git-Url: https://git.ucc.asn.au/?p=planet-ucc.git;a=blobdiff_plain;f=update-planet;h=7f31e5279f859208f4137323de8e941a82f7a7d9;hp=c4477ffdf8600b932b75752947cce758defa0741;hb=2a563de3bcc327fa440671db368a261d70e9114b;hpb=82aa14dc6dfc6cfb8449d8d0d4ea18ae1a51cadb

diff --git a/update-planet b/update-planet
index c4477ff..7f31e52 100755
--- a/update-planet
+++ b/update-planet
@@ -12,7 +12,7 @@ import sys, codecs
 # planetUCC modules
 import XMLParse2 as XMLParse, XMLWriter, CacheHandler
 # planetUCC output plugins
-import XHTMLWriter, RSS2Writer, RSS1Writer
+import XHTMLWriter, RSS2Writer, RSS1Writer, FOAFWriter, OPMLWriter
 
 # step 1: read in the config and check each object from cache
 cache	= CacheHandler.CacheHandler()
@@ -34,21 +34,19 @@ for feed in feeds:
 	# XMLParse2 takes two paramaters, a URL and a CacheObject
 	blog	= XMLParse.XMLParse(feed[1], feed[2]).parse()
 	if blog:
-		blog.blogTitle	= feed[0]
+		blog.blogName	= feed[0]
 		blog.feedURL	= feed[1]
 		blogs.append(blog)
 		# check the old copy of the cache, vs the new copy
-		if not feed[2] or not feed[2].cache or not blog or not blog.cache or feed[2].cache != blog.cache:
+		if not feed[2] or not feed[2].cache or not blog.cache or feed[2].cache != blog.cache:
 			tainted	= True
+		elif len(blog.items) > 0 and len(feed[2].items) > 0 and (blog.items[0].itemTitle != feed[2].items[0].itemTitle or blog.items[0].contents != feed[2].items[0].contents):
+			tainted = True
 		# write the cache back down to disk
 		cache.storeBlog(blog)
 	else:
 		pass
 
-if not tainted:
-	sys.stdout.write('PlanetUCC: no objects have changed in the cache, not updating\n')
-	sys.exit(1)
-
 # step 3: sift the feeds
 xmlwriter	= XMLWriter.XMLWriter(blogs)
 
@@ -57,6 +55,7 @@ try:
 	codecs.open('planet.html', 'wb', 'utf-8').write(xmlwriter.write(XHTMLWriter.XHTMLWriter))
 except:
 	sys.stderr.write('DEBUG: update-planet: could not write planet.html, aborting\n')
+	raise
 
 try:
 	codecs.open('rss2.xml', 'wb', 'utf-8').write(xmlwriter.write(RSS2Writer.RSS2Writer))
@@ -67,3 +66,19 @@ try:
 	codecs.open('rss1.xml', 'wb', 'utf-8').write(xmlwriter.write(RSS1Writer.RSS1Writer))
 except:
 	sys.stderr.write('DEBUG: update-planet: could not write rss1.xml, aborting\n')
+
+try:
+	codecs.open('foaf.xml', 'wb', 'utf-8').write(xmlwriter.write(FOAFWriter.FOAFWriter))
+except:
+	sys.stderr.write('DEBUG: update-planet: could not write foaf.xml, aborting\n')
+
+try:
+	codecs.open('opml.xml', 'wb', 'utf-8').write(xmlwriter.write(OPMLWriter.OPMLWriter))
+except:
+	sys.stderr.write('DEBUG: update-planet: could not write opml.xml, aborting\n')
+
+
+if not tainted:
+	sys.stdout.write('PlanetUCC: no objects have changed in the cache, not updating\n')
+	sys.exit(1)
+