--- documentViewer/MpdlXmlTextServer.py	2010/06/16 18:27:04	1.1.2.1
+++ documentViewer/MpdlXmlTextServer.py	2010/06/18 14:08:46	1.5
@@ -6,6 +6,7 @@ from Ft.Xml import EMPTY_NAMESPACE, Pars
 
 import sys
 import logging
+import urllib
 import documentViewer
 from documentViewer import getTextFromNode, serializeNode
 
@@ -20,12 +21,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 +122,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
@@ -213,19 +217,19 @@ class MpdlXmlTextServer(SimpleItem):
 
     def getTranslate(self, query=None, language=None):
         """translate into another languages"""
-        data = self.getServerData("lt/lex.xql","document=&language="+str(language)+"&query="+url_quote(str(query)))
+        data = self.getServerData("lt/lex.xql","document=&language="+str(language)+"&query="+urllib.quote(query))
         #pagexml=self.template.fulltextclient.eval("/mpdl/interface/lt/lex.xql","document=&language="+str(language)+"&query="+url_quote(str(query)))
         return data
     
     def getLemma(self, lemma=None, language=None):
         """simular words lemma """
-        data = self.getServerData("lt/lemma.xql","document=&language="+str(language)+"&lemma="+url_quote(str(lemma)))
+        data = self.getServerData("lt/lemma.xql","document=&language="+str(language)+"&lemma="+urllib.quote(lemma))
         #pagexml=self.template.fulltextclient.eval("/mpdl/interface/lt/lemma.xql","document=&language="+str(language)+"&lemma="+url_quote(str(lemma)))
         return data
     
     def getLemmaNew(self, query=None, language=None):
         """simular words lemma """
-        data = self.getServerData("lt/lemma.xql","document=&language="+str(language)+"&lemma="+url_quote(str(query)))
+        data = self.getServerData("lt/lemma.xql","document=&language="+str(language)+"&lemma="+urllib.quote(query))
         #pagexml=self.template.fulltextclient.eval("/mpdl/interface/lt/lemma.xql","document=&language="+str(language)+"&lemma="+url_quote(str(query)))
         return data
 
@@ -325,4 +329,4 @@ def manage_addMpdlXmlTextServer(self,id,
         RESPONSE.redirect('manage_main')
 
 
-    
\ No newline at end of file
+