[Erp5-report] r18635 - /erp5/trunk/products/ERP5/Document/EmailDocument.py

[nobody at svn.erp5.org]

Author: yusei
Date: Tue Jan  8 19:57:15 2008
New Revision: 18635

URL: http://svn.erp5.org?rev=18635&view=rev
Log:
Temporary dirty fix, need refactoring and cleaning up.

Modified:
    erp5/trunk/products/ERP5/Document/EmailDocument.py

Modified: erp5/trunk/products/ERP5/Document/EmailDocument.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/EmailDocument.py?rev=18635&r1=18634&r2=18635&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/EmailDocument.py (original)
+++ erp5/trunk/products/ERP5/Document/EmailDocument.py Tue Jan  8 19:57:15 2008
@@ -40,6 +40,15 @@
 from Products.ERP5.Document.File import File
 from Products.ERP5.Document.Document import ConversionError
 from Products.CMFDefault.utils import isHTMLSafe
+try:
+  from Products.MimetypesRegistry.common import MimeTypeException
+except ImportError:
+  class MimeTypeException(Exception):
+    """
+    A dummy exception class which is used when MimetypesRegistry product is
+    not installed yet.
+    """
+  
 
 from email import message_from_string
 from email.Header import decode_header
@@ -440,15 +449,36 @@
       # Attach files
       document_type_list = self.getPortalDocumentTypeList()
       for attachment in self.getAggregateValueList():
+        mime_type = None
+        attached_data = None
         if attachment.getPortalType() in document_type_list:
-          # If this is a document, use 
-          mime_type = attachment.getContentType() # WARNING - this could fail since getContentType
-                                                  # is not (yet) part of Document API
-          try:
-            mime_type, attached_data = attachment.convert(mime_type)
-          except ConversionError:
-            mime_type = attachment.getBaseContentType()
-            attached_data = attachment.getBaseData()
+          # If this is a document, use
+
+          # WARNING - this could fail since getContentType
+          # is not (yet) part of Document API
+          if getattr(attachment, 'getContentType', None) is not None:
+            mime_type = attachment.getContentType()
+          elif getattr(attachment, 'getTextFormat', None) is not None:
+            mime_type = attachment.getTextFormat()
+          else:
+            raise ValueError, "Cannot find mimetype of the document."
+
+          if mime_type is not None:
+            try:
+              mime_type, attached_data = attachment.convert(mime_type)
+            except ConversionError:
+              mime_type = attachment.getBaseContentType()
+              attached_data = attachment.getBaseData()
+            except (NotImplementedError, MimeTypeException):
+              pass
+
+          if attached_data is None:
+            if getattr(attachment, 'getTextContent', None) is not None:
+              attached_data = attachment.getTextContent()
+            elif getattr(attachment, 'getData', None) is not None:
+              attached_data = attachment.getData()
+            elif getattr(attachment, 'getBaseData', None) is not None:
+              attached_data = attachment.getBaseData()
         else:
           mime_type = 'application/pdf'
           attached_data = attachment.asPDF() # XXX - Not implemented yet