# HG changeset patch
# User casties
# Date 1312551087 -7200
# Node ID 0bc4a153863a367c2e54f61b4daf4d1b1b7d7ffa
# Parent  74e9e74277e9aa2c8525776af8b760e4b43f8354
more cleanup (before reversing macro order)

diff -r 74e9e74277e9 -r 0bc4a153863a MpdlXmlTextServer.py
--- 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)                    
diff -r 74e9e74277e9 -r 0bc4a153863a documentViewer.py
--- 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