Changeset 5628

Timestamp:

Aug 8, 2008, 9:28:34 AM (15 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).

Location:

anuga_core/source/anuga

Files:

• shallow_water/urs_ext.c (modified) (5 diffs)
• utilities/data_audit.py (modified) (1 diff)
• utilities/xml_tools.py (modified) (3 diffs)

anuga_core/source/anuga/shallow_water/urs_ext.c

@@ -2 +2 @@
 gcc -fPIC -c urs_ext.c -I/usr/include/python2.5 -o urs_ext.o -Wall -O
 gcc -shared urs_ext.o  -o urs_ext.so
-*/
-
-/*
-This file was reverted from changeset:5484 to changeset:5470 on 10th July 
-by Ole.
 */
 
@@ -30 +25 @@
 
 static long numDataMax=0;
+
+
+/*The MUX file format 
+
+
+ */
+
+
 
 /////////////////////////////////////////////////////////////////////////
@@ -294 +297 @@
     }
 
+    
     // Store time resolution and number of timesteps    
     // These are the same for all stations as tested above, so 
@@ -394 +398 @@
     muxData = (float*) malloc(numDataMax*sizeof(float));
     
-    /* Loop over all sources */
+    // Loop over all sources
     for (isrc = 0; isrc < numSrc; isrc++)
     {
@@ -437 +441 @@
                           total_number_of_stations, 
                           number_of_time_steps,
-                          mytgs0[ista].ig, 
+                          mytgs0[ista].ig, // Grid number (if -1 fill with zeros)
                           fros_per_source, 
                           lros_per_source, 

anuga_core/source/anuga/utilities/data_audit.py

@@ -257 +257 @@
     """
 
+    if verbose:
+        print 'Parsing', license_filename
+        
     doc = xml2object(license_filename)
     

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))