Changeset 474:0bc4a153863a in documentViewer

Timestamp:

Aug 5, 2011, 1:31:27 PM (13 years ago)

Author:

casties

Branch:

elementtree

Message:

more cleanup (before reversing macro order)

Files:

• MpdlXmlTextServer.py (modified) (1 diff)
• documentViewer.py (modified) (1 diff)

MpdlXmlTextServer.py

@@ -245 +245 @@
                 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

documentViewer.py

@@ -301 +301 @@
                 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)