cleaner web cache code

public/web.py

@@ -1,5 +1,21 @@
 #!/usr/bin/env python
 
+# ERPNext - web based ERP (http://erpnext.com)
+# Copyright (C) 2012 Web Notes Technologies Pvt Ltd
+# 
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 """
 return a dynamic page from website templates
 
@@ -37,34 +53,27 @@ def respond():
 	print
 	print html.encode('utf-8')
 
-def scrub_page_name(page_name):
-	if page_name.endswith('.html'):
-		page_name = page_name[:-5]
-	return page_name
-
 def get_html(page_name):
-	import webnotes
+	import website.utils
+	page_name = website.utils.scrub_page_name(page_name)
+	
+	comments = get_comments(page_name)
+	
 	import website.web_cache
-	page_name = scrub_page_name(page_name)
-	
-	if page_name == '404':
-		traceback = webnotes.getTraceback()
-		
-		# script is used to display traceback in error console
-		args = {
-			'comments': """error: %s""" % traceback,
-			'template': '404.html',
-		}
-	else:
-		args = {
-			'comments': """page: %s""" % page_name,
-			'template': 'page.html',
-		}
-	
-	html = website.web_cache.load_from_web_cache(page_name, **args)
+	html = website.web_cache.get_html(page_name, comments)
 	
 	return html
 
+def get_comments(page_name):
+	import webnotes
+	
+	if page_name == '404':
+		comments = """error: %s""" % webnotes.getTraceback()
+	else:
+		comments = """page: %s""" % page_name
+		
+	return comments
+
 if __name__=="__main__":
 	init()
-	respond()
+	respond()