cosmetic & debug

[myslice.git] / trash / sliceview.py

diff --git a/trash/sliceview.py b/trash/sliceview.py
index fcbaac7..eea4e22 100644 (file)
--- a/trash/sliceview.py
+++ b/trash/sliceview.py
@@ -4,6 +4,7 @@ from django.template import RequestContext
 from django.shortcuts import render_to_response
 
 from django.contrib.auth.decorators import login_required
+from django.http import HttpResponseRedirect
 
 from unfold.page import Page
 #from manifold.manifoldquery import ManifoldQuery
@@ -20,8 +21,9 @@ from plugins.querycode.querycode import QueryCode
 from plugins.quickfilter.quickfilter import QuickFilter
 from plugins.messages.messages import Messages
 
-from myslice.viewutils import quickfilter_criterias
+from manifold.manifoldresult import ManifoldException
 
+from myslice.viewutils import quickfilter_criterias
 from myslice.viewutils import topmenu_items, the_user
 
 # XXX JORDAN
@@ -32,18 +34,36 @@ debug = True
 
 @login_required
 def slice_view (request, slicename=tmp_default_slice):
-    
+    # xxx Thierry - ugly hack
+    # fetching metadata here might fail - e.g. with an expired session..
+    # let's catch this early on and log out our user if needed
+    # it should of course be handled in a more generic way
+    try:
+        return _slice_view(request,slicename)
+    except ManifoldException, manifold_result:
+        # xxx needs a means to display this message to user...
+        from django.contrib.auth import logout
+        logout(request)
+        return HttpResponseRedirect ('/')
+    except Exception, e:
+        # xxx we need to sugarcoat this error message in some error template...
+        print "Unexpected exception",e
+        import traceback
+        traceback.print_exc()
+        # return ...
+
+def _slice_view (request, slicename):
+
     page = Page(request)
     page.expose_js_metadata()
 
-
     # TODO The query to run is embedded in the URL
     main_query = Query.get('slice').filter_by('slice_hrn', '=', slicename)
 
     # Get default fields from metadata unless specified
     if not main_query.fields:
-        md_fields = page.get_metadata()
-        md_fields = md_fields.details_by_object('slice')
+        metadata = page.get_metadata()
+        md_fields = metadata.details_by_object('slice')
         if debug:
             print "METADATA", md_fields
         # TODO Get default fields
@@ -68,19 +88,15 @@ def slice_view (request, slicename=tmp_default_slice):
         title="Slice view for %s"%slicename,
         domid='thestack',
         togglable=False,
-        sons=[
-            Messages (
-                page=page,
-                title="Runtime messages for slice %s"%slicename,
-                domid="msgs-pre",
-                levels="ALL",
-                ),
-            Raw (page=page,togglable=False, toggled=True,html="<h2> Slice page for %s</h2>"%slicename),
-        ]
+        sons=[],
     )
 
     # ... responsible for the slice properties...
 
+
+    main_plugin.insert (
+        Raw (page=page,togglable=False, toggled=True,html="<h2> Slice page for %s</h2>"%slicename))
+
     main_plugin.insert(
         Raw (page=page,togglable=False, toggled=True,html='<b>Description:</b> TODO')
     )
@@ -197,6 +213,15 @@ def slice_view (request, slicename=tmp_default_slice):
         )
     )
 
+    main_plugin.insert (
+        Messages (
+            page=page,
+            title="Runtime messages for slice %s"%slicename,
+            domid="msgs-pre",
+            levels="ALL",
+            ))
+    
+
     # END OF JORDAN's CODE
 
 #old#    main_plugin = Stack (