Changeset 469:15394486ab75 in documentViewer for MpdlXmlTextServer.py

Timestamp:

Aug 3, 2011, 7:04:18 PM (13 years ago)

Author:

casties

Branch:

elementtree

Message:

working with new templates

File:

• MpdlXmlTextServer.py (modified) (3 diffs)

MpdlXmlTextServer.py

@@ -228 +228 @@
     def processPageInfo(self, dom, docinfo, pageinfo):
         """processes page info divs from dom and stores in docinfo and pageinfo"""
-        # process all toplevel divs
-        alldivs = dom.findall(".//div")
-        pagediv = None
+        # assume first second level div is pageMeta
+        alldivs = dom.find("div")
         for div in alldivs:
             dc = div.get('class')
             
-            # page content div
-            if dc == 'pageContent':
-                pagediv = div
-            
             # pageNumberOrig  
-            elif dc == 'pageNumberOrig':
+            if dc == 'pageNumberOrig':
                 pageinfo['pageNumberOrig'] = div.text
                 
@@ -248 +243 @@
             # pageNumberOrigNorm
             elif dc == 'countFigureEntries':
-                docinfo['countFigureEntries'] = getInt(div.text)
+                docinfo['numFigureEntries'] = getInt(div.text)
                 
             # pageNumberOrigNorm
             elif dc == 'countTocEntries':
                 # WTF: s1 = int(s)/30+1
-                docinfo['countTocEntries'] = getInt(div.text)
+                docinfo['numTocEntries'] = getInt(div.text)
+                
+            # pageHeaderTitle
+            elif dc == 'pageHeaderTitle':
+                docinfo['pageHeaderTitle'] = div.text
                 
             # numTextPages
@@ -312 +311 @@
         pagediv = None
         # ElementTree 1.2 in Python 2.6 can't do div[@class='pageContent']
-        alldivs = dom.findall(".//div")
+        # so we look at the second level divs
+        alldivs = dom.findall("div")
         for div in alldivs:
             dc = div.get('class')