Changeset 2075 for TI02-CSML

Timestamp:

30/01/07 08:21:34 (13 years ago)

Author:

domlowe

Message:

recursion handled better in schema checking

File:

• TI02-CSML/trunk/csml/csml2Moles/molesReadWrite.py (modified) (4 diffs)

TI02-CSML/trunk/csml/csml2Moles/molesReadWrite.py

@@ -26 +26 @@
                             seqlist.append(subelem.attrib['name'])
             self.sequences[molesname]=seqlist
+        
+        def __checkSubElem(elem):
+            for subelem in elem[:]:
+                if subelem.tag=='{http://www.w3.org/2001/XMLSchema}sequence':
+                    __addSequence(molesclassname,subelem)
+                    __checkSubElem(subelem)
+        
+        def __checkDeepSubElem(elem):
+            for subelem in elem[:]:
+                if subelem.tag == '{http://www.w3.org/2001/XMLSchema}complexType':
+                    for subsubelem in subelem[:]:
+                        if subsubelem.tag=='{http://www.w3.org/2001/XMLSchema}sequence':
+                            __addSequence(molesclassname,subsubelem)
+                            __checkDeepSubElem(subsubelem)    
 
         for event, elem in ET.iterparse(schema):
@@ -34 +48 @@
                     if elem.attrib['name'][-4:]=='Type':
                         molesclassname=molesclassname[:-4]
-                    for subelem in elem[:]:
-                        if subelem.tag=='{http://www.w3.org/2001/XMLSchema}sequence':
-                            __addSequence(molesclassname,subelem)
-                            for subsubelem in subelem[:]:
-                                if subsubelem.tag=='{http://www.w3.org/2001/XMLSchema}sequence':
-                                    __addSequence(molesclassname,subsubelem)
+                    __checkSubElem(elem)                    
 
             if elem.tag == '{http://www.w3.org/2001/XMLSchema}element':
@@ -46 +55 @@
                 if elem.attrib.has_key('name'):
                     molesclassname= elem.attrib['name']
-                    for subelem in elem[:]:
-                        if subelem.tag == '{http://www.w3.org/2001/XMLSchema}complexType':
-                            for subsubelem in subelem[:]:
-                                if subsubelem.tag=='{http://www.w3.org/2001/XMLSchema}sequence':
-                                    __addSequence(molesclassname,subsubelem)
+                    __checkDeepSubElem(elem)
 
             '''this bit handles the use of types. If some element has a name and a type attribute then if that type is complex it has
@@ -77 +82 @@
             order = []
             for key in dict:
-                #print key
+                #print key error
+                print 'KEY ERROR %s'%classname
                 if key is not 'schema':
                     if key is not 'ns':