Changeset 4976

Timestamp:

Jan 25, 2008, 5:58:17 PM (16 years ago)

Author:

ole

Message:

Work on XML Objects
Tests are disabled because they produce output to screen, but it is getting
there

Location:

anuga_core/source/anuga/utilities

Files:

• mainland_only.lic (modified) (1 diff)
• test_xml_tools.py (added)
• xml_tools.py (modified) (1 diff)

anuga_core/source/anuga/utilities/mainland_only.lic

@@ -1 +1 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 
-  <ga_license_file>
-    <metadata>
-      <author>Ole Nielsen</author>
-      <svn_keywords>
-        <author>$Author$</author>  
-        <date>$Date$</date>
-        <revision>$Revision$</revision>
-        <url>$URL$</url>
-        <id>$Id$</id>
-      </svn_keywords>
-    </metadata>
-    <datafile>
-      <filename>mainland_only.csv</filename>
-      <checksum>-1661725548</checksum>
-      <publishable>No</publishable>
-      <accountable>Jane Sexton</accountable>
-      <source>Unknown</source>
-      <IP_owner>Geoscience Australia</IP_owner>
-      <IP_info>This is a polygon comprising easting and northing locations 
-      tracing parts of the coastline at Dampier WA as well as a rectangular area inland.
-      This is used to specifically set the onshore initial condition in a tsunami scenario
-      and here, it is used with a unit test in test_polygon.py.
-      
-      The coastline was derived from Maritime Boundaries which is a public dataset. However,
-      rumour has it that some of it was digitised from a Landgate supplied image.
-      
-      The origin and license issues are still undecided</IP_info>
-    </datafile>
+<ga_license_file>
+  <metadata>
+    <author>Ole Nielsen</author>
+    <svn_keywords>
+      <author>$Author$</author>  
+      <date>$Date$</date>
+      <revision>$Revision$</revision>
+      <url>$URL$</url>
+      <id>$Id$</id>
+    </svn_keywords>
+  </metadata>
+  <datafile>
+    <filename>mainland_only.csv</filename>
+    <checksum>-1661725548</checksum>
+    <publishable>No</publishable>
+    <accountable>Jane Sexton</accountable>
+    <source>Unknown</source>
+    <IP_owner>Geoscience Australia</IP_owner>
+    <IP_info>This is a polygon comprising easting and northing locations 
+    tracing parts of the coastline at Dampier WA as well as a rectangular area inland.
+    This is used to specifically set the onshore initial condition in a tsunami scenario
+    and here, it is used with a unit test in test_polygon.py.
+    
+    The coastline was derived from Maritime Boundaries which is a public dataset. However,
+    rumour has it that some of it was digitised from a Landgate supplied image.
+    
+    The origin and license issues are still undecided</IP_info>
+  </datafile>
 
-  </ga_license_file>
+</ga_license_file>

anuga_core/source/anuga/utilities/xml_tools.py

@@ -61 +61 @@
     if len(s)>0: s = s[:-2]
     return s
+
+
+
+
+
+#----------------------------
+# XML object model
+#----------------------------
+
+class XML_element:
+    def __init__(self, tag=None, contents=None):
+        """
+        contents can be either
+          * An XML_element
+          * a list of XML_elements
+          * a text string
+        
+        """
+        
+        if isinstance(contents, XML_element):
+            contents = [contents]
+            
+        self.elements = contents
+
+        self.tag = tag
+
+    def __add__(self, other):
+        return str(self) + str(other)
+
+    def __radd__(self, other):
+        return str(other) + str(self)    #Python swaps self and other    
+
+    def __repr__(self):
+        return str(self)
+
+    def __str__(self):
+        pass
+
+    def __str__(self, indent=0):
+
+        s = tab = ' '*indent
+        
+        s += '<%s>' %self.tag
+        if isinstance(self.elements, basestring):
+            s += self.elements
+        else:
+            s += '\n'
+            for e in self.elements:
+                s += e.__str__(indent+4)
+            s += tab
+
+        s += '</%s>\n' %self.tag
+        return s
+
+    
+
+    def pretty_print(self, indent=0):
+        """Print the document without tags using indentation
+        """
+
+        s = tab = ' '*indent
+        s += '%s: ' %self.tag        
+        if isinstance(self.elements, basestring):
+            s += self.elements
+        else:
+            s += '\n'
+            for e in self.elements:
+                s += e.pretty_print(indent+4)
+        s += '\n'
+        
+        return s
+    
+    
+    
+class XML_document(XML_element):
+
+    def __init__(self, contents=None, version='1.0', encoding='iso-8859-1'):
+        tag = '?xml version="%s" encoding="%s"' %(version, encoding)
+
+        XML_element.__init__(self,
+                             tag=tag,
+                             contents=contents)
+
+
+    def __str__(self):
+        """Generate XML representation for use with xml2object function
+        """
+        s = '<%s>\n' %self.tag
+        for e in self.elements:
+            s += str(e)
+        return s
+
+    def pretty_print(self):
+        s = ''
+        for e in self.elements:
+            s += e.pretty_print()
+
+        return s
+
+
+def xml2object(xml, verbose=False):
+    """Generate XML object model from XML file or XML text
+
+    This is the inverse operation to the __str__ representation.
+
+    Input xml can be either an
+    * xml string ??
+    * xml file
+    * open xml file object 
+
+    Return XML_document instance.
+    """
+
+    #FIXME(Ole): Do the input tests
+    #Assume open file object for now
+
+    #fid = open(xml)
+    dom = parse(xml)
+
+    print 'Res',    dom2object(dom)
+
+
+
+def dom2object(node):
+
+    if node.nodeType == 3 and len(node.nodeValue.strip()) == 0:
+        return None
+        
+    print 'Node name: "%s",' %node.nodeName,\
+          'Node type: "%s",' %node.nodeType,\
+          'Node value: "%s",' %str(node.nodeValue).strip(),\
+          'Node children: %d' %len(node.childNodes)
+
+    
+
+    if node.nodeType == 3:
+        contents = node.nodeValue.strip()
+    else:    
+        contents = []
+        for n in node.childNodes:
+            x = dom2object(n)
+            if x is not None:
+                contents.append(x)
+
+
+    if node.nodeType == 9:
+        # Document
+        X = XML_document()
+        
+    X = XML_element(tag=node.nodeName,
+                    contents=contents)
+    return X