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

Diff for /documentViewer/MpdlXmlTextServer.py between versions 1.192 and 1.193

version 1.192, 2010/10/25 10:31:10 version 1.193, 2010/10/25 10:35:27
Line 205  class MpdlXmlTextServer(SimpleItem): Line 205  class MpdlXmlTextServer(SimpleItem):
         viewMode= pageinfo['viewMode']          viewMode= pageinfo['viewMode']
         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):
         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)
         textParam = "document=%s&mode=%s&pn=%s&characterNormalization=%s&highlightQuery=%s&sn=%s"%(docpath,textmode,pn,characterNormalization, highlightQuery, sn)  
         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)                         #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.192  
changed lines
  Added in v.1.193

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