From: Jordan Augé Date: Fri, 22 Nov 2013 10:37:49 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.onelab.eu/git/myslice X-Git-Tag: myslice-0.3-0~113 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=d1197c134b70bda643a752bdaf891190cb5a15e7;hp=2ad7918b2828ff6352b057fcace93b74f7c4e0f1;p=unfold.git Merge branch 'master' of ssh://git.onelab.eu/git/myslice --- diff --git a/manifold/manifoldapi.py b/manifold/manifoldapi.py index cd14efe7..1b97505d 100644 --- 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 90a09eab..08fdf61d 100644 --- 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 7f071c0b..a6ca83cd 100644 --- 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"