diff options
author | Wade Brainerd <wadetb@gmail.com> | 2008-05-28 07:26:16 (GMT) |
---|---|---|
committer | Wade Brainerd <wadetb@gmail.com> | 2008-05-28 07:26:16 (GMT) |
commit | 1959c19d604def3e340566aae54517f1449be2f5 (patch) | |
tree | 9e3cdfb105eef259c9de3edd61b7aaac09788397 | |
parent | 0aa16140b4f45ab030544409e5473605a3f696a8 (diff) |
Allow override to be displayed expanded, unexpanded.
-rwxr-xr-x | server.py | 23 |
1 files changed, 11 insertions, 12 deletions
@@ -103,11 +103,12 @@ class WPWikiDB: def getTemplate(self, title, followRedirects=False): return self.getRawArticle(title) - def getExpandedArticle(self, title): - article_text = self.getRawArticle(title) + def expandArticle(self, article_text, title): template_expander = expander.Expander(article_text, pagename=title, wikidb=self) - article_text = template_expander.expandTemplates() - return article_text + return template_expander.expandTemplates() + + def getExpandedArticle(self, title): + return self.expandArticle(self.getRawArticle(title), title) class WPImageDB: """Retrieves images for mwlib.""" @@ -428,19 +429,17 @@ class WikiRequestHandler(SimpleHTTPRequestHandler): def get_wikitext(self, title): wikidb = WPWikiDB() article_text = wikidb.getRawArticle(title) - - # Pass ?noexpand=1 in the url to disable template expansion. - if self.params.get('noexpand', 0): - article_text = wikidb.getRawArticle(title) - else: - article_text = wikidb.getExpandedArticle(title) # Pass ?override=1 in the url to replace wikitext for testing the renderer. if self.params.get('override', 0): - override = open('override.txt', 'r') - article_text = unicode(override.read(), 'utf8') + override = codecs.open('override.txt', 'r', 'utf-8') + article_text = override.read() override.close() + # Pass ?noexpand=1 in the url to disable template expansion. + if not self.params.get('noexpand', 0): + article_text = wikidb.expandArticle(article_text, title) + return article_text def write_wiki_html(self, htmlout, title, article_text): |