[Erp5-report] r13256 - /erp5/trunk/products/ERP5OOo/Document/OOoDocument.py

[nobody at svn.erp5.org]

Author: bartek
Date: Wed Mar  7 12:42:59 2007
New Revision: 13256

URL: http://svn.erp5.org?rev=13256&view=rev
Log:
convertToBase moved to Document as generic method; fixed calls to processing status workflow;

Modified:
    erp5/trunk/products/ERP5OOo/Document/OOoDocument.py

Modified: erp5/trunk/products/ERP5OOo/Document/OOoDocument.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/Document/OOoDocument.py?rev=13256&r1=13255&r2=13256&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/Document/OOoDocument.py (original)
+++ erp5/trunk/products/ERP5OOo/Document/OOoDocument.py Wed Mar  7 12:42:59 2007
@@ -132,6 +132,8 @@
         'mode'        : ''},
   )
 
+  base_format = 'Open Document Format'
+
   # regexps for stripping xml from docs
   rx_strip = re.compile('<[^>]*?>', re.DOTALL|re.MULTILINE)
   rx_compr = re.compile('\s+')
@@ -195,28 +197,6 @@
     m = Message(domain='ui', message=msg)
     return (code, m)
 
-  security.declareProtected(Permissions.View, 'convert')
-  def convertToBase(self, REQUEST=None):
-    """
-      Converts from the initial format to base format (ODF);
-      communicates with the conversion server
-      and gets converted file as well as metadata
-    """
-    try:
-      self._convertToBase()
-      msg = 'Converted to Open Document Format.'
-      self.convertFile(comment=msg) # Invoke workflow method
-    except ConversionError, e:
-      msg = 'Problem: %s' % (str(e) or 'undefined.')
-      self.processFile(comment=msg)
-    except Fault, e:
-      msg = 'Problem: %s' % (repr(e) or 'undefined.')
-      self.processFile(comment=msg)
-    except socket.error, e:
-      msg = 'Problem: %s' % (repr(e) or 'undefined.')
-      self.processFile(comment=msg)
-    return msg
-
   security.declareProtected(Permissions.AccessContentsInformation,'getTargetFormatList')
   def getTargetFormatItemList(self):
     """