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

diff --git a/manifold/manifoldapi.py b/manifold/manifoldapi.py
index cd14efe..1b97505 100644 (file)
--- a/manifold/manifoldapi.py
+++ b/manifold/manifoldapi.py
@@ -81,6 +81,8 @@ class ManifoldAPI:
                 }
                 args += (annotations,)
                 result=getattr(self.server, methodName)(*args, **kwds)
+                print "%s%r" %(methodName, args)
+                
                 if debug:
                     print '<= result=',
                     self._print_result(result)

diff --git a/manifold/metadata.py b/manifold/metadata.py
index 90a09ea..08fdf61 100644 (file)
--- a/manifold/metadata.py
+++ b/manifold/metadata.py
@@ -4,6 +4,8 @@ import os.path
 from manifold.manifoldresult import ManifoldResult
 from manifold.manifoldapi import ManifoldAPI
 
+from django.contrib                     import messages
+
 debug=False
 debug=True
 
@@ -17,7 +19,7 @@ class MetaData:
         self.auth=auth
         self.hash_by_object={}
 
-    def fetch (self):
+    def fetch (self, request):
         offline_filename="%s/../offline-metadata.json"%os.path.dirname(__file__)
         if work_offline:
             try:

diff --git a/unfold/page.py b/unfold/page.py
index 7f071c0..a6ca83c 100644 (file)
--- a/unfold/page.py
+++ b/unfold/page.py
@@ -106,7 +106,7 @@ class Page:
         metadata_auth = {'AuthMethod':'anonymous'}
 
         metadata=MetaData (metadata_auth)
-        metadata.fetch()
+        metadata.fetch(self.request)
         # store it for next time
         manifold['metadata']=metadata
         if debug: print "Page.get_metadata: return new value"