--- documentViewer/MpdlXmlTextServer.py 2010/08/12 10:08:24 1.8 +++ documentViewer/MpdlXmlTextServer.py 2010/08/19 12:02:55 1.9 @@ -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 urllib 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 @@ class MpdlXmlTextServer(SimpleItem): 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 @@ class MpdlXmlTextServer(SimpleItem): docinfo['numPages'] = text.count("