Changeset 179 for Xml/xsd-fu

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
  

Location:

Xml/xsd-fu/trunk

Files:

• fu.py (modified) (4 diffs)
• generateDS/generateDS.py (modified) (15 diffs)
• xsd-fu (modified) (2 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():

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

@@ -228 +228 @@
     def setBase(self, base): self.base = base
     def getBase(self): return self.base
-    def setSimpleType(self, simpleType): self.simpleType = simpleType
-    def getSimpleType(self): return self.simpleType
     def getAttributeGroups(self): return self.attributeGroups
     def setAttributeGroup(self, attributeGroup): self.attributeGroup = attributeGroup
@@ -354 +352 @@
     def getAnyAttribute(self): return self.anyAttribute
     def setSimpleType(self, simpleType): self.simpleType = simpleType
-    def getSimpleType(self): return self.simpleType
+    def getSimpleType(self): return self.simpleType.getName()
 
     def show(self, outfile, level):
@@ -423 +421 @@
             # type_val = ''
         type_val = self.resolve_type_1()
+        logging.debug("Resolving type of %s with initial type %s" % 
+                      (self, type_val))
         if type_val:
             if type_val in ElementDict:
+                logging.debug("Type %s is in ElementDict" % type_val)
                 type_val1 = type_val
                 # The following loop handles the case where an Element's 
@@ -438 +439 @@
                     element = ElementDict[type_val1]
                     t = element.resolve_type_1()
-                    # If the type is available in the SimpleTypeDict, we
-                    # know we've gone far enough in the Element hierarchy
-                    # and can return the correct base type.
-                    if t in SimpleTypeDict:
-                        type_val1 = SimpleTypeDict[t].getBase()
+                    logging.debug("Element[%s] %s from ElementDict's type " \
+                                  " resolves to %s" % (i, element, t))
+                    # If the type has a simple type, we know we've gone far 
+                    # enough in the Element hierarchy and can return the 
+                    # correct base type.
+                    if element.simpleType not in (None, 1):
+                        type_val1 = element.simpleType.getBase()
+                        logging.debug(
+                            "Resolving type based on SimpleType %s to %s" % 
+                            (element.simpleType, type_val1))
                         break
                     # If the type name is the same as the previous type name
@@ -498 +504 @@
         else:
             type_val = StringType[0]
+        logging.debug("Resolved type of %s to be %s" % (self, type_val))
         return type_val
 
@@ -507 +514 @@
             type_val = self.attrs['type']
             if type_val in SimpleTypeDict:
-                self.simpleType = type_val
+                self.simpleType = SimpleTypeDict[type_val]
         elif 'ref' in self.attrs:
             # fix
@@ -727 +734 @@
         self.inAttributeGroup = 0
         self.inSimpleType = 0
+        self.inListType = 0
+        self.inUnionType = 0
         # The last attribute we processed.
         self.lastAttribute = None
@@ -743 +752 @@
         print msg
         sys.exit(-1)
+        
+    def findLastXschemaElement(self):
+        """
+        Traverses the current stack of elements to find the first instance
+        of XschemaElement.
+        """
+        element = None
+        reverse = list(self.stack)
+        reverse.reverse()
+        for entry in reverse:
+            if isinstance(entry, XschemaElement):
+                element = entry
+        return element
 
     def startElement(self, name, attrs):
         logging.debug("Start element: %s %s" % (name, repr(attrs.items())))
+        logging.debug("Stack: %s" % self.stack)
 
         if name == SchemaType:
@@ -866 +889 @@
                 stName = None
             # If the parent is an element, mark it as a simpleType.
-            if len(self.stack) > 0:
+            if len(self.stack) > 0 and isinstance(self.stack[-1], XschemaElement):
                 self.stack[-1].setSimpleType(1)
             element = SimpleTypeElement(stName)
@@ -876 +899 @@
             #   the restriction base.
             if self.inSimpleType > 0 and 'base' in attrs.keys():
-                self.stack[-1].setBase(attrs['base'])
+                base = attrs['base']
+                parent = self.stack[-1]
+                logging.debug("Setting base '%s' on: %s" % (base, parent))
+                parent.setBase(base)
             self.inRestrictionType = 1
         elif name == EnumerationType:
@@ -889 +915 @@
                 # in the stack. We search backwards through the stack to
                 # find the last element.
-                element = None
-                reverse = list(self.stack)
-                reverse.reverse()
-                logging.debug("Found enum, reverse stack: %s" % reverse)
-                for entry in reverse:
-                    if type(entry) == XschemaElement:
-                        element = entry
+                element = self.findLastXschemaElement()
                 if element is None:
                     sys.stderr.write(
@@ -911 +931 @@
                 for member in attrs['memberTypes'].split(" "):
                     self.stack[-1].unionOf.append(member)
+            self.inUnionType = 1
         elif name == WhiteSpaceType and self.inRestrictionType:
             if attrs.has_key('value'):
@@ -919 +940 @@
             #ipshell('Parsing simpleType -- Entering ipshell.\nHit Ctrl-D to exit')
             #import pdb; pdb.set_trace()
-        logging.debug("Start element stack: %d" % len(self.stack))
 
     def endElement(self, name):
@@ -932 +952 @@
             if len(self.stack) == 1:
                 self.topLevelSimpleTypes.append(simpleType)
+            elif not self.inAttribute and not self.inListType \
+                 and not self.inRestrictionType and not self.inUnionType:
+                logging.debug("Setting simple type on %s to %s" % (self.stack[-1], simpleType))
+                self.stack[-1].simpleType = simpleType
         elif name == RestrictionType and self.inRestrictionType:
             self.inRestrictionType = 0
@@ -980 +1004 @@
         elif name == ListType:
             self.inListType = 0
+        elif name == UnionType:
+            self.inUnionType = 0
 
     def characters(self, chrs):

Xml/xsd-fu/trunk/xsd-fu

@@ -56 +56 @@
 
 Report bugs to Chris Allan <callan@blackcat.ca>""" % \
-        (error, cmd, DEFAULT_PACKAGE, NAMESPACE, cmd)
+        (error, cmd, DEFAULT_PACKAGE, DEFAULT_NAMESPACE, cmd)
         sys.exit(2)
 
@@ -104 +104 @@
         outputDirectory = None
         package = DEFAULT_PACKAGE
-        namespace = "xs:"
+        namespace = "xsd:"
 
-        model = parseXmlSchema("tmp/schemas/2003/ome.xsd", namespace)
+        model = parseXmlSchema("tmp/schemas/2008-02/ome.xsd", namespace)
         fu = TemplateInfo(outputDirectory, package)
         template = NewTextTemplate(open(CLASS_TEMPLATE).read())
         for obj in model.objects.values():
-                if obj.name == "Image":
-                        print " +-- %s(%s)" % (obj.name, obj.base)
+                if obj.name in ["Experimenter"]:
+                        print " +-- %s(base=%s, type=%s)" % (obj.name, obj.base, obj.type)
                         for prop in obj.properties.values():
                                 print " +---- %s(%s) [%d:%d]" % \