[Erp5-report] r16221 - in /erp5/trunk/products: ERP5/Document/File.py ERP5OOo/tests/testDms.py

[nobody at svn.erp5.org]

Author: jerome
Date: Mon Sep 10 14:01:53 2007
New Revision: 16221

URL: http://svn.erp5.org?rev=16221&view=rev
Log:
fix get_size to use base_data if no data

Modified:
    erp5/trunk/products/ERP5/Document/File.py
    erp5/trunk/products/ERP5OOo/tests/testDms.py

Modified: erp5/trunk/products/ERP5/Document/File.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/File.py?rev=16221&r1=16220&r2=16221&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/File.py (original)
+++ erp5/trunk/products/ERP5/Document/File.py Mon Sep 10 14:01:53 2007
@@ -153,10 +153,10 @@
     """
     has to be overwritten here, otherwise WebDAV fails
     """
-    try:
-      return len(self.data)
-    except (AttributeError, TypeError):
-      return 0
+    data_len = len(getattr(self, 'data', ''))
+    if not data_len:
+      data_len = len(self.getBaseData() or '')
+    return data_len
 
   getcontentlength = get_size
 

Modified: erp5/trunk/products/ERP5OOo/tests/testDms.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/tests/testDms.py?rev=16221&r1=16220&r2=16221&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/tests/testDms.py (original)
+++ erp5/trunk/products/ERP5OOo/tests/testDms.py Mon Sep 10 14:01:53 2007
@@ -425,6 +425,21 @@
     # for REFVER: (3)
     # for REFVERLANG: (3)
 
+  def testOOoDocument_get_size(self):
+    # test get_size on OOoDocument
+    doc = self.portal.document_module.newContent(portal_type='Spreadsheet')
+    doc.edit(file=makeFileUpload('import_data_list.ods'))
+    self.assertEquals(len(makeFileUpload('import_data_list.ods').read()),
+                      doc.get_size())
+
+  def testTempOOoDocument_get_size(self):
+    # test get_size on temporary OOoDocument
+    from Products.ERP5Type.Document import newTempOOoDocument
+    doc = newTempOOoDocument(self.portal, 'tmp')
+    doc.edit(base_data='OOo')
+    self.assertEquals(len('OOo'), doc.get_size())
+
+
 if __name__ == '__main__':
     framework()
 else: