web/facet.py
changeset 7249 86bbf174e463
parent 7248 f20fc41e3f7d
child 7279 eb73ce823622
--- a/web/facet.py	Fri Apr 22 16:15:10 2011 +0200
+++ b/web/facet.py	Fri Apr 22 16:24:56 2011 +0200
@@ -451,6 +451,11 @@
         return False
 
 
+def encode(obj, encoding):
+    if isinstance(obj, unicode):
+        return obj.encode(encoding)
+    return unicode(obj).encode(encoding)
+
 class RelationFacet(VocabularyFacet):
     """Base facet to filter some entities according to other entities to which
     they are related. Create concret facet by inheriting from this class an then
@@ -605,7 +610,8 @@
                 insert_attr_select_relation(
                     rqlst, self.filtered_variable, self.rtype, self.role, self.target_attr,
                     select_target_entity=False)
-            values = [str(x) for x, in self.rqlexec(rqlst.as_string())]
+            encoding = self._cw.encoding
+            values = [encode(x, encoding) for x, in self.rqlexec(rqlst.as_string())]
         except:
             self.exception('while computing values for %s', self)
             return []