--- a/lib/filesystem/map.py	Sat Feb 07 16:55:23 2009 +0200
+++ b/lib/filesystem/map.py	Sat Feb 07 17:07:06 2009 +0200
@@ -3,7 +3,7 @@
 
 from lib import http, template, map
 
-import page, page_tree, menu
+import page, page_tree
 
 class FilesystemMapper (map.Mapper) :
     """
@@ -113,20 +113,8 @@
         page_name = request.get_page_name()
 
         # get the page handler
-        p = self._lookup_page(page_name)
-
-        # bind to request
-        p.bind_request(request)
+        page = self._lookup_page(page_name)
+        
+        # pass on
+        return page.handle_request(request)
 
-        # render the template
-        response_data = template.render(self.template,
-            site_root_url   = request.get_script_dir(),
-            site_page_url   = request.get_page_prefix(),
-            page            = p,
-            menu            = menu.Menu(self, p),
-        )
-        
-        # return the response
-        return http.Response(response_data)
-
-