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

[nobody at svn.erp5.org]

Author: bartek
Date: Sun Aug 13 19:55:28 2006
New Revision: 9188

URL: http://svn.erp5.org?rev=9188&view=rev
Log:
server coordinates drawn from preferences

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=9188&r1=9187&r2=9188&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/Document/OOoDocument.py (original)
+++ erp5/trunk/products/ERP5OOo/Document/OOoDocument.py Sun Aug 13 19:55:28 2006
@@ -39,6 +39,7 @@
 import xmlrpclib, base64, mimetypes
 # to overwrite WebDAV methods
 from Products.CMFDefault.File import File as CMFFile
+from Products.CMFCore.utils import getToolByName
 
 mimetypes.init()
 
@@ -147,10 +148,15 @@
 
   def _getServerCoordinates(self):
     """
-    Returns OOo conversion server data from some
-    preferences. NOT IMPLEMENTED YET - XXX
-    """
-    return '127.0.0.1',8080
+    Returns OOo conversion server data from 
+    preferences
+    """
+    pref=getToolByName(self,'portal_preferences')
+    adr=pref.getPreferredDmsOoodocServerAddress()
+    nr=pref.getPreferredDmsOoodocServerPortNumber()
+    if adr is None or nr is None:
+      raise Exception('you should set conversion server coordinates in preferences')
+    return adr,nr
 
   def _mkProxy(self):
     sp=xmlrpclib.ServerProxy('http://%s:%d' % self._getServerCoordinates(),allow_none=True)
@@ -165,13 +171,13 @@
     return (code,m)
 
   security.declareProtected(Permissions.ModifyPortalContent,'convert')
-  def convert(self,REQUEST=None):
+  def convert(self,force=0,REQUEST=None):
     """
     Converts from the initial format to OOo format;
     communicates with the conversion server
     and gets converted file as well as metadata
     """
-    if not self.isFileUploaded():
+    if force==0 and not self.isFileUploaded():
       return self.returnMessage('OOo file is up do date')
     try:
       self._convert()