Changeset 476:1d93a8cb2d8f in documentViewer for MpdlXmlTextServer.py

Timestamp:

Aug 9, 2011, 6:27:41 PM (13 years ago)

Author:

casties

Branch:

elementtree

Message:

more new template stuff

File:

• MpdlXmlTextServer.py (modified) (6 diffs)

MpdlXmlTextServer.py

@@ -30 +30 @@
     if node is None:
         return ""
-    # ET:
-#    text = node.text or ""
-#    for e in node:
-#        text += gettext(e)
-#        if e.tail:
-#            text += e.tail
 
     # 4Suite:
@@ -188 +182 @@
             return None
 
-        url = docinfo['url']
-        selfurl = self.absolute_url()
         pn = pageinfo['current']
         hrefList=[]
@@ -207 +199 @@
         """Show all Gis Places of whole Book """
         xpath ='//echo:place'
-        docpath =docinfo['textURLPath']
-        url = docinfo['url']
-        selfurl =self.absolute_url()
-        pn =pageinfo['current']
         hrefList=[]
         myList=""
@@ -505 +493 @@
         return docinfo
     
-    def getTocPage(self, mode="text", pn=1, pageinfo=None, docinfo=None):
+    def getTocPage(self, mode="text", pn=0, pageinfo=None, docinfo=None):
         """returns single page from the table of contents"""
         logging.debug("getTocPage mode=%s, pn=%s"%(mode,pn))
@@ -522 +510 @@
             return "No ToC"
         
-        pagesize = int(pageinfo['tocPageSize'])
-        url = docinfo['url']
-        urlmode = docinfo['mode']
-        selfurl = docinfo['viewerUrl']
-        viewMode=  pageinfo['viewMode']
-        tocMode = pageinfo['tocMode']
-        tocPN = int(pageinfo['tocPN'])
-        pn = tocPN
+        pagesize = pageinfo['tocPageSize']
+        tocPN = pageinfo['tocPN']
+        if not pn:
+            pn = tocPN
 
         fulltoc = ET.fromstring(tocxml)
@@ -549 +533 @@
                     m = re.match(r'page-fragment\.xql.*pn=(\d+)', href)
                     if m is not None:
-                        # and create new url
-                        l.set('href', '%s?mode=%s&url=%s&viewMode=%s&pn=%s&tocMode=%s&tocPN=%s'%(selfurl, urlmode, url, viewMode, m.group(1), tocMode, tocPN))
+                        # and create new url (assuming parent is documentViewer)
+                        url = self.getLink('pn', m.group(1))
+                        l.set('href', url)
                     else:
                         logging.warning("getTocPage: Problem with link=%s"%href)