[Erp5-report] r11409 - /erp5/trunk/utils/oood/factory.py

[nobody at svn.erp5.org]

Author: kevin
Date: Tue Nov 21 16:59:23 2006
New Revision: 11409

URL: http://svn.erp5.org?rev=11409&view=rev
Log:
Use new variables from the config file.
Respect coding conventions.

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

Modified: erp5/trunk/utils/oood/factory.py
URL: http://svn.erp5.org/erp5/trunk/utils/oood/factory.py?rev=11409&r1=11408&r2=11409&view=diff
==============================================================================
--- erp5/trunk/utils/oood/factory.py (original)
+++ erp5/trunk/utils/oood/factory.py Tue Nov 21 16:59:23 2006
@@ -27,30 +27,32 @@
 #
 ##############################################################################
 
-import os,sys,unittest
+import os, sys, unittest
 import config
 import lib
-sys.path.append(config.unopath)
+sys.path.append(config.uno_path)
 import uno
 import worker
 
 class WorkerFactory(object):
 
   def __init__(self):
-    self.ctxLocal=uno.getComponentContext()
-    self.smgrLocal=self.ctxLocal.ServiceManager
-    self.resolver=self.smgrLocal.createInstanceWithContext("com.sun.star.bridge.UnoUrlResolver",self.ctxLocal)
+    self.ctxLocal = uno.getComponentContext()
+    self.smgrLocal = self.ctxLocal.ServiceManager
+    self.resolver = self.smgrLocal.createInstanceWithContext("com.sun.star.bridge.UnoUrlResolver", self.ctxLocal)
 
-  def build(self,pool,i):
-    '''create a context, bind it to next instance of OO using
-    calculated port number'''
-    print 'building',i
-    print str(2002+i)
-    ctx=self.resolver.resolve("uno:socket,host=localhost,port=%d;urp;StarOffice.ComponentContext" % (2002+i))
-    smgr=ctx.ServiceManager
-    desktop=smgr.createInstanceWithContext("com.sun.star.frame.Desktop",ctx)
-    return worker.Worker(i,desktop,pool)
+  def build(self, pool, i):
+    '''
+       Create a context, bind it to next instance of OO using calculated port number.
+    '''
+    print 'building', i
+    instance_port = config.pool_port_range_start + i
+    print str(instance_port)
+    ctx = self.resolver.resolve("uno:socket,host=%s,port=%d;urp;StarOffice.ComponentContext" % (config.pool_host, instance_port))
+    smgr = ctx.ServiceManager
+    desktop = smgr.createInstanceWithContext("com.sun.star.frame.Desktop", ctx)
+    return worker.Worker(i, desktop, pool)
 
-builder=WorkerFactory()
+builder = WorkerFactory()
 
 # vim: shiftwidth=2