Fix document conversion not being performed when data is set directly.

This fixes test_base_convertable_behaviour_with_successive_updates from
testDmsWithPreConversion.TestDocumentWithPreConversion which was previously
working properly with files only.

Also, split up the test for deleting data as it's not implemented yet.

bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_conversion_interaction_workflow/interactions/Document_base_convertable.xml

@@ -58,6 +58,7 @@
             <value>
               <list>
                 <string>_setFile</string>
+                <string>_setData</string>
               </list>
             </value>
         </item>

bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_conversion_interaction_workflow/interactions/Document_cached_convertable.xml

@@ -57,6 +57,7 @@
             <value>
               <list>
                 <string>_setFile</string>
+                <string>_setData</string>
                 <string>_setTextContent</string>
               </list>
             </value>

bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_conversion_interaction_workflow/interactions/Document_file.xml

@@ -57,6 +57,7 @@
             <value>
               <list>
                 <string>_setFile</string>
+                <string>_setData</string>
               </list>
             </value>
         </item>

bt5/erp5_base/bt/change_log

+2011-11-11 arnaud.fontaine
+* Fix document conversion not being performed when data is set directly.
+
 2011-10-24 Kazuhiko
 * make telephone field searchable in person_module view and organisation_module view.
 

bt5/erp5_base/bt/revision

-1000
\ No newline at end of file
+1001
\ No newline at end of file

product/ERP5/mixin/cached_convertable.py

@@ -245,7 +245,7 @@ class CachedConvertableMixin:
     """Update md5 checksum from the original file
     """
     data = self.getData()
-    if data is not None:
+    if data not in (None, ''):
       if isinstance(data, Pdata):
         self._setContentMd5(hashPdataObject(aq_base(data)))
       else:

product/ERP5OOo/tests/testDms.py

@@ -2377,6 +2377,26 @@ return 1
     self.assertNotEquals(previous_md5, document.getContentMd5())
     self.assertEquals(document.getExternalProcessingState(), 'converted')
 
+  # Currently, 'empty' state in processing_status_workflow is only set
+  # when creating a document and before uploading any file. Once the
+  # document has been uploaded and then the content is cleared, the
+  # document state stays at 'converting' state as empty base_data is
+  # not handled
+  @expectedFailure
+  def test_base_convertable_behaviour_when_deleted(self):
+    """
+    Check that deleting the content of a previously uploaded document
+    actually clear base_data and md5 and check that the document goes
+    back to empty state
+    """
+    # create a document
+    upload_file = makeFileUpload('TEST-en-002.doc')
+    kw = dict(file=upload_file, synchronous_metadata_discovery=True)
+    document = self.portal.Base_contribute(**kw)
+    self.stepTic()
+    self.assertTrue(document.hasBaseData())
+    self.assertTrue(document.hasContentMd5())
+
     # Delete content: base_data must be deleted
     document.edit(data=None)
     self.stepTic()