Changeset 1431 in products

Timestamp:

Dec 6, 2009 1:59:56 PM (17 years ago)

Author:

piv

Message:

fix encoding problems in propertymanager section, lines properties are now extracted into text nodes instead of element attributes, xml.dom.minidom does not allow non-ascii characters in element attributes

File:

• quintagroup.transmogrifier/branches/plone-2.1/quintagroup.transmogrifier/quintagroup/transmogrifier/propertymanager.py (modified) (5 diffs)

quintagroup.transmogrifier/branches/plone-2.1/quintagroup.transmogrifier/quintagroup/transmogrifier/propertymanager.py

@@ -2 +2 @@
 
 from zope.interface import classProvides, implements
-
-from ZPublisher.HTTPRequest import default_encoding
 
 from collective.transmogrifier.interfaces import ISection, ISectionBlueprint
@@ -20 +18 @@
     """
 
-    _encoding = default_encoding
+    _encoding = 'utf-8'
 
     def _getNodeText(self, node):
@@ -52 +50 @@
                 for value in prop:
                     if isinstance(value, str):
-                        value.decode(self._encoding)
+                        value = value.decode(self._encoding)
                     child = self._doc.createElement('element')
-                    child.setAttribute('value', value)
+                    child.appendChild(self._doc.createTextNode(value))
                     node.appendChild(child)
             else:
@@ -124 +122 @@
             for sub in child.childNodes:
                 if sub.nodeName == 'element':
-                    value = sub.getAttribute('value')
-                    elements.append(value.encode(self._encoding))
+                    if len(sub.childNodes) > 0:
+                        value = sub.childNodes[0].nodeValue
+                        if isinstance(value, unicode):
+                            value = value.encode(self._encoding)
+                        elements.append(value)
 
             if elements or prop_map.get('type') == 'multiple selection':
@@ -197 +198 @@
                 if node.hasChildNodes():
                     doc.appendChild(node)
-                    data = doc.toprettyxml(indent='  ', encoding='utf-8')
+                    try:
+                        data = doc.toprettyxml(indent='  ', encoding='utf-8')
+                    except Exception, e:
+                        import pdb;pdb.set_trace()
                     doc.unlink()