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

Diff for /documentViewer/MpdlXmlTextServer.py between versions 1.199 and 1.203

version 1.199, 2010/10/26 14:44:55 version 1.203, 2010/11/02 15:51:41
Line 38  class MpdlXmlTextServer(SimpleItem): Line 38  class MpdlXmlTextServer(SimpleItem):
         url = self.serverUrl+method          url = self.serverUrl+method
         return documentViewer.getHttpData(url,data,timeout=self.timeout)          return documentViewer.getHttpData(url,data,timeout=self.timeout)
   
     def getSearch(self, pn=1, pageinfo=None,  docinfo=None, query=None, queryType=None, lemma=None, characterNormalization=None):      def getSearch(self, pn=1, pageinfo=None,  docinfo=None, query=None, queryType=None, lemma=None, characterNormalization=None, optionsClose=None):
         """get search list"""          """get search list"""
         docpath = docinfo['textURLPath']           docpath = docinfo['textURLPath'] 
         url = docinfo['url']          url = docinfo['url']
Line 135  class MpdlXmlTextServer(SimpleItem): Line 135  class MpdlXmlTextServer(SimpleItem):
         text=self.getServerData("xpath.xql", "document=%s&xpath=%s"%(docinfo['textURLPath'], xpath))          text=self.getServerData("xpath.xql", "document=%s&xpath=%s"%(docinfo['textURLPath'], xpath))
         dom = Parse(text)          dom = Parse(text)
         result= dom.xpath("//result/resultPage")          result= dom.xpath("//result/resultPage")
            
         docinfo['numPages']=int(getTextFromNode(result[0]))          docinfo['numPages']=int(getTextFromNode(result[0]))
         return docinfo          return docinfo
           
Line 178  class MpdlXmlTextServer(SimpleItem): Line 179  class MpdlXmlTextServer(SimpleItem):
             logging.debug("getALLGisPlaces :%s"%(myList))              logging.debug("getALLGisPlaces :%s"%(myList))
         return myList          return myList
           
       
       def getPDF (self, docinfo=None, pageinfo=None):
           """Show and Save different Pages as PDF in Options"""
           selfurl=self.absolute_url()
           pn=pageinfo['current']
           
           viewMode =pageinfo['viewMode']
           
           #text = ("page-fragment.xql","document=%s&mode=%s&pn=%s&export=%s"%(docinfo['textURLPath'], 'text',  pn,'pdf'))
           #text = self.getServerData("page-fragment.xql", "document=%s&mode=%s&pn=%s&export=%s"(docinfo['textURLPath'],'text', pn,'pdf'))
           #logging.debug("text :%s"%(text))
           #dom =Parse(text)
           #logging.debug("text :%s"%(text))
           #return text 
              
     def getOrigPages (self, docinfo=None, pageinfo=None):      def getOrigPages (self, docinfo=None, pageinfo=None):
         """Show original page """          """Show original page """
         docpath = docinfo['textURLPath']           docpath = docinfo['textURLPath'] 
           logging.debug ("docinfo['textURLPath']=%s"%(docinfo['textURLPath']))
         #url = docinfo['url']          #url = docinfo['url']
         selfurl = self.absolute_url()          selfurl = self.absolute_url()
         pn =pageinfo['current']          pn =pageinfo['current']
Line 196  class MpdlXmlTextServer(SimpleItem): Line 213  class MpdlXmlTextServer(SimpleItem):
             return originalPage              return originalPage
           
           
     def getTextPage(self, mode="text", pn=1, docinfo=None, pageinfo=None, viewMode=None, tocMode=None, tocPN=None, characterNormalization="", highlightQuery=None, sn=None):      def getTextPage(self, mode="text", pn=1, docinfo=None, pageinfo=None, viewMode=None, tocMode=None, tocPN=None, characterNormalization="", highlightQuery=None, sn=None, optionsClose=None):
         """returns single page from fulltext"""          """returns single page from fulltext"""
         docpath = docinfo['textURLPath']          docpath = docinfo['textURLPath']
         path = docinfo['textURLPath']          path = docinfo['textURLPath']
Line 316  class MpdlXmlTextServer(SimpleItem): Line 333  class MpdlXmlTextServer(SimpleItem):
         #pagexml=self.template.fulltextclient.eval("/mpdl/interface/lt/lemma.xql","document=&language="+str(language)+"&lemma="+url_quote(str(query)))          #pagexml=self.template.fulltextclient.eval("/mpdl/interface/lt/lemma.xql","document=&language="+str(language)+"&lemma="+url_quote(str(query)))
         return data          return data
           
     def getQuery (self,  docinfo=None, pageinfo=None, query=None, queryType=None, pn=1):      def getQuery (self,  docinfo=None, pageinfo=None, query=None, queryType=None, pn=1, optionsClose=None):
          """number of"""           """number of"""
          docpath = docinfo['textURLPath']            docpath = docinfo['textURLPath'] 
          pagesize = pageinfo['queryPageSize']           pagesize = pageinfo['queryPageSize']
Removed from v.1.199  
changed lines
  Added in v.1.203

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