[Erp5-report] r34758 daniele - /erp5/trunk/products/ERP5OOo/OOoTemplate.py

[nobody at svn.erp5.org]

Author: daniele
Date: Fri Apr 23 17:34:05 2010
New Revision: 34758

URL: http://svn.erp5.org?rev=34758&view=rev
Log:
Move the openoffice validation test before the convert
It was not performed when format was passed

Modified:
    erp5/trunk/products/ERP5OOo/OOoTemplate.py

Modified: erp5/trunk/products/ERP5OOo/OOoTemplate.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/OOoTemplate.py?rev=34758&r1=34757&r2=34758&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/OOoTemplate.py [utf8] (original)
+++ erp5/trunk/products/ERP5OOo/OOoTemplate.py [utf8] Fri Apr 23 17:34:05 2010
@@ -558,18 +558,7 @@
       ooo = ooo_builder.render()
     else:
       ooo = ooo_builder.render(name=self.title or self.id)
-    
-    format = opts.get('format', request.get('format', None))
-    if format:
-      return self._asFormat(ooo, format, request, batch_mode)
-
-    if not format and not batch_mode:
-      request.RESPONSE.setHeader('Content-Type',
-          '%s; charset=utf-8' % self.content_type)
-      request.RESPONSE.setHeader('Content-disposition',
-          'inline;filename="%s%s"' % (self._getFileName(),
-                                      guess_extension(self.content_type) or ''))
-    
+
     if DevelopmentMode:
       # Validate XML in development mode
       from Products.ERP5OOo.tests.utils import Validator
@@ -577,7 +566,18 @@
       if err_list:
         LOG('ERP5OOo', PROBLEM,
             'Validation of %s failed:\n%s' % (self.getId(), ''.join(err_list)))
-    
+
+    format = opts.get('format', request.get('format', None))
+    if format:
+      return self._asFormat(ooo, format, request, batch_mode)
+
+    if not format and not batch_mode:
+      request.RESPONSE.setHeader('Content-Type',
+          '%s; charset=utf-8' % self.content_type)
+      request.RESPONSE.setHeader('Content-disposition',
+          'inline;filename="%s%s"' % (self._getFileName(),
+                                      guess_extension(self.content_type) or ''))
+
     return ooo
   
   def om_icons(self):