Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan

diff --git a/manifold/manifoldresult.py b/manifold/manifoldresult.py
index a16a9a7..483fd91 100644 (file)
--- a/manifold/manifoldresult.py
+++ b/manifold/manifoldresult.py
@@ -40,7 +40,8 @@ class ManifoldResult (dict):
         if self['code']==0:
             value=self['value']
             if isinstance(value,list): result += " [value=list with %d elts]"%len(value)
-            else: result += " [value=other %s]"%value
+            elif isinstance(value,dict): result += " [value=dict with keys %s]"%value.keys()
+            else: result += " [value=%s: %s]"%(type(value).__name__,value)
         else:
             result += " [output=%s]"%self['output']
         result += "]]"

diff --git a/myslice/config.py b/myslice/config.py
index 593e88b..8d2d28b 100644 (file)
--- a/myslice/config.py
+++ b/myslice/config.py
@@ -2,13 +2,13 @@ class Config:
 
     # production should use https of course
 
-# an old-fashioned API - that's what is currently only supported   
-    manifold_url = "http://localhost:7080/"
-# this one runs a new API, but currently (april 2013) there are missing
-# features; GetSession and GetPersons are still there (they should go away) and 
-# the code for retrieving metadata does not work as-is, and I have no clue 
-# what it should become anyways, so...
-#    manifold_url = "http://dev.myslice.info:7080/"
+# this version of unfold expects a backend that runs a new API
+# xxx
+# -- although currently (april 2013) there are missing features
+# e.g. GetSession and GetPersons are still there -- they should go away
+# also the code for retrieving metadata does not work as-is
+#    manifold_url = "http://localhost:7080/"
+    manifold_url = "http://dev.myslice.info:7080/"
 
     # exporting these details to js
     @staticmethod

diff --git a/trash/sliceview.py b/trash/sliceview.py
index 9865f77..edf871c 100644 (file)
--- a/trash/sliceview.py
+++ b/trash/sliceview.py
@@ -86,19 +86,15 @@ def _slice_view (request, slicename):
         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')
     )
@@ -215,6 +211,15 @@ def _slice_view (request, slicename):
         )
     )
 
+    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 (