Changeset 1039 in products

Timestamp:

Apr 16, 2009 12:28:45 PM (17 years ago)

Author:

koval

Message:

fixed bug with non-ascii characters in tags

Location:

quintagroup.portlet.cumulus/trunk/quintagroup/portlet/cumulus

Files:

• blog.py (modified) (2 diffs)
• catalog.py (modified) (2 diffs)
• cumulusportlet.py (modified) (3 diffs)

quintagroup.portlet.cumulus/trunk/quintagroup/portlet/cumulus/blog.py

@@ -10 +10 @@
     implements(ITagsRetriever)
 
-    def __init__(self, context):
-        self.context = context
-
     def getTags(self, number=None):
         """ Get Quills blog's tags.
@@ -23 +20 @@
         tags = []
         for topic in topics:
-            tags.append((topic.getTitle(), len(topic), topic.absolute_url()))
+            tags.append((topic.getTitle().decode(self.default_charset), len(topic), topic.absolute_url()))
 
         return tags

quintagroup.portlet.cumulus/trunk/quintagroup/portlet/cumulus/catalog.py

@@ -9 +9 @@
     def __init__(self, context):
         self.context = context
+        portal_properties = getToolByName(self.context, 'portal_properties')
+        self.default_charset = portal_properties.site_properties.getProperty('default_charset', 'utf-8')
 
     def getTags(self, number=None):
@@ -21 +23 @@
             except TypeError:
                 number_of_entries = 1
-            tags.append((name, number_of_entries, '#'))
+            tags.append((name.decode(self.default_charset), number_of_entries, '#'))
 
         return tags

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

@@ -145 +145 @@
         portal_state = getMultiAdapter((context, request), name=u'plone_portal_state')
         self.portal_url = portal_state.portal_url()
+        portal_properties = getMultiAdapter((context, request), name=u'plone_tools').properties()
+        self.default_charset = portal_properties.site_properties.getProperty('default_charset', 'utf-8')
 
     @property
@@ -171 +173 @@
 
     def getParams(self):
+        tagcloud = '<tags>%s</tags>' % self.getTagAnchors()
+        tagcloud = tagcloud.encode(self.default_charset)
+        tagcloud = urllib.quote(tagcloud)
         params = {
             'url': self.portal_url + '/++resource++tagcloud.swf',
@@ -183 +188 @@
             'distr': self.data.distr and 'true' or 'false',
             'mode': 'tags',
-            'tagcloud': urllib.quote('<tags>%s</tags>' % self.getTagAnchors()),
+            'tagcloud': tagcloud,
         }
         flashvars = []