Changeset 168 for Xml/xsd-fu/trunk/generateDS/generateDS.py

Timestamp:

04/11/08 13:59:39 (8 months ago)

Author:

callan

Message:

generateDS bug fixes:

• Nested simpleType definitions now handled universally (booleans are insufficient)
  
• New style classes throughout
  

xsd-fu additions:

• Basic support for OME XML 2003 model (some hacks required)
  
• Full support for OME XML 2008 model
  
• XML Schema namespace definition support with "-n" command line argument
  
• More configuration of certain overrides in xsd-fu mapping now available
  

Files:

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

Xml/xsd-fu/trunk/generateDS/generateDS.py

@@ -204 +204 @@
 
 
-class XschemaElementBase:
+class XschemaElementBase(object):
     def __init__(self):
         pass
@@ -667 +667 @@
 
 
-class XschemaAttributeGroup:
+class XschemaAttributeGroup(object):
     def __init__(self, name='', group=None):
         self.name = name
@@ -695 +695 @@
 # end class XschemaAttributeGroup
 
-class XschemaAttribute:
+class XschemaAttribute(object):
     def __init__(self, name, data_type='xs:string', use='optional'):
         self.name = name
@@ -871 +871 @@
             SimpleTypeDict[stName] = element
             self.stack.append(element)
-            self.inSimpleType = 1
+            self.inSimpleType += 1
         elif name == RestrictionType:
             # If we are in a simpleType, capture the name of
             #   the restriction base.
-            if self.inSimpleType and 'base' in attrs.keys():
+            if self.inSimpleType > 0 and 'base' in attrs.keys():
                 self.stack[-1].setBase(attrs['base'])
             self.inRestrictionType = 1
@@ -890 +890 @@
                 # find the last element.
                 element = None
-                for entry in list(stack).reverse():
+                reverse = list(self.stack)
+                reverse.reverse()
+                logging.debug("Found enum, reverse stack: %s" % reverse)
+                for entry in reverse:
                     if type(entry) == XschemaElement:
                         element = entry
                 if element is None:
                     sys.stderr.write(
-                        'Cannot find element to attach enumeration: %s' % \
-                            value)
+                        'Cannot find element to attach enumeration: %s\n' % \
+                            attrs['value'])
                     sys.exit(-1)
                 element.values.append(attrs['value'])
-            elif self.inSimpleType and attrs.has_key('value'):
+            elif self.inSimpleType > 0 and attrs.has_key('value'):
                 # We've been defined as a simpleType on our own.
                 self.stack[-1].values.append(attrs['value'])
@@ -920 +923 @@
     def endElement(self, name):
         logging.debug("End element: %s" % (name))
-        logging.debug("End element stack: %d" % (len(self.stack)))
-        if name == SimpleTypeType and self.inSimpleType:
-            self.inSimpleType = 0
+        logging.debug("End element stack length: %d" % (len(self.stack)))
+        if name == SimpleTypeType and self.inSimpleType > 0:
+            self.inSimpleType -= 1
             # If the simpleType is directly off the root, it may be used to 
             # qualify the type of many elements and/or attributes so we 
@@ -935 +938 @@
             self.inNonanonymousComplexType = 0
             element = self.stack.pop()
+            logging.debug("Adding %s as child of %s" % (element, self.stack[-1]))
             self.stack[-1].addChild(element)
         elif name == ComplexTypeType:
@@ -975 +979 @@
             pass
         elif name == ListType:
-            # List types are only used with a parent simpleType and can have a
-            # simpleType child. So, if we're in a list type we have to be
-            # careful to reset the inSimpleType flag otherwise the handler's
-            # internal stack will not be unrolled correctly.
-            self.inSimpleType = 1
             self.inListType = 0