Merge branch 'master' of git://git.savannah.nongnu.org/smc

1 files changed, 10 insertions, 26 deletions

diff --git a/silpa/index.py b/silpa/index.py
index ccffe09..a19b97b 100755
--- a/silpa/index.py
+++ b/silpa/index.py
@@ -1,47 +1,31 @@
-#!/usr/bin/python
+#!/home/smcweb/bin/python
 # -*- coding: utf-8 -*-
-
 from common import *
 from utils import *
 import traceback
 import cgitb
 import cgi
-cgitb.enable()
+cgitb.enable(True, "logs/")
 def index(form):
+	action=None
 	if(form.has_key('action')):
 		action=form['action'].value	
-	else:	
-		action=None
 	handleStats()	
 	response=SilpaResponse()
 	if(action):
-		module_manager=ModuleManager()
 		action=action.replace(" ","_")
+		#static content?
 		if action.endswith('.html') or action.endswith('.htm'):
-			response.setBreadcrumb(None)
 			response.setContent(getStaticContent(action))
-			response.setErrorMessage(None)	
-			response.setSuccessMessage(None)		
+			return response.toString()
 		else:	
+			module_manager=ModuleManager()
 			module_instance =  module_manager.getModuleInstance(action)
 			if(module_instance):
-				response.setBreadcrumb(module_instance.get_module_name())
-				response.setContent(module_instance.process(form))
-				response.setErrorMessage(module_instance.get_errormessage())
-				response.setSuccessMessage(module_instance.get_successmessage())
-			else:
-				response.setBreadcrumb("Coming Soon")	
-				response.setErrorMessage("Module not available")	
-				response.setContent(None)
-				response.setSuccessMessage(None)
-	else: #index
-		module_manager=ModuleManager()
-		response.setBreadcrumb("Welcome")	
-		response.setErrorMessage(None)	
-		response.setContent(module_manager.getModulesInfoAsHTML())
-		response.setSuccessMessage(None)		
-	return response.toString();
-	
+				response= module_instance.process(form, response)
+				return response.toString()
+	else:
+		return response.toString()				
 if __name__ == '__main__':
 	print "Content-Type: text/html\n\n"
 	print index(cgi.FieldStorage()).encode('utf-8')