Changeset 1449 in products

Timestamp:

Dec 8, 2009 8:31:41 AM (14 years ago)

Author:

piv

Message:

merge updates from trunk: r2486-2487

Location:

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

Files:

• . (modified) (1 prop)
• quintagroup/transmogrifier/exportimport.py (modified) (1 diff)
• quintagroup/transmogrifier/propertymanager.py (modified) (2 diffs)

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

@@ -104 +104 @@
     # this function is also called when adding Plone site, so call standard handler
     path = ''
+    prefix = 'structure'
     if 'reader' in transmogrifier._raw:
         path = transmogrifier._raw['reader'].get('path', '')
-    if not context.readDataFile('.objects.xml', subdir=os.path.join(path, 'structure')):
+        prefix = transmogrifier._raw['reader'].get('prefix', 'structure')
+    if not context.readDataFile('.objects.xml', subdir=os.path.join(path, prefix)):
         try:
             from Products.GenericSetup.interfaces import IFilesystemImporter

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

@@ -124 +124 @@
                 if sub.nodeName == 'element':
                     if len(sub.childNodes) > 0:
-                        value = sub.childNodes[0].nodeValue
+                        value = sub.childNodes[0].nodeValue.strip()
                         if isinstance(value, unicode):
                             value = value.encode(self._encoding)
@@ -256 +256 @@
                 doc = minidom.parseString(data)
                 root = doc.documentElement
-                for child in root.childNodes:
+                children = [k for k in root.childNodes]
+                for child in children:
                     if child.nodeName != 'property':
                         continue