Mercurial > hg > documentViewer

changeset 474:0bc4a153863a elementtree

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
more cleanup (before reversing macro order)
author casties
date Fri, 05 Aug 2011 15:31:27 +0200
parents 74e9e74277e9
children 5a3ab27385ce
files MpdlXmlTextServer.py documentViewer.py
diffstat 2 files changed, 12 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/MpdlXmlTextServer.py	Fri Aug 05 11:24:42 2011 +0200
+++ b/MpdlXmlTextServer.py	Fri Aug 05 15:31:27 2011 +0200
@@ -244,19 +244,19 @@
             elif dc == 'pageNumberOrigNorm':
                 pageinfo['pageNumberOrigNorm'] = div.text
                 
-            # pageNumberOrigNorm
+            # pageHeaderTitle
+            elif dc == 'pageHeaderTitle':
+                pageinfo['pageHeaderTitle'] = div.text
+                
+            # numFigureEntries
             elif dc == 'countFigureEntries':
                 docinfo['numFigureEntries'] = getInt(div.text)
                 
-            # pageNumberOrigNorm
+            # numTocEntries
             elif dc == 'countTocEntries':
                 # WTF: s1 = int(s)/30+1
                 docinfo['numTocEntries'] = getInt(div.text)
                 
-            # pageHeaderTitle
-            elif dc == 'pageHeaderTitle':
-                docinfo['pageHeaderTitle'] = div.text
-                
             # numTextPages
             elif dc == 'countPages':
                 np = getInt(div.text)                    
--- a/documentViewer.py	Fri Aug 05 11:24:42 2011 +0200
+++ b/documentViewer.py	Fri Aug 05 15:31:27 2011 +0200
@@ -300,6 +300,12 @@
             else:
                 viewMode = "images"
                 
+        elif viewMode == "text_dict":
+            # legacy fix
+            viewMode = "text"
+            viewType = "dict"
+            
+                
         pageinfo = self.getPageinfo(start=start, current=pn, docinfo=docinfo, viewMode=viewMode, viewType=viewType, tocMode=tocMode)
                     
         # get template /template/viewer_main