Changeset 179 for Xml/xsd-fu/trunk/fu.py

Timestamp:

05/29/08 17:40:03 (6 months ago)

Author:

callan

Message:

• Fixes issues with back references (totally broken previously)
  
• Specific type resolution fixes which were made apparent by Correction and Immersion
  

Files:

• Xml/xsd-fu/trunk/fu.py (modified) (4 diffs)

Xml/xsd-fu/trunk/fu.py

@@ -280 +280 @@
                 self.base = element.getBase()
                 self.name = element.getName()
+                self.type = element.getType()
                 self.properties = dict()
         
@@ -318 +319 @@
         
         def __str__(self):
-                return self.__repr__(self)
+                return self.__repr__()
         
         def __repr__(self):
@@ -385 +386 @@
                         logging.error("Element %s.%s extension chain contains mixed and non-mixed content, skipping." % (parent, e))
                         return
+                if e.getType() != e.getName():
+                    logging.info("Element %s.%s is not a concrete type, skipping." % (parent, e))
+                    return
                 obj = OMEModelObject(e, self)
                 self.addObject(e, obj)
@@ -412 +416 @@
                                 if prop.type[-3:] == "Ref":
                                         shortName = prop.type[:-3]
-                                        if prop.type not in references:
+                                        if shortName not in references:
                                                 references[shortName] = list()
                                         references[shortName].append(o.name)
+                logging.debug("Model references: %s" % references)
 
                 for o in self.objects.values():