Mercurial > hg > documentViewer
comparison documentViewer.py @ 108:726a71254086
*** empty log message ***
| author | abukhman |
|---|---|
| date | Fri, 21 May 2010 11:33:44 +0200 |
| parents | 53c395d3175f |
| children | 7a2a2d53c021 |
comparison
equal
deleted
inserted
replaced
| 107:53c395d3175f | 108:726a71254086 |
|---|---|
| 663 pageinfo['viewMode'] = viewMode | 663 pageinfo['viewMode'] = viewMode |
| 664 pageinfo['tocMode'] = tocMode | 664 pageinfo['tocMode'] = tocMode |
| 665 pageinfo['query'] = self.REQUEST.get('query',' ') | 665 pageinfo['query'] = self.REQUEST.get('query',' ') |
| 666 pageinfo['queryType'] = self.REQUEST.get('queryType',' ') | 666 pageinfo['queryType'] = self.REQUEST.get('queryType',' ') |
| 667 pageinfo['querySearch'] =self.REQUEST.get('querySearch', 'fulltext') | 667 pageinfo['querySearch'] =self.REQUEST.get('querySearch', 'fulltext') |
| 668 | 668 pageinfo['sn'] = self.REQUEST.get('sn','') |
| 669 pageinfo['textPN'] = self.REQUEST.get('textPN','1') | 669 pageinfo['textPN'] = self.REQUEST.get('textPN','1') |
| 670 pageinfo['highlightQuery'] = self.REQUEST.get('highlightQuery','') | 670 pageinfo['highlightQuery'] = self.REQUEST.get('highlightQuery','') |
| 671 pageinfo['tocPageSize'] = self.REQUEST.get('tocPageSize', '30') | 671 pageinfo['tocPageSize'] = self.REQUEST.get('tocPageSize', '30') |
| 672 pageinfo['queryPageSize'] =self.REQUEST.get('queryPageSize', '10') | 672 pageinfo['queryPageSize'] =self.REQUEST.get('queryPageSize', '10') |
| 673 pageinfo['tocPN'] = self.REQUEST.get('tocPN', '1') | 673 pageinfo['tocPN'] = self.REQUEST.get('tocPN', '1') |
| 783 text = self.template.fulltextclient.eval("/mpdl/interface/xquery.xql", "document=%s&xquery=%s"%(docinfo['textURLPath'],xquery)) | 783 text = self.template.fulltextclient.eval("/mpdl/interface/xquery.xql", "document=%s&xquery=%s"%(docinfo['textURLPath'],xquery)) |
| 784 # TODO: better processing of the page list. do we need the info somewhere else also? | 784 # TODO: better processing of the page list. do we need the info somewhere else also? |
| 785 docinfo['numPages'] = text.count("<pb ") | 785 docinfo['numPages'] = text.count("<pb ") |
| 786 return docinfo | 786 return docinfo |
| 787 | 787 |
| 788 def getTextPage(self, mode="text", pn=1, docinfo=None, pageinfo=None,): | 788 def getTextPage(self, mode="text", pn=1, docinfo=None, pageinfo=None, highlightQuery=None,sn=None): |
| 789 """returns single page from fulltext""" | 789 """returns single page from fulltext""" |
| 790 docpath = docinfo['textURLPath'] | 790 docpath = docinfo['textURLPath'] |
| 791 #pageinfo = pageinfo['highlightQuery'] | |
| 791 if mode == "text_dict": | 792 if mode == "text_dict": |
| 792 textmode = "textPollux" | 793 textmode = "textPollux" |
| 793 else: | 794 else: |
| 794 textmode = mode | 795 textmode = mode |
| 795 | 796 |
| 796 #selfurl = self.absolute_url() | 797 #selfurl = self.absolute_url() |
| 797 #viewMode= pageinfo['viewMode'] | 798 #viewMode= pageinfo['viewMode'] |
| 798 #tocMode = pageinfo['tocMode'] | 799 #tocMode = pageinfo['tocMode'] |
| 799 #tocPN = pageinfo['tocPN'] | 800 #tocPN = pageinfo['tocPN'] |
| 800 | 801 |
| 801 pagexml=self.template.fulltextclient.eval("/mpdl/interface/page-fragment.xql", "document=%s&mode=%s&pn=%s"%(docpath,textmode,pn), outputUnicode=False) | 802 pagexml=self.template.fulltextclient.eval("/mpdl/interface/page-fragment.xql", "document=%s&mode=%s&pn=%s&highlightQuery=%s&sn=%s"%(docpath,textmode,pn,highlightQuery,sn), outputUnicode=False) |
| 803 logging.debug("documentViewer (gettoc) document=%s&mode=%s&pn=%s&highlightQuery=%s"%(docpath,textmode,pn,highlightQuery)) | |
| 802 # post-processing downloaded xml | 804 # post-processing downloaded xml |
| 803 pagedom = Parse(pagexml) | 805 pagedom = Parse(pagexml) |
| 804 # plain text mode | 806 # plain text mode |
| 805 if mode == "text": | 807 if mode == "text": |
| 806 # first div contains text | 808 # first div contains text |
