--- documentViewer/MpdlXmlTextServer.py	2010/06/18 19:41:28	1.2.2.3
+++ documentViewer/MpdlXmlTextServer.py	2010/06/17 17:38:59	1.3
@@ -6,7 +6,6 @@ from Ft.Xml import EMPTY_NAMESPACE, Pars
 
 import sys
 import logging
-import urllib
 import documentViewer
 from documentViewer import getTextFromNode, serializeNode
 
@@ -122,7 +121,7 @@ class MpdlXmlTextServer(SimpleItem):
                 return serializeNode(pagenode)      
         return "no text here"   
                        
-    def getNumPages(self, docinfo):
+    def getNumPages(self,docinfo=None):
         """get list of pages from fulltext and put in docinfo"""
         if 'numPages' in docinfo:
             # already there
@@ -217,19 +216,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="+urllib.quote(query))
+        data = self.getServerData("lt/lex.xql","document=&language="+str(language)+"&query="+url_quote(str(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="+urllib.quote(lemma))
+        data = self.getServerData("lt/lemma.xql","document=&language="+str(language)+"&lemma="+url_quote(str(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="+urllib.quote(query))
+        data = self.getServerData("lt/lemma.xql","document=&language="+str(language)+"&lemma="+url_quote(str(query)))
         #pagexml=self.template.fulltextclient.eval("/mpdl/interface/lt/lemma.xql","document=&language="+str(language)+"&lemma="+url_quote(str(query)))
         return data
 
@@ -329,4 +328,4 @@ def manage_addMpdlXmlTextServer(self,id,
         RESPONSE.redirect('manage_main')
 
 
-    
+    
\ No newline at end of file