Changeset 574:4778900ae3e2 in documentViewer

Timestamp:

Oct 16, 2012, 3:34:40 PM (12 years ago)

Author:

casties

Branch:

default

Message:

viewMode=xml works now

File:

• MpiwgXmlTextServer.py (modified) (5 diffs)

MpiwgXmlTextServer.py

@@ -268 +268 @@
             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)
@@ -311 +304 @@
         # 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)
@@ -316 +312 @@
         # 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)
@@ -321 +320 @@
         # 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
@@ -338 +340 @@
                 return serialize(pagediv)
                     
+        logging.error("getTextPage: error in text mode %s or text!"%(textmode))
         return None