--- documentViewer/MpdlXmlTextServer.py 2010/10/18 09:55:39 1.167 +++ documentViewer/MpdlXmlTextServer.py 2010/10/18 12:39:14 1.185 @@ -54,7 +54,7 @@ class MpdlXmlTextServer(SimpleItem): 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&highlightQuery=%s"%(docpath, 'text', queryType, urllib.quote(query), pagesize, pn, sn, viewMode,urllib.quote(highlightQuery))) + data = self.getServerData("doc-query.xql","document=%s&mode=%s&queryType=%s&query=%s&queryResultPageSize=%s&queryResultPN=%s&sn=%s&viewMode=%s&characterNormalization=%s&highlightQuery=%s"%(docpath, 'text', queryType, urllib.quote(query), pagesize, pn, sn, viewMode,characterNormalization ,urllib.quote(highlightQuery))) #page=self.template.fulltextclient.eval("/mpdl/interface/doc-query.xql","document=%s&mode=%s&queryType=%s&query=%s&queryResultPageSize=%s&queryResultPN=%s&sn=%s&viewMode=%s&highlightQuery=%s"%(docpath, 'text', queryType, query, pagesize, pn, sn, viewMode,highlightQuery) ,outputUnicode=False) pagexml = data.replace('?document=%s'%str(docpath),'?url=%s'%url) @@ -180,7 +180,7 @@ class MpdlXmlTextServer(SimpleItem): def getOrigPages (self, docinfo=None, pageinfo=None): """Show original page """ - #docpath = docinfo['textURLPath'] + docpath = docinfo['textURLPath'] #url = docinfo['url'] selfurl = self.absolute_url() pn =pageinfo['current'] @@ -189,12 +189,13 @@ class MpdlXmlTextServer(SimpleItem): text = self.getServerData("page-fragment.xql","document=%s&mode=%s&pn=%s"%(docinfo['textURLPath'], 'text', pn)) dom =Parse(text) pagedivs = dom.xpath("//div[@class='pageNumberOrig']") + logging.debug("YYYYYYpagedivs :%s"%(pagedivs)) if len(pagedivs)>0: - docinfo['originalPage'] = getTextFromNode(pagedivs[0]) + originalPage= getTextFromNode(pagedivs[0]) #return docinfo['originalPage'] - #return originalPage - return docinfo - + return originalPage + + def getTextPage(self, mode="text", pn=1, docinfo=None, pageinfo=None, highlightQuery=None,sn=None, viewMode=None, tocMode=None, tocPN=None, characterNormalization=""): """returns single page from fulltext""" docpath = docinfo['textURLPath']