--- documentViewer/MpdlXmlTextServer.py 2011/01/06 15:44:18 1.222 +++ documentViewer/MpdlXmlTextServer.py 2011/01/20 16:04:21 1.224 @@ -3,6 +3,7 @@ from OFS.SimpleItem import SimpleItem from Products.PageTemplates.PageTemplateFile import PageTemplateFile from Ft.Xml import EMPTY_NAMESPACE, Parse +import md5 import sys import logging import urllib @@ -54,9 +55,7 @@ class MpdlXmlTextServer(SimpleItem): optionToggle = pageinfo['optionToggle'] tocPN = pageinfo['tocPN'] selfurl = self.absolute_url() - data = self.getServerData("doc-query.xql","document=%s&mode=%s&queryType=%s&query=%s&queryResultPageSize=%s&queryResultPN=%s&sn=%s&viewMode=%s&characterNormalization=%s&optionToggle=%s&highlightQuery=%s"%(docpath, 'text', queryType, urllib.quote(query), pagesize, pn, sn, viewMode,characterNormalization,optionToggle ,urllib.quote(highlightQuery))) - pagexml = data.replace('?document=%s'%str(docpath),'?url=%s'%url) pagedom = Parse(pagexml) @@ -183,7 +182,7 @@ class MpdlXmlTextServer(SimpleItem): url = docinfo.get('url',None) name = docinfo.get('name',None) pn =pageinfo['current'] - #viewMode= pageinfo['viewMode'] + viewMode= pageinfo['viewMode'] sn = pageinfo['sn'] highlightQuery = pageinfo['highlightQuery'] mode = pageinfo ['viewMode'] @@ -478,7 +477,4 @@ def manage_addMpdlXmlTextServer(self,id, newObj = MpdlXmlTextServer(id,title,serverUrl,timeout) self.Destination()._setObject(id, newObj) if RESPONSE is not None: - RESPONSE.redirect('manage_main') - - - + RESPONSE.redirect('manage_main') \ No newline at end of file