Mercurial > hg > documentViewer
changeset 427:70db19d7b3b1
*** empty log message ***
author | abukhman |
---|---|
date | Thu, 20 Jan 2011 17:04:21 +0100 |
parents | a935129e169f |
children | 672f8857ece8 |
files | MpdlXmlTextServer.py documentViewer.py |
diffstat | 2 files changed, 3 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/MpdlXmlTextServer.py Thu Jan 13 14:45:38 2011 +0100 +++ b/MpdlXmlTextServer.py Thu Jan 20 17:04:21 2011 +0100 @@ -3,6 +3,7 @@ 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 @@ 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) @@ -478,7 +477,4 @@ 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
--- a/documentViewer.py Thu Jan 13 14:45:38 2011 +0100 +++ b/documentViewer.py Thu Jan 20 17:04:21 2011 +0100 @@ -94,7 +94,7 @@ if string.find(ie1, "Firefox") >-1: nav5= string.split(ie1, "/")[1] logging.debug("FIREFOX: %s"%(nav5)) - bt['versFirefox']=string.split(nav5, ".")[1] + bt['versFirefox']=nav5[0:3] except:pass #Opera identification try: