--- a/index.cgi	Sat Feb 14 17:59:13 2009 +0200
+++ b/index.cgi	Sat Feb 14 18:41:12 2009 +0200
@@ -1,46 +1,28 @@
 #!/usr/bin/python2.5
-# :set filetype=py encoding=utf8
 
 """
-    CGI implementation
+    CGI mode using qmsk.web.cgi
 """
 
-# CGI handler for WSGI
-import wsgiref.handlers
-
-def cgi_error () :
-    """
-        Dumps out a raw traceback of the current exception to stdout, intended for use from except
+def main () :
     """
-
-    import traceback, sys
-
-    print 'Status: 500 Internal Server Error\r'
-    print 'Content-type: text/plain\r'
-    print '\r'
-
-    traceback.print_exc(100, sys.stdout)
-
-def cgi_main () :
-    """
-        Run in CGI mode
+        Build our wsgi.Application and run
     """
 
     try :
-        from qmsk.web import wsgi
+        from qmsk.web import wsgi, cgi_main
         import urls
 
-        # create handler
-        cgi_handler = wsgiref.handlers.CGIHandler()
-
         # create app
         app = wsgi.Application(urls.mapper)
         
         # run once
-        cgi_handler.run(app)
+        cgi_main.run(app)
 
     except :
-        cgi_error()
+        # display error on stdout
+        cgi_main.error()
     
 if __name__ == '__main__' :
-    cgi_main()
+    main()
+