--- documentViewer/MpdlXmlTextServer.py	2011/08/05 09:24:42	1.238.2.8
+++ documentViewer/MpdlXmlTextServer.py	2011/08/05 17:04:20	1.238.2.10
@@ -244,18 +244,22 @@ class MpdlXmlTextServer(SimpleItem):
             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
+            # numPlaces
+            elif dc == 'countPlaces':
+                docinfo['numPlaces'] = getInt(div.text)
                 
             # numTextPages
             elif dc == 'countPages':
@@ -302,6 +306,7 @@ class MpdlXmlTextServer(SimpleItem):
             textmode = "textPollux"
         elif not mode:
             # default is text
+            mode = "text"
             textmode = "text"
         else:
             textmode = mode
@@ -340,7 +345,7 @@ class MpdlXmlTextServer(SimpleItem):
                 return serialize(pagediv)
             
         # text-with-links mode
-        elif mode == "text_dict":
+        elif mode == "dict":
             if pagediv is not None:
                 # check all a-tags
                 links = pagediv.findall(".//a")