Changeset 307


Ignore:
Timestamp:
06/26/09 15:58:37 (5 years ago)
Author:
jon
Message:

Cleaning up IMSTransport core level code after content package refactor

Location:
collective.imstransport/trunk/collective/imstransport/utilities
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • collective.imstransport/trunk/collective/imstransport/utilities/configure.zcml

    r296 r307  
    1919     /> 
    2020 
    21   <!-- utility 
    22      provides=".interfaces.IIMSManifestReader" 
    23      factory=".imscp.imscpreader.IMSCPReader" 
    24      name="IMS Content Package" 
    25      / --> 
    26  
    2721  <utility 
    2822     provides=".interfaces.IIMSManifestWriter" 
     
    3024     name="Common Cartridge" 
    3125     />   
     26 
     27  <utility 
     28     provides=".interfaces.IIMSManifestReader" 
     29     factory=".imscp.imscpreader.IMSCPReader" 
     30     name="IMS Content Package" 
     31     /> 
     32 
     33  <utility 
     34     provides=".interfaces.IIMSManifestWriter" 
     35     factory=".imscp.imscpwriter.IMSCPWriter" 
     36     name="IMS Content Package" 
     37     /> 
    3238 
    3339  <!-- utility 
     
    4349     / -->   
    4450 
    45   <!-- utility 
    46      provides=".interfaces.IIMSManifestWriter" 
    47      factory=".imscp.imscpwriter.IMSCPWriter" 
    48      name="IMS Content Package" 
    49      / --> 
    50  
    5151  <utility 
    5252     provides=".interfaces.IIMSManifestReader" 
  • collective.imstransport/trunk/collective/imstransport/utilities/imscc/ccreader.py

    r212 r307  
    222222    def readRights(self, metadata, md): 
    223223        """ Read Rights node """ 
    224  
    225224        rights_node = None 
    226225        rights_nodes = metadata.getElementsByTagNameNS(LOM_namespace, 'rights') 
  • collective.imstransport/trunk/collective/imstransport/utilities/imscc/ccwriter.py

    r212 r307  
    1111    def __init__(self): 
    1212        self.document = minidom.Document() 
    13         self.destination = None 
    14         self.manifest_node = None 
    15         self.custom_namespaces = None 
    16         self.extensionMetadata = None 
    17         self.itemDict = {} 
    1813 
    1914    def createManifest(self, id, ver): 
  • collective.imstransport/trunk/collective/imstransport/utilities/imsinterchange.py

    r296 r307  
    4747            if mimetype in docmimetypes: 
    4848                result = 'Document' 
    49             elif mimetype and mimetype.find('image') != -1: 
     49            elif mimetype and 'image' in str(mimetype): 
    5050                result = 'Image' 
    5151        return result                     
     
    5959    def _writeObjectData(self, obj, path, destination): 
    6060        """ Write file data to the destination object. """ 
    61         if type(obj) == type(''): 
     61        if type(obj) == type('') or type(obj) == type(u''): 
    6262            data = obj         
    6363        else: 
Note: See TracChangeset for help on using the changeset viewer.