Changeset 5628 for anuga_core/source/anuga/utilities/xml_tools.py

Timestamp:

Aug 8, 2008, 9:28:34 AM (16 years ago)

Author:

ole

Message:

Added error check in xml_tools to catch text nodes followed by non-text nodes.
This was in response to an error in one of the license files (not yet fixed).

File:

• anuga_core/source/anuga/utilities/xml_tools.py (modified) (3 diffs)

anuga_core/source/anuga/utilities/xml_tools.py

@@ -239 +239 @@
         fid = xml
 
-    dom = parse(fid)
-
-##     try:
-##         dom = parse(fid)
-##     except Exception, e:
-##         # Throw filename into dom exception
-##         msg = 'XML file "%s" could not be parsed: ' %fid.name
-##         msg += str(e)
-##         raise Exception, msg
-
-    return dom2object(dom)
+    try:
+        dom = parse(fid)
+    except Exception, e:
+        # Throw filename into dom exception
+        msg = 'XML file "%s" could not be parsed.\n' %fid.name
+        msg += 'Error message from parser: "%s"' %str(e)
+        raise Exception, msg
+
+    try:
+        xml_object = dom2object(dom)
+    except Exception, e:
+        msg = 'Could not convert %s into XML object.\n' %fid.name
+        msg += str(e)
+        raise Exception, msg
+    
+    return xml_object
 
 
@@ -258 +263 @@
 
     value = []
+    textnode_encountered = None
     for n in node.childNodes:
-
+    
         if n.nodeType == 3:
             # Child is a text element - omit the dom tag #text and
             # go straight to the text value.
-
+            
+            # Note - only the last text value will be recorded
+            
             msg = 'Text element has child nodes - this shouldn\'t happen'
             assert len(n.childNodes) == 0, msg
@@ -273 +281 @@
                 continue
             
-            value = x
+            textnode_encountered = value = x
         else:
             # XML element
+            
+            
+            if textnode_encountered is not None:
+                msg = 'A text node was followed by a non-text tag. This is not allowed.\n'
+                msg += 'Offending text node: "%s" ' %str(textnode_encountered)            
+                msg += 'was followed by node named: "<%s>"' %str(n.nodeName)
+                raise Exception, msg
+            
 
             value.append(dom2object(n))