Changeset 199 for collective.imstransport/trunk/collective/imstransport/utilities/imsinterchange.py

Timestamp:

05/14/09 23:41:20 (4 years ago)

Author:

brent

Message:

Refactored ccreader and removed ccresourcereader. Refactored imsccreader to be more modular.

File:

• collective.imstransport/trunk/collective/imstransport/utilities/imsinterchange.py (modified) (2 diffs)

collective.imstransport/trunk/collective/imstransport/utilities/imsinterchange.py

@@ -21 +21 @@
     # Helper functions for readPackage
 
-    def _createIdFromFile(self, file):
+    def createIdFromFile(self, file):
         """ Get Id from file path """
         return file.split('/')[-1]
 
-    def _createPathFromFile(self, file):
+    def createPathFromFile(self, file):
         """ Get folder path from file path """
         return '/'.join(file.split('/')[:-1])
 
-    def _parseResourceMetadata(self, resourcereader, resourceid):
-        """ Read the resource metadata """
-
-        resourcereader.readGeneral()
-        resourcereader.readLifecycle()
-        resourcereader.readMetaMetadata()
-        resourcereader.readTechnical()
-        resourcereader.readRights()
-        customnode = resourcereader.getCustomData('', '')
-        if customnode:
-            metadict = resourcereader.readCustomMetadata(customnode)
-            resourcereader.appendCustomData(metadict)
-        return resourcereader.processResourceMetadata()
-
-    def _parseFile(self, file, objDict, hashref, id, path):
-        """ parse a file object and add data to it """
-        objDict[hashref]['file'] = file
-        objDict[hashref]['id'] = id
-        objDict[hashref]['path'] = path
-        objDict[hashref]['type'] = self._determineType(hashref, objDict, file)
-        if objDict[hashref].has_key('title') == False:
-            objDict[hashref]['title'] = id
-
-    def _readCustomData(self, prefix, ns, location):
-        """ 
-        Hook for reading custom metadata for additional metadata requirements. 
-        Should return a dictionary of values representing attribute name and value.
-        """
-        return {}
-
-    def _determineType(self, hashref, objDict, filename):
-        """ Determine the type of the incoming object """
-
-        result = None
-        if objDict[hashref].has_key('type') and objDict[hashref]['type']:
-            result = objDict[hashref]['type']
-        elif objDict[hashref].has_key('Format') and objDict[hashref]['Format'] in ['text/html', 'text/htm' 'text/plain' 'text/x-rst', 'text/structured']:
+    def determineType(self, item, fn):
+        result = 'File'
+        docmimetypes = ['text/html', 'text/htm' 'text/plain' 'text/x-rst', 'text/structured']
+
+        if item.has_key('type'):
+            result = type
+        elif item.has_key('Format') and item['Format'] in docmimetypes:
             result = 'Document'
-        elif objDict[hashref].has_key('Format') and re.match('^image', objDict[hashref]['Format']):
+        elif item.has_key('Format') and 'image' in item['Format']:
             result = 'Image'
         else:
@@ -75 +45 @@
             mimetype = mtr.lookupExtension(filename)
             
-            if mimetype and mimetype.major() == 'text' and mimetype.minor() == 'html':
+            if mimetype in docmimetypes:
                 result = 'Document'
-            elif mimetype and mimetype.major() == 'image':
+            elif 'image' in mimetype:
                 result = 'Image'
-            else:
-                result = 'File'
-
-        return result
-        
+        return result                    
 
 class IMSInterchangeReader(object):