Changeset 414:ad201f406dd1 in documentViewer for MpdlXmlTextServer.py

Timestamp:

Dec 23, 2010, 3:38:41 PM (13 years ago)

Author:

abukhman

Branch:

default

Message:

* empty log message *

File:

• MpdlXmlTextServer.py (modified) (4 diffs)

MpdlXmlTextServer.py

@@ -140 +140 @@
         docpath = docinfo['textURLPath'] 
         selfurl = self.absolute_url()
+        if 'tocEntries' in docinfo:
+            # allredy there
+            return docinfo['tocEntries']
         if (docpath!=None):
             text = self.getServerData("page-fragment.xql","document=%s"%(docinfo['textURLPath']))
             dom =Parse(text)
             pagedivs = dom.xpath("//div[@class='countTocEntries']")
-            logging.debug ("pagedivs=%s"%(pagedivs))
-            originalPage = getTextFromNode(pagedivs[0])
-            tc = int (originalPage)
-            return tc
+            #logging.debug ("pagedivs=%s"%(pagedivs))
+            docinfo['tocEntries'] = getTextFromNode(pagedivs[0])
+            #tc = int (originalPage)
+            return docinfo['tocEntries']
             
     def getFigureEntries (self, docinfo=None):
@@ -153 +156 @@
         docpath = docinfo['textURLPath'] 
         selfurl = self.absolute_url()
+        if 'figureEntries' in docinfo:
+            # allredy there
+            return docinfo['figureEntries']
         if (docpath!=None):   
             text = self.getServerData("page-fragment.xql","document=%s"%(docinfo['textURLPath']))
             dom = Parse(text)
             pagedivs = dom.xpath("//div[@class='countFigureEntries']")
-            logging.debug ("pagedivs=%s"%(pagedivs))
-            originalPage = getTextFromNode(pagedivs[0])
-            tc = int (originalPage)
-            return tc
+            #logging.debug ("pagedivs=%s"%(pagedivs))
+            docinfo['figureEntries'] = getTextFromNode(pagedivs[0])
+            #tc = int (docinfo['figureEntries'])
+            return docinfo['figureEntries']
                        
     def getGisPlaces(self, docinfo=None, pageinfo=None):
@@ -211 +217 @@
         if not docpath:
             return None
-
-        logging.debug ("docinfo['textURLPath']=%s"%(docinfo['textURLPath']))
-        #url = docinfo['url']
         selfurl = self.absolute_url()
         pn =pageinfo['current']
@@ -226 +229 @@
             return originalPage
     
-    def getAllPlaces (self, docinfo=None, pageinfo=None):
+    def getAllPlaces (self, docinfo=None):
         """Show all Places if no places than 0"""
         docpath = docinfo['textURLPath'] 
-        selfurl = self.absolute_url()   
-        viewMode=  pageinfo['viewMode']
-        text = self.getServerData("page-fragment.xql","document=%s&mode=%s"%(docinfo['textURLPath'], 'text'))
+        selfurl = self.absolute_url()
+        if 'allPlaces' in docinfo:
+            # allredy there
+            return docinfo['allPlaces']
+        
+        text = self.getServerData("page-fragment.xql","document=%s"%(docinfo['textURLPath']))
         dom =Parse(text)
         pagedivs = dom.xpath("//div[@class='countPlaces']")
         logging.debug ("pagedivs=%s"%(pagedivs))
         if len(pagedivs)>0:
-            originalPage= getTextFromNode(pagedivs[0])
-            return originalPage
+            docinfo['allPlaces']= getTextFromNode(pagedivs[0])
+            #logging.debug ("docinfo['allPlaces']=%s"%(docinfo['allPlaces']))
+            return docinfo['allPlaces']
            
     def getTextPage(self, mode="text", pn=1, docinfo=None, pageinfo=None, viewMode=None, tocMode=None, tocPN=None, characterNormalization="reg", highlightQuery=None, sn=None, optionToggle=None):