Mercurial > hg > documentViewer

changeset 574:4778900ae3e2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
viewMode=xml works now
author casties
date Tue, 16 Oct 2012 17:34:40 +0200
parents 3b53975be0c8
children f0e5e9c6737f
files MpiwgXmlTextServer.py
diffstat 1 files changed, 13 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/MpiwgXmlTextServer.py	Mon Oct 15 13:03:52 2012 +0200
+++ b/MpiwgXmlTextServer.py	Tue Oct 16 17:34:40 2012 +0200
@@ -267,18 +267,11 @@
             logging.error("Error reading page: %s"%e)
             return None
         
-        pagediv = None
-        body = dom.find('.//body')
-        if body is None:
-            logging.error("getTextPage: no body!")
-            return None
-        
-        # the text is in div@class=text
-        pagediv = body.find(".//div[@class='text']")
-        logging.debug("pagediv: %s"%repr(pagediv))
-        
         # plain text or text-with-links mode
         if textmode == "text" or textmode == "dict":
+            # the text is in div@class=text
+            pagediv = dom.find(".//div[@class='text']")
+            logging.debug("pagediv: %s"%repr(pagediv))
             if pagediv is not None:
                 #self._processPbTag(pagediv, pageinfo)
                 self._processFigures(pagediv, docinfo)
@@ -310,16 +303,25 @@
             
         # xml mode
         elif textmode == "xml":
+            # the text is in body
+            pagediv = dom.find(".//body")
+            logging.debug("pagediv: %s"%repr(pagediv))
             if pagediv is not None:
                 return serialize(pagediv)
             
         # pureXml mode WTF?
         elif textmode == "pureXml":
+            # the text is in body
+            pagediv = dom.find(".//body")
+            logging.debug("pagediv: %s"%repr(pagediv))
             if pagediv is not None:
                 return serialize(pagediv)
                   
         # gis mode FIXME!
         elif textmode == "gis":
+            # the text is in div@class=text
+            pagediv = dom.find(".//div[@class='text']")
+            logging.debug("pagediv: %s"%repr(pagediv))
             if pagediv is not None:
                 # fix empty div tags
                 self._fixEmptyDivs(pagediv)
@@ -337,6 +339,7 @@
                             
                 return serialize(pagediv)
                     
+        logging.error("getTextPage: error in text mode %s or text!"%(textmode))
         return None
 
     def _processPbTag(self, pagediv, pageinfo):