X-Git-Url: https://git.ucc.asn.au/?p=planet-ucc.git;a=blobdiff_plain;f=XMLWriter.py;h=80270b29cafbfe5b3d209224a286bbc8c52c8eca;hp=1311fb68631723a1ab03defcde68c5f3fffaa6d2;hb=ff671f12215752898909c43c32f8ffa059845eb2;hpb=b2d7ed4b39a5a03fb8f264e26b0d04a502928ddf diff --git a/XMLWriter.py b/XMLWriter.py index 1311fb6..80270b2 100644 --- a/XMLWriter.py +++ b/XMLWriter.py @@ -60,7 +60,8 @@ class Planet: if lastItem == None: break # this checks to see if it's a new day - if time.localtime(lastItem.itemDate) != lastDate: + if time.localtime(lastItem.itemDate)[6] != lastDate: + lastDate = time.localtime(lastItem.itemDate)[6] workingDate = PlanetDate(lastItem.itemDate) self.dates.append(workingDate) # append the item to the current date @@ -71,10 +72,12 @@ class Planet: class XMLWriter: def __init__(self, doctype, bloglist): + self.blogs = bloglist self.planet = Planet(bloglist) self.items = self.planet.sort() # doctype should be something like XMLWriter.XHTMLWriter - self.writer = doctype(self.items) + self.writer = doctype(self.items) + self.writer.parent = self def write(self): output = self.writer.write() @@ -83,18 +86,22 @@ class XMLWriter: class XHTMLWriter: def __init__(self, planet): self.planet = planet - self.maxitems = 100 + self.maxitems = 50 + self.parent = None def __write_item__(self, item): output = '' - output += '
\n' + output += '
\n' output += '

%s: %s

\n' % (item.blogTitle, item.itemTitle) output += '

\n' - output += '(%s)\n' % time.strftime('%A %B %d, %Y %H:%M %Z', time.localtime(item.itemDate)) + if item.imageURL: + output += '%s\n' % (item.imageLink, item.imageURL, item.blogTitle) + output += '(%s)\n' % (item.itemURL ,time.strftime('%A %B %d, %Y %H:%M %Z', time.localtime(item.itemDate))) output += '

\n' output += '

\n' output += item.contents output += '\n

\n' + output += '
\n' return output def write(self): @@ -105,10 +112,33 @@ class XHTMLWriter: output += '\n' output += '\n' output += 'Planet UCC\n' - # XXX: we'll want a style sheet in here + output += '\n' + output += '\n' output += '\n' output += '\n' - # XXX: we want some stuff in here, I'm sure + output += '
\n' + try: + output += open('header.html').read() + except: + pass + output += '
\n' + output += '
\n' + try: + output += open('sidebar.html').read() + except: + pass + output += '

Last Updated

\n' + output += '

\n' + output += '%s\n' % time.strftime('%A %B %d, %Y %H:%M', time.localtime()) + output += '

\n' + if self.parent: + output += '

Feeds

\n' + output += '

\n' + for blog in self.parent.blogs: + output += '%s
\n' % (blog.blogURL, blog.blogTitle) + output += '

\n' + output += '
\n' + output += '
\n' for date in self.planet: output += '

%s

\n' % time.strftime('%A %B %d, %Y', time.localtime(date.planetDate)) for item in date.items: @@ -120,7 +150,13 @@ class XHTMLWriter: # again, check to see if we've written the maximum number of items if itemcount >= self.maxitems: break - # XXX: we want further stuff here - output += '' + output += '
\n' + output += '
\n' + try: + output += open('footer.html').read() + except: + pass + output += '
\n' + output += '\n' output += '' return output