Diff for /documentViewer/MpdlXmlTextServer.py between versions 1.33 and 1.37

version 1.33, 2010/09/23 15:29:06 version 1.37, 2010/09/24 12:21:00
Line 48  class MpdlXmlTextServer(SimpleItem): Line 48  class MpdlXmlTextServer(SimpleItem):
         pn = pageinfo['searchPN']          pn = pageinfo['searchPN']
         sn = pageinfo['sn']          sn = pageinfo['sn']
         highlightQuery = pageinfo['highlightQuery']          highlightQuery = pageinfo['highlightQuery']
         #query =pageinfo['query']          query =pageinfo['query']
         queryType =pageinfo['queryType']          queryType =pageinfo['queryType']
         viewMode=  pageinfo['viewMode']          viewMode=  pageinfo['viewMode']
         tocMode = pageinfo['tocMode']          tocMode = pageinfo['tocMode']
Line 149  class MpdlXmlTextServer(SimpleItem): Line 149  class MpdlXmlTextServer(SimpleItem):
         if highlightQuery is not None:          if highlightQuery is not None:
             textParam +="&highlightQuery=%s&sn=%s"%(highlightQuery,sn)                         textParam +="&highlightQuery=%s&sn=%s"%(highlightQuery,sn)           
                   
         pagexml = self.getServerData("page-fragment.xql",textParam)          pagexml = self.getServerData("page-fragment.xql",urllib.quote(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)
                   
         pagedom = Parse(pagexml)          pagedom = Parse(pagexml)
Line 249  class MpdlXmlTextServer(SimpleItem): Line 249  class MpdlXmlTextServer(SimpleItem):
          docpath = docinfo['textURLPath']            docpath = docinfo['textURLPath'] 
          pagesize = pageinfo['queryPageSize']           pagesize = pageinfo['queryPageSize']
          pn = pageinfo['searchPN']           pn = pageinfo['searchPN']
          #query =pageinfo['query']           query =pageinfo['query']
          queryType =pageinfo['queryType']           queryType =pageinfo['queryType']
          tocSearch = 0           tocSearch = 0
          tocDiv = None           tocDiv = None

Removed from v.1.33  
changed lines
  Added in v.1.37


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