Changeset f1550c8

Timestamp:

May 19, 2010 2:01:16 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-3.01, version-3.02

Children:

f9c2f63

Parents:

d743d60

Message:

Modify topology_from_xml to find embedded topologies.

File:

• fedd/federation/topdl.py (modified) (3 diffs)

fedd/federation/topdl.py

@@ -483 +483 @@
 
     class parser:
-        def __init__(self):
+        def __init__(self, top):
             self.stack = [ ]
             self.chars = ""
@@ -490 +490 @@
             self.current = { }
             self.in_cdata = False
+            self.in_top = False
+            self.top = top
         
         def start_element(self, name, attrs):
@@ -495 +497 @@
             self.have_chars = False
             self.key = str(name)
-            self.stack.append((self.current, self.key))
-            self.current = { }
+
+            if name == self.top:
+                self.in_top = True
+
+            if self.in_top:
+                self.stack.append((self.current, self.key))
+                self.current = { }
 
         def end_element(self, name):
-            if self.have_chars:
-                self.chars = self.chars.strip()
-                if len(self.chars) >0:
-                    addit = self.chars
+            if self.in_top:
+                if self.have_chars:
+                    self.chars = self.chars.strip()
+                    if len(self.chars) >0:
+                        addit = self.chars
+                    else:
+                        addit = self.current
                 else:
                     addit = self.current
-            else:
-                addit = self.current
-
-            parent, key = self.stack.pop()
-            if parent.has_key(key):
-                if isinstance(parent[key], list):
-                    parent[key].append(addit)
+
+                parent, key = self.stack.pop()
+                if parent.has_key(key):
+                    if isinstance(parent[key], list):
+                        parent[key].append(addit)
+                    else:
+                        parent[key] = [parent[key], addit]
                 else:
-                    parent[key] = [parent[key], addit]
-            else:
-                parent[key] = addit
-            self.current = parent
-            self.key = key
+                    parent[key] = addit
+                self.current = parent
+                self.key = key
 
             self.chars = ""
             self.have_chars = False
 
+            if name == self.top:
+                self.in_top= False
+
         def char_data(self, data):
-            self.have_chars = True
-            self.chars += data
-
-    p = parser()
+            if self.in_top:
+                self.have_chars = True
+                self.chars += data
+
+    p = parser(top=top)
     xp = xml.parsers.expat.ParserCreate()