# HG changeset patch # User abukhman # Date 1271857859 -7200 # Node ID a679c8c7148d23fc0790e9b3071880d4041fab4d # Parent db6d594aa4d95e28cc0219507aa4417f0963166f getTranslate, getLemma two functions diff -r db6d594aa4d9 -r a679c8c7148d documentViewer.py --- a/documentViewer.py Mon Apr 19 15:13:13 2010 +0200 +++ b/documentViewer.py Wed Apr 21 15:50:59 2010 +0200 @@ -669,12 +669,16 @@ sn = pageinfo['sn'] query =pageinfo['query'] queryType =pageinfo['queryType'] - + viewMode= pageinfo['viewMode'] + tocMode = pageinfo['tocMode'] + tocPN = pageinfo['tocPN'] pagexml=self.template.fulltextclient.eval("/mpdl/interface/doc-query.xql","document=%s&mode=%s&queryType=%s&query=%s&queryResultPageSize=%s&queryResultPN=%s&sn=%s"%(docpath, 'text', queryType, query, pagesize, pn, sn) ,outputUnicode=False) pagedom = Parse(pagexml) #pagedivs = pagedom.xpath("//div[@class='queryResultPage']") - - return pagexml + selfurl = self.absolute_url() + page = pagexml.replace('page-fragment.xql?document=/echo/la/Benedetti_1585.xml','%s?url=/mpiwg/online/permanent/library/163127KK&viewMode=%s&tocMode=%s&tocPN=%s&query=%s&queryType=%s'%(selfurl, viewMode, tocMode, tocPN, query, queryType)) + text =page.replace('mode=text','mode=texttool') + return text #if len(pagedivs) > 0: # pagenode = pagedom[0] # return serializeNode(pagenode) @@ -689,7 +693,7 @@ docinfo['numPages'] = text.count(" 0: - pagenode = pagedivs[0] - return serializeNode(pagenode) - else: - return "No TOC!" + #pagedivs = pagedom.xpath("//div[@class='queryResultPage']") + #if len(pagedivs) > 0: + # pagenode = pagedivs[0] + # return serializeNode(pagenode) + #else: + # return "No TOC!" def changeDocumentViewer(self,title="",digilibBaseUrl=None,thumbrows=2,thumbcols=5,authgroups='mpiwg',RESPONSE=None):