Added philo 404 handling via a relationship named Http404 on nodes. Uses the passthro...

[philo.git] / views.py

diff --git a/views.py b/views.py
index 5e4b7dd..5e4c9c9 100644 (file)
--- a/views.py
+++ b/views.py
@@ -1,19 +1,32 @@
 from django.http import Http404, HttpResponse
 from django.template import RequestContext
 from django.contrib.sites.models import Site
-from models import Node
+from philo.models import Node
 
 
 def node_view(request, path=None, **kwargs):
        node = None
+       subpath = None
        if path is None:
                path = '/'
+       current_site = Site.objects.get_current()
        try:
-               current_site = Site.objects.get_current()
-               if current_site:
-                       node = Node.objects.get_with_path(path, root=current_site.root_node)
+               node, subpath = Node.objects.get_with_path(path, root=current_site.root_node, absolute_result=False)
        except Node.DoesNotExist:
                raise Http404
        if not node:
                raise Http404
-       return node.instance.render_to_response(request, path=path)
+       try:
+               if subpath and not node.accepts_subpath:
+                       raise Http404
+               return node.render_to_response(request, path=path, subpath=subpath)
+       except Http404, e:
+               try:
+                       Http404View = node.relationships['Http404']
+               except KeyError:
+                       Http404View = None
+               
+               if not Http404View:
+                       raise e
+               
+               return Http404View.render_to_response(node, request, path, subpath)
\ No newline at end of file