Changeset 231

Timestamp:

05/27/09 14:26:20 (4 years ago)

Author:

jon

Message:

Returning writer to use minidom

Location:

collective.imstransport/branches/mini_to_ele/collective/imstransport/utilities/imscc

Files:

• ccwriter.py (modified) (5 diffs)
• imsccwriter.py (modified) (2 diffs)

collective.imstransport/branches/mini_to_ele/collective/imstransport/utilities/imscc/ccwriter.py

@@ -3 +3 @@
 import md5
 import os
-from configcc import IMS_schema, IMS_version, LOM_version, LOM_namespace, LOM_IMSCC_namespace, IMSCP_namespace, WL_namespace
+from configcc import IMS_schema, IMS_version, LOM_version, LOM_namespace, LOM_IMSCC_namespace, WL_namespace
 from configcc import WL_namespace, WL_schemainst
 from configcc import namespaces, schema_locations
-from elementtree import ElementTree
 
 class CCWriter(object):
 
     def __init__(self):
+        self.document = minidom.Document()
         self.destination = None
         self.manifest_node = None
@@ -19 +19 @@
     def createManifest(self, id, ver):
         """ Create a new empty manifest. """
-        manifest = ElementTree.Element('{%s}manifest' %IMSCP_namespace)
-        manifest.set('identifier', id)
-        manifest.set('xmlns:version', ver)
+        doc = minidom.Document()
+        manifest = self._createNode(doc, '', 'manifest', 
+                         attrs=[('identifier', id),
+                                ('xmlns:version', ver),])
         self.addNamespaces(manifest, namespaces)
         self.addSchemaLocations(manifest, schema_locations)
-        return manifest
-
-    def writeTopLevelMetadata(self, manifest, id, title, urlbase, lang, desc=None, keywords=None):
+        return doc
+
+    def writeTopLevelMetadata(self, doc, id, title, urlbase, lang, desc=None, keywords=None):
         """ Write top level metadata into the manifest. """
-        if manifest is not None:
-            md = self._createNode(manifest, '', 'metadata')
+        manifest = doc.getElementsByTagName('manifest')
+        if manifest:
+            md = self._createNode(manifest[0], '', 'metadata')
             self._createNode(md, '', 'schema', IMS_schema)
             self._createNode(md, '', 'schemaversion', IMS_version)
@@ -48 +50 @@
                     self._createNode(kn, '', 'string', kw, [('xml:lang', lang)])
         
-    def createOrganizations(self, manifest, orgId, itemId):
+    def createOrganizations(self, doc, orgId, itemId):
         """ Create an organizations section in the manifest """
-        if manifest is not None:
-            orgs = self._createNode(manifest, '', 'organizations')
+        manifest = doc.getElementsByTagName('manifest')
+        if manifest:
+            orgs = self._createNode(manifest[0], '', 'organizations')
             org = self._createNode(orgs, '', 'organization', attrs=[('identifier', orgId),
                                                                     ('structure', 'rooted-hierarchy')])
             item = self._createNode(org, '', 'item', attrs=[('identifier', itemId)])
             return item
-        return None 
-
-    def createResources(self, manifest):
-        if manifest is not None:
-            return self._createNode(manifest, '', 'resources')
+        return None
+
+    def createResources(self, doc):
+        manifest = doc.getElementsByTagName('manifest')
+        if manifest:
+            return self._createNode(manifest[0], '', 'resources')
         return None
                          
@@ -169 +173 @@
     def writeResourceFile(self, res, path):
         """ Write a file node """
-        return self._createNode(res, '', 'file', attrs=[('href', path)])
+        self._createNode(res, '', 'file', attrs=[('href', path)])
+
 
     def getManifest(self, manifest):
         """ Get the manifest expressed in XML. """
-        ElementTree.tostring(manifest, encoding='utf-8')
-
-    def _createNode(self, parent, nspace, ename, value=None, attrs=None, parentns=True):
+        return manifest.toxml(encoding='utf-8')
+
+
+    def _createNode(self, parent, nspace, ename, value=None, attrs=None):
         """ Create a node in the document. """
-        newnode = None
+        newnode = self.document.createElementNS(nspace, ename)
         if nspace:
-            newnode = ElementTree.SubElement(parent, '{%s}%s' %(nspace, ename))
-        else:
-            if parentns:
-                tag = parent.tag
-                if tag.find('{') != -1 and tag.find('}') != -1:
-                    tstart = tag.find('{') + 1
-                    tend = tag.find('}')
-                    if tend < tstart:
-                        raise ManifestError, 'Incorrectly formatted namespace: %s' %tag
-                    namespace = tag[tstart:tend]
-                    newnode = ElementTree.SubElement(parent, '{%s}%s' %(namespace, ename))
-                else:
-                    newnode = ElementTree.SubElement(parent, '%s' %ename)
-            else:
-                newnode = ElementTree.SubElement(parent, '%s' %ename)
+            newnode.setAttribute('xmlns', nspace)
+        parent.appendChild(newnode)
         if value and value != '':
             if not isinstance(value, unicode):
-                newnode.text = value.decode('utf-8')
+                newnode.appendChild(self.document.createTextNode(value.decode('utf-8')))
             else:
-                newnode.text = value
+                newnode.appendChild(self.document.createTextNode(value))
         if attrs:
             for x in attrs:
-                newnode.set(x[0], x[1])
+                newnode.setAttribute(x[0], x[1])
         return newnode
 
@@ -207 +200 @@
         """ Add a namespace to the manifest. """
         for namespace in namespaces:
-            manifest.set(namespace[0], namespace[1])
+            manifest.setAttribute(namespace[0], namespace[1])
 
     def addSchemaLocations(self, manifest, schema_locations):
-        manifest.set('xsi:schemaLocation', join(schema_locations, ' '))
+        manifest.setAttribute('xsi:schemaLocation', join(schema_locations, ' '))
 
 
     def getTextValue(self, node):
         """ Removes the text from the text_node of a node """
-        return node.text.strip()
+        for x in node.childNodes:
+            if x.nodeType == x.TEXT_NODE:
+                return x.nodeValue.strip()
+        return None        
 
     def getLinkXml(self, title, link):
         """ Return text for a file that stores the link in an xml file """
-        wlnode = ElementTree.Element('{%s}webLink' %WL_namespace)
-        wlnode.set('xmlns:xsi', WL_schemainst)
+        doc = minidom.Document()
+        wlnode = self._createNode(doc, WL_namespace, 'webLink',
+                                  attrs=[('xmlns:xsi', WL_schemainst),('xmlns',WL_namespace)])
         self._createNode(wlnode, '', 'title', value=title)
         self._createNode(wlnode, '', 'url', attrs=[('href',link),('target','_blank')])
-        return ElementTree.tostring(wlnode, encoding='utf-8')
+        return wlnode.toxml(encoding='utf-8')

collective.imstransport/branches/mini_to_ele/collective/imstransport/utilities/imscc/imsccwriter.py

@@ -9 +9 @@
 class IMSCCWriter(IMSWriter):
     """ Write an IMS content package manifest file. """
-
-    name = _(u'IMS Common Cartridge')
 
     def createPackage(self, file, context):
@@ -42 +40 @@
         res = ccw.createResources(doc)
 
-        if orgs is not None and res is not None:
+        if orgs and res:
             objs = self._getAllObjects(context)
             for obj in objs: