X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/72fac53a4cd42e6c9f56a581a85f8b47ba61b2ac..1d3756407233b937d7491bde6dd4046fb8b4b6d6:/views.py

diff --git a/views.py b/views.py
index 5e4b7dd..b3e2a74 100644
--- a/views.py
+++ b/views.py
@@ -1,19 +1,57 @@
+from django.contrib.sites.models import Site
+from django.conf import settings
 from django.http import Http404, HttpResponse
 from django.template import RequestContext
-from django.contrib.sites.models import Site
-from models import Node
+from django.views.decorators.vary import vary_on_headers
+from philo.models import Node
 
 
+@vary_on_headers('Accept')
 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:
+		if settings.DEBUG:
+			raise
+		
+		try:
+			Http404View = node.relationships['Http404']
+		except KeyError:
+			Http404View = None
+		
+		if not Http404View:
+			raise e
+		
+		extra_context = {'exception': e}
+		
+		return Http404View.render_to_response(node, request, path, subpath, extra_context)
+	except Exception, e:
+		if settings.DEBUG:
+			raise
+		
+		try:
+			Http500View = node.relationships['Http500']
+			
+			if not Http500View:
+				raise e
+			
+			extra_context = {'exception': e}
+			
+			return Http500View.render_to_response(node, request, path, subpath, extra_context)
+		except:
+			raise e
\ No newline at end of file