diff MpdlXmlTextServer.py @ 496:f83ffab77502 metalify-1

last version from HEAD new zogilib version
author casties
date Fri, 18 Jun 2010 21:41:28 +0200
parents ede0c93de798
children
line wrap: on
line diff
--- a/MpdlXmlTextServer.py	Thu Jun 17 19:35:24 2010 +0200
+++ b/MpdlXmlTextServer.py	Fri Jun 18 21:41:28 2010 +0200
@@ -6,6 +6,7 @@
 
 import sys
 import logging
+import urllib
 import documentViewer
 from documentViewer import getTextFromNode, serializeNode
 
@@ -121,7 +122,7 @@
                 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
@@ -216,19 +217,19 @@
 
     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
 
@@ -328,4 +329,4 @@
         RESPONSE.redirect('manage_main')
 
 
-    
\ No newline at end of file
+