X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/77910c8b4d5e1661e53f2a0500fa23654b677c4a..2c9037d33f3e9d8d0ff6f7389fcfd68ca11258ed:/views.py?ds=inline

diff --git a/views.py b/views.py
index f086bfd..7aac917 100644
--- a/views.py
+++ b/views.py
@@ -1,22 +1,54 @@
+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 django.views.decorators.vary import vary_on_headers
+from philo.exceptions import MIDDLEWARE_NOT_CONFIGURED
 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 = '/'
-	try:
-		current_site = Site.objects.get_current()
-		if current_site:
-			node, subpath = Node.objects.get_with_path(path, root=current_site.root_node, absolute_result=False)
-	except Node.DoesNotExist:
+	if not hasattr(request, 'node'):
+		raise MIDDLEWARE_NOT_CONFIGURED
+	
+	if not request.node:
 		raise Http404
-	if not node:
-		raise Http404
-	if subpath and not node.instance.accepts_subpath:
-		raise Http404
-	return node.instance.render_to_response(request, path=path, subpath=subpath)
+	
+	node = request.node
+	subpath = request.node.subpath
+	
+	try:
+		if subpath and not node.accepts_subpath:
+			raise Http404
+		return node.render_to_response(request, kwargs)
+	except Http404, e:
+		if settings.DEBUG:
+			raise
+		
+		try:
+			Http404View = node.attributes['Http404']
+		except KeyError:
+			Http404View = None
+		
+		if not Http404View:
+			raise e
+		
+		extra_context = {'exception': e}
+		
+		return Http404View.render_to_response(request, extra_context)
+	except Exception, e:
+		if settings.DEBUG:
+			raise
+		
+		try:
+			Http500View = node.attributes['Http500']
+			
+			if not Http500View:
+				raise e
+			
+			extra_context = {'exception': e}
+			
+			return Http500View.render_to_response(request, extra_context)
+		except:
+			raise e
\ No newline at end of file