Changeset 1036 in products

Timestamp:

Apr 15, 2009 5:08:17 PM (17 years ago)

Author:

koval

Message:

retrieving of tags moved from portlet renderer to adapters and added Quills support

Location:

quintagroup.portlet.cumulus/trunk

Files:

• . (modified) (1 prop)
• quintagroup/portlet/cumulus/blog.py (added)
• quintagroup/portlet/cumulus/catalog.py (added)
• quintagroup/portlet/cumulus/configure.zcml (modified) (2 diffs)
• quintagroup/portlet/cumulus/cumulusportlet.py (modified) (5 diffs)
• quintagroup/portlet/cumulus/interfaces.py (added)

quintagroup.portlet.cumulus/trunk/quintagroup/portlet/cumulus/configure.zcml

@@ -5 +5 @@
     xmlns:plone="http://namespaces.plone.org/plone"
     xmlns:browser="http://namespaces.zope.org/browser"
+    xmlns:zcml="http://namespaces.zope.org/zcml"
     i18n_domain="quintagroup.portlet.cumulus">
 
@@ -42 +43 @@
         />
 
+    <!-- Register tags retriever adapters -->
+    <adapter
+        for="Products.Archetypes.interfaces.IBaseObject"
+        provides=".interfaces.ITagsRetriever"
+        factory=".catalog.GlobalTags"
+        />
+
+    <adapter
+        for="Products.CMFPlone.interfaces.IPloneSiteRoot"
+        provides=".interfaces.ITagsRetriever"
+        factory=".catalog.GlobalTags"
+        />
+
+    <configure zcml:condition="installed quills.core">
+        <!-- tags retrievers for Quills blog -->
+        <adapter
+            for="quills.core.interfaces.IBaseContent"
+            provides=".interfaces.ITagsRetriever"
+            factory=".blog.QuillsBlogTags"
+            />
+
+        <adapter
+            for="quills.core.interfaces.IWeblogEnhanced"
+            provides=".interfaces.ITagsRetriever"
+            factory=".blog.QuillsBlogTags"
+            />
+
+        <adapter
+            for="quills.core.interfaces.IPossibleWeblogEntry"
+            provides=".interfaces.ITagsRetriever"
+            factory=".blog.QuillsBlogTags"
+            />
+
+    </configure>
+
 </configure>

quintagroup.portlet.cumulus/trunk/quintagroup/portlet/cumulus/cumulusportlet.py

@@ -3 +3 @@
 from zope.interface import implements
 from zope.component import getMultiAdapter
+from zope.component import getAdapter
 
 from plone.portlets.interfaces import IPortletDataProvider
@@ -12 +13 @@
 
 from quintagroup.portlet.cumulus import CumulusPortletMessageFactory as _
-
+from quintagroup.portlet.cumulus.interfaces import ITagsRetriever
 
 class ICumulusPortlet(IPortletDataProvider):
@@ -180 +181 @@
         return urllib.quote(tags)
 
-    def getTags(self, settings=None):
-        plone_tools = getMultiAdapter((self.context, self.request), name=u'plone_tools')
-        cat = plone_tools.catalog()
-        index = cat._catalog.getIndex('Subject')
-        tags = []
-        number_of_entries = []
-        for name in index._index.keys():
-            tags.append(name)
-            try:
-                number_of_entries.append(len(index._index[name]))
-            except TypeError:
-                number_of_entries.append(1)
+    def getTags(self):
+        tags = ITagsRetriever(self.context).getTags()
+        if tags == []:
+            return []
+
+        number_of_entries = [i[1] for i in tags]
+
         min_number = min(number_of_entries)
         max_number = max(number_of_entries)
@@ -198 +194 @@
 
         result = []
-        for name, number in zip(tags, number_of_entries):
+        for name, number, url in tags:
             size = self.data.smallest + step * (number - min_number)
             result.append({
@@ -204 +200 @@
                 'size': size,
                 'number_of_entries': number,
-                'url': '#'
+                'url': url
             })
         return result