Changeset 188

Timestamp:

06/03/08 13:30:50 (3 months ago)

Author:

callan

Message:

Fix regression introduced by r179 relating to 2003FC top level types with odd schema definitions

Files:

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

Xml/xsd-fu/trunk/fu.py

@@ -379 +379 @@
                 """
                 e = element
+                e_name = e.getName()
+                e_type = e.getType()
                 if not e.isExplicitDefine() \
-                   and (e.name not in EXPLICIT_DEFINE_OVERRIDE or not e.topLevel):
+                   and (e_name not in EXPLICIT_DEFINE_OVERRIDE or not e.topLevel):
                         logging.info("Element %s.%s not an explicit define, skipping." % (parent, e))
                         return
@@ -386 +388 @@
                         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))
+                if e_type != e_name and e_name not in EXPLICIT_DEFINE_OVERRIDE:
+                    logging.info("Element %s.%s is not a concrete type (%s != %s), skipping." % (parent, e, e_type, e_name))
                     return
                 obj = OMEModelObject(e, self)