X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=XHTMLWriter.py;h=b9cfcba0273200f1428e4f9242d698276d7e8e40;hb=c0da12e3d57fa8ec00cf4e403c463e2ea7c028a8;hp=3ef84c9e77d4609883ab7775b0f05b51ebf95f57;hpb=7c1189be656d2ab9f484d9d0f1ab1b8f287de4c8;p=planet-ucc.git
diff --git a/XHTMLWriter.py b/XHTMLWriter.py
index 3ef84c9..b9cfcba 100644
--- a/XHTMLWriter.py
+++ b/XHTMLWriter.py
@@ -17,15 +17,16 @@ class XHTMLWriter:
def __write_item__(self, item):
output = ''
output += '
\n'
- output += '
%s: %s
\n' % (item.blogTitle, item.itemTitle)
+ output += '
\n' % (item.blogURL, item.blogTitle, item.blogName,
+ item.itemURL, item.itemTitle)
output += '
\n'
if item.imageURL:
- output += '\n' % (item.imageLink, item.imageURL, item.blogTitle)
- output += '(%s)\n' % (item.itemURL ,time.strftime('%A %B %d, %Y %H:%M AWST', time.localtime(item.itemDate)))
+ output += '\n' % (item.imageLink, item.imageURL, item.blogName)
+ output += '(%s)\n' % (item.itemURL ,time.strftime('posted on %A %B %d, %Y at %H:%M AWST', time.localtime(item.itemDate)))
output += '
\n'
- output += '
\n'
+ output += '
\n'
output += item.contents
- output += '\n\n'
+ output += '\n
\n'
output += '
\n'
return output
@@ -62,7 +63,7 @@ class XHTMLWriter:
blogscopy = self.parent.blogs + []
blogscopy.sort(self.__blog_sort__)
for blog in blogscopy:
- output += '%s (feed)
\n' % (blog.blogURL, blog.blogTitle, blog.feedURL)
+ output += '%s (feed)
\n' % (blog.blogURL, blog.blogName, blog.feedURL)
output += '\n'
output += '\n'
output += '\n'
@@ -89,7 +90,7 @@ class XHTMLWriter:
return output
def __blog_sort__(self, blog1, blog2):
- name1, name2 = blog1.blogTitle.split(' ')[-1], blog2.blogTitle.split(' ')[-1]
+ name1, name2 = blog1.blogName.split(' ')[-1], blog2.blogName.split(' ')[-1]
if name1 < name2: return -1
if name1 == name2: return 0
if name1 > name2: return 1