--- documentViewer/MpdlXmlTextServer.py 2010/06/17 16:48:14 1.2 +++ documentViewer/MpdlXmlTextServer.py 2010/06/17 18:34:36 1.4 @@ -20,12 +20,15 @@ class MpdlXmlTextServer(SimpleItem): manage_changeMpdlXmlTextServerForm = PageTemplateFile("zpt/manage_changeMpdlXmlTextServer", globals()) - def __init__(self,id,title="",serverUrl="http://mpdl-proto.mpiwg-berlin.mpg.de/mpdl/interface/", timeout=40): + def __init__(self,id,title="",serverUrl="http://mpdl-proto.mpiwg-berlin.mpg.de/mpdl/interface/", serverName=None, timeout=40): """constructor""" self.id=id self.title=title self.timeout = timeout - self.serverUrl = serverUrl + if serverName is None: + self.serverUrl = serverUrl + else: + self.serverUrl = "http://%s/mpdl/interface/"%serverName def getHttpData(self, url, data=None): @@ -118,7 +121,7 @@ class MpdlXmlTextServer(SimpleItem): return serializeNode(pagenode) return "no text here" - def getNumPages(self,docinfo=None): + def getNumPages(self, docinfo): """get list of pages from fulltext and put in docinfo""" if 'numPages' in docinfo: # already there @@ -325,4 +328,4 @@ def manage_addMpdlXmlTextServer(self,id, RESPONSE.redirect('manage_main') - \ No newline at end of file +