Changeset 3234 in products

Timestamp:

Jun 10, 2011 11:20:25 AM (13 years ago)

Author:

kroman0

Message:

Apply Malthes caching patch

File:

• quintagroup.dropdownmenu/trunk/quintagroup/dropdownmenu/browser/viewlets.py (modified) (6 diffs)

quintagroup.dropdownmenu/trunk/quintagroup/dropdownmenu/browser/viewlets.py

@@ -11 +11 @@
 
 from plone.memoize.instance import memoize
+from plone.memoize.compress import xhtmlslimmer
 from plone.app.layout.viewlets import common
 from plone.app.layout.navigation.navtree import buildFolderTree
@@ -22 +23 @@
 import copy
 
-
-def cache_key(a, b, c):
-    return c + str(time() // (60 * 60))
+def menu_cache_key(f, view):
+    try:
+        section = view.context.getPhysicalPath()[2]
+    except:
+        section = ""
+
+    return view.__name__ + \
+           section + \
+           str(time() // (60 * 5))  # Every five minutes
+                                    # Note that the HTTP RAM-cache
+                                    # typically purges entries after
+                                    # 60 minutes.
+
+
+def tabs_cache_key(f, view, site_url):
+    return site_url + str(time() // (60 * 60))
 
 
@@ -36 +50 @@
 
         # prepare to gather portal tabs
-        tabs = []
         context = aq_inner(self.context)
         self.conf = conf = self._settings()
@@ -49 +62 @@
         self.cat_sufix = self.conf.nested_category_sufix or ''
         self.cat_prefix = self.conf.nested_category_prefix or ''
+
+    @property
+    def portal_tabs(self):
+        tabs = []
+
         # fetch actions-based tabs?
-        if conf.show_actions_tabs:
+        if self.conf.show_actions_tabs:
             tabs.extend(self._actions_tabs())
 
         # fetch content structure-based tabs?
-        if conf.show_content_tabs:
+        if self.conf.show_content_tabs:
             # put content-based actions before content structure-based ones?
-            if conf.content_before_actions_tabs:
+            if self.conf.content_before_actions_tabs:
                 tabs = self._content_tabs() + tabs
             else:
                 tabs.extend(self._content_tabs())
 
-        # assign collected tabs eventually
-        self.portal_tabs = tabs
+        return tabs
 
     def _actions_tabs(self):
@@ -101 +118 @@
         return res
 
-    @ram.cache(cache_key)
+    @ram.cache(tabs_cache_key)
     def prepare_tabs(self, site_url):
         def normalize_actions(category, object, level, parent_url=None):
@@ -203 +220 @@
         return getDropDownMenuSettings(self.context)
 
+    @ram.cache(menu_cache_key)
     def createMenu(self):
-        return self.recurse(children=self.portal_tabs, level=1)
+        html = self.recurse(children=self.portal_tabs, level=1)
+        return xhtmlslimmer.compress(html)
 
     def _old_update(self):