From 746f00972ae65ecfeeed6d342b356b81daa2a067 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 13 Jul 2012 01:14:43 +0530 Subject: [PATCH] fixes in blog feed --- py/webnotes/cms/feed.py | 18 ++---------------- wnf.py | 8 ++++++++ 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/py/webnotes/cms/feed.py b/py/webnotes/cms/feed.py index f1fdf6e583..18195d15e0 100644 --- a/py/webnotes/cms/feed.py +++ b/py/webnotes/cms/feed.py @@ -62,10 +62,11 @@ def generate(): where cache.doc_type = 'Blog' and blog.page_name = cache.name order by published desc, modified desc, name asc limit 100""", as_dict=1) + import website.blog for blog in blog_list: blog['link'] = host + '/' + blog['name'] + '.html' - blog['content'] = get_content(blog['name']) + blog['content'] = website.blog.get_blog_content(blog['name']) items += rss_item % blog @@ -79,18 +80,3 @@ def generate(): 'items': items, 'link': host + '/blog.html' }).encode('utf-8', 'ignore') - -def get_content(page_name): - import website.web_cache - content = website.web_cache.get_html(page_name) - - import webnotes.utils - - content = content.split("") - content = len(content) > 1 and content[1] or content[0] - - content = content.split("") - content = content[0] - - content = webnotes.utils.escape_html(content) - return content \ No newline at end of file diff --git a/wnf.py b/wnf.py index b782e32d4c..9f62efe4e6 100755 --- a/wnf.py +++ b/wnf.py @@ -111,6 +111,10 @@ def setup_options(): # build parser.add_option("-b", "--build", default=False, action="store_true", help="minify + concat js files") + + parser.add_option("--build_web_cache", default=False, action="store_true", + help="build web cache") + parser.add_option("--domain", metavar="DOMAIN", help="store domain in Website Settings", nargs=1) @@ -297,6 +301,10 @@ def run(): webnotes.conn.set_value('Website Settings', None, 'subdomain', options.domain) webnotes.conn.commit() print "Domain set to", options.domain + + elif options.build_web_cache: + import website.web_cache + website.web_cache.refresh_cache(True) # print messages if webnotes.message_log: