# HG changeset patch # User abukhman # Date 1282219375 -7200 # Node ID 13c15842615f14a6e1efdcff5ff74aa3c7e5a2e1 # Parent 070b61f32519cc68117acb415d8c2a9d9463a747 characterNormalization diff -r 070b61f32519 -r 13c15842615f MpdlXmlTextServer.py --- a/MpdlXmlTextServer.py Thu Aug 12 13:45:59 2010 +0200 +++ b/MpdlXmlTextServer.py Thu Aug 19 14:02:55 2010 +0200 @@ -1,7 +1,6 @@ from OFS.SimpleItem import SimpleItem from Products.PageTemplates.PageTemplateFile import PageTemplateFile - from Ft.Xml import EMPTY_NAMESPACE, Parse import sys @@ -10,7 +9,6 @@ import documentViewer from documentViewer import getTextFromNode, serializeNode - class MpdlXmlTextServer(SimpleItem): """TextServer implementation for MPDL-XML eXist server""" meta_type="MPDL-XML TextServer" @@ -30,19 +28,16 @@ self.serverUrl = serverUrl else: self.serverUrl = "http://%s/mpdl/interface/"%serverName - def getHttpData(self, url, data=None): """returns result from url+data HTTP request""" return documentViewer.getHttpData(url,data,timeout=self.timeout) - def getServerData(self, method, data=None): """returns result from text server for method+data""" url = self.serverUrl+method return documentViewer.getHttpData(url,data,timeout=self.timeout) - def getSearch(self, pn=1, pageinfo=None, docinfo=None, query=None, queryType=None, lemma=None): """get search list""" docpath = docinfo['textURLPath'] @@ -135,7 +130,7 @@ docinfo['numPages'] = text.count("