[Erp5-report] r11385 - /erp5/trunk/utils/oood/serw.py

[nobody at svn.erp5.org]

Author: kevin
Date: Mon Nov 20 15:38:13 2006
New Revision: 11385

URL: http://svn.erp5.org?rev=11385&view=rev
Log:
Add ad-hoc patch to let the server find its configuration

Modified:
    erp5/trunk/utils/oood/serw.py

Modified: erp5/trunk/utils/oood/serw.py
URL: http://svn.erp5.org/erp5/trunk/utils/oood/serw.py?rev=11385&r1=11384&r2=11385&view=diff
==============================================================================
--- erp5/trunk/utils/oood/serw.py (original)
+++ erp5/trunk/utils/oood/serw.py Mon Nov 20 15:38:13 2006
@@ -26,6 +26,10 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 ##############################################################################
+
+# Ad-hoc patch. Should be mre generic
+import sys
+sys.path.append('/etc/oood/')
 
 from SimpleXMLRPCServer import *
 from SocketServer import ThreadingMixIn
@@ -51,7 +55,7 @@
   filename, data, [metadata, extension]
   (only positional args are supported - this is xmlrpclib limitation)
   '''
-  
+
   public_funcs=('convert','getmetadata','setmetadata','generate','getmetadatatoolong')
 
   def __init__(self):
@@ -75,7 +79,7 @@
   def convert(self,w,kw):
     w.run_convert(kw)
     return True
-  
+
   def getmetadatatoolong(self,w,kw):
     w.run_getmetadatatoolong(kw)
     return True
@@ -149,7 +153,7 @@
       if kw.get('newfilename') is not None:
         self._safeRemove(self._mkName(kw['newfilename']))
     finally:
-      if w is not None: 
+      if w is not None:
         w.setFree()
 
   def _wrap(self,funcname):
@@ -194,10 +198,10 @@
             else:
               kw['data']=base64.encodestring(open(self._mkName(kw['newfilename'])).read())
           return kw
-	except  unoRuntimeException:
-	  print "unoRuntimeException in "+str(id)
-	  rebuilder=pool.pool.rebuild(id)()
-	  raise
+  except  unoRuntimeException:
+    print "unoRuntimeException in "+str(id)
+    rebuilder=pool.pool.rebuild(id)()
+    raise
         except Exception,e:
           print e
           traceback.print_tb(sys.exc_info()[2])