Changeset 2074 for TI02-CSML

Timestamp:

29/01/07 15:43:18 (13 years ago)

Author:

domlowe

Message:

fixed namespace bug in moles parser

File:

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

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

@@ -40 +40 @@
                                 if subsubelem.tag=='{http://www.w3.org/2001/XMLSchema}sequence':
                                     __addSequence(molesclassname,subsubelem)
+
             if elem.tag == '{http://www.w3.org/2001/XMLSchema}element':
                 '''Look for parents of complex types - sometimes a complexType is declared but does not have a name and
@@ -50 +51 @@
                                 if subsubelem.tag=='{http://www.w3.org/2001/XMLSchema}sequence':
                                     __addSequence(molesclassname,subsubelem)
+
             '''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
             the same sequence as the type e.g. <xs:element name="dataModelID" type="moles:dgMetadataIDType">
@@ -70 +72 @@
     def lookupOrder(self, dict,classname):
         '''takes the attributes in a dictionary and orders them according to the schema sequence'''
-        try:
+        try:        
             order=self.sequences[classname]
-            #print classname
-            #print order
         except KeyError:
-            #print 'keyerror %s!'%classname
             order = []
             for key in dict:
-                order.append(dict[key]) # if it can't be found an unordered list is returned from the original dictionary items
+                #print key
+                if key is not 'schema':
+                    if key is not 'ns':
+                         order.append(key) # if it can't be found an unordered list is returned from the original dictionary items
+            #print 'returning %s'%order
         return order
 
@@ -128 +131 @@
         else:
             self.schema=None
+        print molesFrag.tag
         orderedAttribs=schema.lookupOrder(self.__dict__,molesFrag.tag)
         for item in orderedAttribs:
-           #print "item in orderedAttribs is %s" %item
+           print "item in orderedAttribs is %s" %item
            if type(item) is xmlSchema:
                         continue