git://git.onelab.eu
/
unfold.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
manifoldapi now expects the URL as an argument to its constructor
[unfold.git]
/
unfold
/
page.py
diff --git
a/unfold/page.py
b/unfold/page.py
index
821c662
..
0ac131b
100644
(file)
--- a/
unfold/page.py
+++ b/
unfold/page.py
@@
-9,8
+9,10
@@
from django.template.loader import render_to_string
from manifoldapi.metadata import MetaData
from unfold.prelude import Prelude
from manifoldapi.metadata import MetaData
from unfold.prelude import Prelude
-
+from unfold.sessioncache import SessionCache
+
from myslice.configengine import ConfigEngine
from myslice.configengine import ConfigEngine
+from myslice.settings import logger
# decorator to deflect calls on this Page to its prelude
def to_prelude (method):
# decorator to deflect calls on this Page to its prelude
def to_prelude (method):
@@
-106,16
+108,23
@@
class Page:
# if cached, use it
if 'metadata' in manifold and isinstance(manifold['metadata'],MetaData):
# if cached, use it
if 'metadata' in manifold and isinstance(manifold['metadata'],MetaData):
- if debug: print "Page.get_metadata: return cached value"
+
+# cached_metadata = SessionCache().get_metadata(self.request)
+# if cached_metadata and isinstance(cached_metadata, MetaData):
+ logger.debug("Page.get_metadata: return cached value")
return manifold['metadata']
return manifold['metadata']
+# return cached_metadata
metadata_auth = {'AuthMethod':'anonymous'}
metadata_auth = {'AuthMethod':'anonymous'}
- metadata=MetaData (metadata_auth)
+ from myslice.settings import config
+ url = config.manifold_url()
+ metadata = MetaData (url, metadata_auth)
metadata.fetch(self.request)
# store it for next time
manifold['metadata']=metadata
metadata.fetch(self.request)
# store it for next time
manifold['metadata']=metadata
- if debug: print "Page.get_metadata: return new value"
+# SessionCache().store_metadata(self.request, metadata)
+ logger.debug("Page.get_metadata: return new value")
return metadata
def expose_js_metadata (self):
return metadata
def expose_js_metadata (self):