Changeset 432:8d8f2cbd6213 in documentViewer for MpdlXmlTextServer.py

Timestamp:

Feb 18, 2011, 11:21:46 AM (13 years ago)

Author:

abukhman

Branch:

default

Message:

* empty log message *

File:

• MpdlXmlTextServer.py (modified) (6 diffs)

MpdlXmlTextServer.py

@@ -177 +177 @@
           
            
-    def getTextPage(self, mode="text", pn=1, docinfo=None, pageinfo=None):
+    def getTextPage(self, mode="text_dict", pn=1, docinfo=None, pageinfo=None):
         """returns single page from fulltext"""
         docpath = docinfo['textURLPath']
@@ -184 +184 @@
         name = docinfo.get('name',None)
         pn =pageinfo['current']
-        viewMode= pageinfo['viewMode']
+        #viewMode= pageinfo['viewMode']
+        
         sn = pageinfo['sn']
         highlightQuery = pageinfo['highlightQuery']
@@ -303 +304 @@
         if mode == "text":
             # first div contains text
+            #mode = viewMode
             pagedivs = dom.xpath("/div")
             if len(pagedivs) > 0:      
@@ -312 +314 @@
                         href= hrefNode.nodeValue
                         if href.startswith('#note-'):
-                            hrefNode.nodeValue = href.replace('#note-',"?url=%s&viewMode=%s&tocMode=%s&tocPN=%s&pn=%s#note-"%(url,viewMode,tocMode,tocPN,pn))
+                            hrefNode.nodeValue = href.replace('#note-',"?url=%s&viewMode=text&tocMode=%s&tocPN=%s&pn=%s#note-"%(url,tocMode,tocPN,pn))
                 return serializeNode(pagenode)
         if mode == "xml":
@@ -344 +346 @@
         if mode == "text_dict":
             # first div contains text
+            #mode = pageinfo ['viewMode']
             pagedivs = dom.xpath("/div")
             if len(pagedivs) > 0:
@@ -370 +373 @@
                             l.setAttributeNS(None, 'onClick', 'popupWin.focus();')   
                         if href.startswith('#note-'):
-                            hrefNode.nodeValue = href.replace('#note-',"?url=%s&viewMode=%s&tocMode=%s&tocPN=%s&pn=%s#note-"%(url,viewMode,tocMode,tocPN,pn))    
+                            hrefNode.nodeValue = href.replace('#note-',"?url=%s&viewMode=text_dict&tocMode=%s&tocPN=%s&pn=%s#note-"%(url,tocMode,tocPN,pn))    
                 return serializeNode(pagenode)
         return "no text here"
-    
-    def getText(self, mode="text", pn=1, docinfo=None, pageinfo=None):
-        data = self.getTextPage(mode="text", pn=1 ,docinfo=docinfo, pageinfo=pageinfo)
-        logging.debug("TEXT ALL data: %s"%(data))
-        return data
-    
-    def getXML(self, mode="xml", pn=1, docinfo=None, pageinfo=None):
-        data = self.getTextPage(mode="xml", pn=1 ,docinfo=docinfo, pageinfo=pageinfo)
-        logging.debug("TEXT ALL data: %s"%(data))
-        return data
-    
-    def getDictionary(self, mode="text_dict", pn=1, docinfo=None, pageinfo=None):
-        data = self.getTextPage(mode="text_dict", pn=1 ,docinfo=docinfo, pageinfo=pageinfo)
-        logging.debug("TEXT ALL data: %s"%(data))
-        return data
     
     def getTranslate(self, query=None, language=None):