[BACK]Return to MpdlXmlTextServer.py CVS log [TXT] [DIR] Up to [Repository] / documentViewer

Diff for /documentViewer/MpdlXmlTextServer.py between versions 1.195 and 1.196

version 1.195, 2010/10/25 10:42:00 version 1.196, 2010/10/25 10:49:04
Line 196  class MpdlXmlTextServer(SimpleItem): Line 196  class MpdlXmlTextServer(SimpleItem):
             return originalPage              return originalPage
           
           
     def getTextPage(self, mode="text", pn=1, docinfo=None, pageinfo=None, highlightQuery=None,sn=None, viewMode=None, tocMode=None, tocPN=None, characterNormalization=""):      def getTextPage(self, mode="text", pn=1, docinfo=None, pageinfo=None, highlightQuery=None, viewMode=None, tocMode=None, tocPN=None, characterNormalization=""):
         """returns single page from fulltext"""          """returns single page from fulltext"""
         docpath = docinfo['textURLPath']          docpath = docinfo['textURLPath']
         path = docinfo['textURLPath']          path = docinfo['textURLPath']
         url = docinfo['url']          url = docinfo['url']
         name = docinfo['name']          name = docinfo['name']
         viewMode= pageinfo['viewMode']          viewMode= pageinfo['viewMode']
           sn = pageinfo['sn']
         highlightQuery = pageinfo['highlightQuery']          highlightQuery = pageinfo['highlightQuery']
           
         tocMode = pageinfo['tocMode']          tocMode = pageinfo['tocMode']
         sn =pageinfo['sn']  
         characterNormalization=pageinfo['characterNormalization']          characterNormalization=pageinfo['characterNormalization']
         tocPN = pageinfo['tocPN']          tocPN = pageinfo['tocPN']
         selfurl = self.absolute_url()             selfurl = self.absolute_url()   
Line 213  class MpdlXmlTextServer(SimpleItem): Line 214  class MpdlXmlTextServer(SimpleItem):
             textmode = "textPollux"              textmode = "textPollux"
         else:          else:
             textmode = mode              textmode = mode
         logging.debug("documentViewer highlightQuery: %s"%(highlightQuery))          #logging.debug("documentViewer highlightQuery: %s"%(highlightQuery))
         textParam = "document=%s&mode=%s&pn=%s&characterNormalization=%s"%(docpath,textmode,pn,characterNormalization)          textParam = "document=%s&mode=%s&pn=%s&characterNormalization=%s"%(docpath,textmode,pn,characterNormalization)
         if highlightQuery is not None:          if highlightQuery is not None:
             textParam +="&highlightQuery=%s&sn=%s"%(urllib.quote(highlightQuery),sn)              textParam +="&highlightQuery=%s&sn=%s"%(urllib.quote(highlightQuery),sn)
             #textParam = "document=%s&mode=%s&pn=%s&characterNormalization=%s&highlightQuery=%s&sn=%s"%(docpath,textmode,pn,characterNormalization, highlightQuery, sn)             
             logging.debug("documentViewer highlightQuery: %s"%(highlightQuery))              logging.debug("documentViewer highlightQuery: %s"%(highlightQuery))
         pagexml = self.getServerData("page-fragment.xql",textParam)          pagexml = self.getServerData("page-fragment.xql",textParam)
         #pagexml=self.template.fulltextclient.eval("/mpdl/interface/page-fragment.xql", textParam, outputUnicode=False)          #pagexml=self.template.fulltextclient.eval("/mpdl/interface/page-fragment.xql", textParam, outputUnicode=False)
Removed from v.1.195  
changed lines
  Added in v.1.196

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>