X-Git-Url: https://git.ucc.asn.au/?p=planet-ucc.git;a=blobdiff_plain;f=RSS1Writer.py;h=9609e74d1c8f906243b5384d7cad9c884e34bbed;hp=571998c837634bffbcd3550fb38c15fb856ff11c;hb=450a7bfdaba8430a03cc88fb67b29ce40801a2dd;hpb=3aa35195b2db5f7ef8afccee85e7c4ed784ca934

diff --git a/RSS1Writer.py b/RSS1Writer.py
index 571998c..9609e74 100644
--- a/RSS1Writer.py
+++ b/RSS1Writer.py
@@ -2,12 +2,11 @@
 # RSS1Writer
 #
 # A plugin to XMLWriter to output RSS version 1.0.
-# This plugin has been developed with no regard for the RSS1.0 spec.
 #
 # (c) 2004, Davyd Madeley <davyd@ucc.asn.au>
 #
 
-import time
+import time, cgi
 
 class RSS1Writer:
 	def __init__(self, planet):
@@ -18,22 +17,22 @@ class RSS1Writer:
 	def __write_item__(self, item):
 		output	=	''
 		output	+=	'<item rdfAbout="%s">\n' % item.itemURL
-		output	+=	' <title>%s: %s</title>\n' % (item.blogTitle, item.itemTitle)
+		output	+=	' <title>%s: %s</title>\n' % (item.blogName, item.itemTitle)
 		output	+=	' <link>%s</link>\n' % item.itemURL
-		output	+=	' <content:encoded>\n'
-		output	+=	item.contents
-		output	+=	'\n </content:encoded>\n'
-		output	+=	' <dc:date>%s</dc:date>\n' % time.strftime('%Y-%m-%dT%H:%M:%S+00:00', time.gmtime(item.itemDate))
+		output	+=	' <description>\n'
+		output	+=	cgi.escape(item.contents)
+		output	+=	'\n </description>\n'
+		output	+=	' <dc:date>%s</dc:date>\n' % time.strftime('%Y-%m-%dT%H:%M:%S+08:00', time.gmtime(item.itemDate))
 		output	+=	'</item>\n'
 		return output
 	
 	def write(self):
 		itemcount	= 0
-		output	=	'<rss version="1.0\n'
+		output	=	''
+		output	+=	'<rdf:RDF>\n'
+		output	+=	' xmlns="http://purl.org/rss/1.0/"\n'
 		output	+=	' xmlns:dc="http://purl.org/dc/elements/1.1/"\n'
-		output	+=	' xmlns:content="http://purl.org/rss/1.0/modules/content/">\n'
 		output	+=	' xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">\n'
-		output	+=	'<rdf:RDF>\n'
 		output	+=	' <channel>\n'
 		output	+=	'  <title>Planet UCC</title>\n'
 		output	+=	'  <link>http://planet.ucc.asn.au/</link>\n'
@@ -42,7 +41,7 @@ class RSS1Writer:
 		for blog in self.parent.blogs:
 			output	+=	'    <rdf:li rdf:resource="%s" />\n' % blog.feedURL
 		output	+=	'   </rdf:Seq>\n'
-		output	+=	'  <items>\n'
+		output	+=	'  </items>\n'
 		output	+=	' </channel>\n'
 		for date in self.planet:
 			for item in date.items:
@@ -52,6 +51,5 @@ class RSS1Writer:
 					break
 			if itemcount >= self.maxitems:
 				break
-		output	+=	'</rdf:RDF>\n'
-		output	+=	'</rss>'
+		output	+=	'</rdf:RDF>'
 		return output