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

Timestamp:

Feb 8, 2008, 5:29:54 PM (17 years ago)

Author:

ole

Message:

More work on data audit of IP issues - first cut almost there

File:

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

anuga_core/source/anuga/utilities/xml_tools.py

@@ -64 +64 @@
 
 
+def remove_whitespace(s):
+    """Remove excess whitespace including newlines from string
+    """
+    import string
+    words = s.split() # Split on whitespace
+
+    return string.join(words)
+
+    #return s.replace('\n', '')
+    #s.translate(string.maketrans)
+    
 
 
@@ -130 +141 @@
         s += '<%s>' %self.tag
         if isinstance(self.value, basestring):
-            s += self.value
+            s += remove_whitespace(self.value)
         else:
             s += '\n'
@@ -148 +159 @@
         This will allow statements such as
 
-        assert xmlobject['datafile']['accountable'] == 'Jane Sexton'        
-        """
-
+        assert xmlobject['datafile']['accountable'] == 'Jane Sexton'
+
+        If more than one element matches the given key a list of all
+        matches will be returned
+        """
+
+        result = []
         for node in self.value:
             if node.tag == key:
                 if isinstance(node.value, basestring):
-                    return node.value
+                    result.append(str(node.value))
+                    #return node.value
                 else:
-                    return node
+                    result.append(node)
+                    #return node
+                    
+        if len(result) == 0:
+            return None
+        if len(result) == 1:
+            return result[0]
+        if len(result) > 1:
+            return result
+                    
+
+    def has_key(self, key):
+        found = False
+        for node in self.value:
+            if node.tag == key:
+                found = True
+
+        return found
+        
 
     def keys(self):
@@ -202 +236 @@
         fid = xml
 
-    #print fid.read()    
     dom = parse(fid)