Changeset 1414 in products

Timestamp:

Nov 26, 2009 11:05:20 AM (14 years ago)

Author:

piv

Message:

merge plone2.1 branche updates (r2426-2428,2433-2452): manifests with valid xml now, binary files fully dumped, local roles are imported, control characters are handled properly

Location:

quintagroup.transmogrifier/trunk

Files:

• . (modified) (1 prop)
• quintagroup/transmogrifier/binary.py (modified) (3 diffs)
• quintagroup/transmogrifier/manifest.py (modified) (2 diffs)
• quintagroup/transmogrifier/marshall.py (modified) (1 diff)
• quintagroup/transmogrifier/namespaces (added)
• quintagroup/transmogrifier/namespaces/__init__.py (added)
• quintagroup/transmogrifier/namespaces/atns.py (added)
• quintagroup/transmogrifier/namespaces/cmfns.py (added)
• quintagroup/transmogrifier/namespaces/dcns.py (added)
• quintagroup/transmogrifier/namespaces/util.py (added)

quintagroup.transmogrifier/trunk/quintagroup/transmogrifier/binary.py

@@ -24 +24 @@
         #self.excludekey = defaultMatcher(options, 'exclude-key', name, 'excluded_fields')
         self.excludekey = options.get('exclude-key', '_excluded_fields').strip()
+        
+        self.doc = minidom.Document()
 
     def __iter__(self):
@@ -73 +75 @@
         """
         field = obj.getField(field)
-        base_unit = field.getBaseUnit(obj)
+        # temporarily:
+        # dirty call, I know, just lazy to get method arguments
+        # TextField overrided getBaseUnit method but didn't follow API
+        try:
+            base_unit = field.getBaseUnit(obj, full=True)
+        except TypeError, e:
+            base_unit = field.getBaseUnit(obj)
         fname = base_unit.getFilename() 
         ct = base_unit.getContentType()
@@ -81 +89 @@
 
     def createManifest(self, binary_fields):
-        manifest = '<?xml version="1.0" ?>\n<manifest>\n'
-        for field, info in binary_fields.items():
-            manifest += '  <field name="%s">\n' % field
-            manifest += '    <filename>%s</filename>\n' % info['filename']
-            manifest += '    <mimetype>%s</mimetype>\n' % info['mimetype']
-            manifest += '  </field>\n'
-        manifest += "</manifest>\n"
-        return manifest
+        doc = self.doc
+
+        root = doc.createElement('manifest')
+        for fname, info in binary_fields.items():
+            # create field node
+            field = doc.createElement('field')
+
+            # set name attribute
+            attr = doc.createAttribute('name')
+            attr.value = fname
+            field.setAttributeNode(attr)
+
+            # create filename node
+            filename = doc.createElement('filename')
+            filename.appendChild(doc.createTextNode(info['filename']))
+            field.appendChild(filename)
+
+            # create mimetype node
+            mimetype = doc.createElement('mimetype')
+            mimetype.appendChild(doc.createTextNode(info['mimetype']))
+            field.appendChild(mimetype)
+
+            root.appendChild(field)
+
+        doc.appendChild(root)
+
+        try:
+            data = doc.toprettyxml(indent='  ', encoding='utf-8')
+        except UnicodeDecodeError, e:
+            # all comments are strings encoded in 'utf-8' and they will properly
+            # saved in xml file, but if we explicitly give 'utf-8' encoding
+            # UnicodeDecodeError will be raised when they have non-ascii chars
+            data = doc.toprettyxml(indent='  ')
+
+        doc.unlink()
+        return data
+
 
 class FileImporterSection(object):

quintagroup.transmogrifier/trunk/quintagroup/transmogrifier/manifest.py

@@ -21 +21 @@
         self.fileskey = options.get('files-key', '_files').strip()
 
+        self.doc = minidom.Document()
+
     def __iter__(self):
         for item in self.previous:
@@ -41 +43 @@
         if not entries:
             return None
-        manifest = '<?xml version="1.0" ?>\n<manifest>\n'
+
+        doc = self.doc
+        root = doc.createElement('manifest')
+
         for obj_id, obj_type in entries:
-            manifest += '  <record type="%s">%s</record>\n' % (obj_type, obj_id)
-        manifest += "</manifest>\n"
-        return manifest
+            # create record
+            record = doc.createElement('record')
+
+            # set type attribute
+            attr = doc.createAttribute('type')
+            attr.value = obj_type
+            record.setAttributeNode(attr)
+
+            # add object id
+            text = doc.createTextNode(obj_id)
+            record.appendChild(text)
+
+            root.appendChild(record)
+
+        doc.appendChild(root)
+
+        try:
+            data = doc.toprettyxml(indent='  ', encoding='utf-8')
+        except UnicodeDecodeError, e:
+            # all comments are strings encoded in 'utf-8' and they will properly
+            # saved in xml file, but if we explicitly give 'utf-8' encoding
+            # UnicodeDecodeError will be raised when they have non-ascii chars
+            data = doc.toprettyxml(indent='  ')
+
+        doc.unlink()
+        return data
 
 class ManifestImporterSection(object):

quintagroup.transmogrifier/trunk/quintagroup/transmogrifier/marshall.py

@@ -15 +15 @@
 from Products.Archetypes.event import ObjectInitializedEvent
 from Products.Archetypes.event import ObjectEditedEvent
+
+# override Marshall atxml namespaces
+from quintagroup.transmogrifier import namespaces
+
 
 class MarshallerSection(object):