Changeset 1742

Timestamp:

23/11/06 09:55:08 (14 years ago)

Author:

domlowe

Message:

collections of features working

Location:

TI02-CSML/branches/CSML2

Files:

• csParser.py (modified) (7 diffs)
• test.xml (modified) (1 diff)

TI02-CSML/branches/CSML2/csParser.py

@@ -63 +63 @@
     def toXML(self, csmlfrag):
     #process self... and convert  to XML 
+        if hasattr(self, 'CONTENT'):
+                if self.CONTENT is not None: csmlfrag.text=self.CONTENT
         for item in self.__dict__:
             if item in self.ATTRIBUTES:
@@ -71 +73 @@
             if GML(item) in self.ATTRIBUTES:
                 csmlfrag.set(GML(item), self.__dict__[item])       
-         
     # self.CHILDREN (recursive - calls the toXML method of children
         for att in self.__dict__:
@@ -78 +79 @@
                     if child == att:                        
                         #found a match.
-                        if type(self.CHILDREN[child][0]) is list:
-                            ename = self._getReverseSubsType(type(self.__dict__[att]).__name__)
-                        else: 
+                        if type(self.CHILDREN[child][0]) is not list:
                             ename=self.CHILDREN[child][0]#Element Name
                         etype = self.CHILDREN[child][1] #Element Type
                         if type(self.__dict__[att])  is list:
                             for item in self.__dict__[att]:
+                                ename = self._getReverseSubsType(type(item).__name__)
                                 frag=ET.Element(ename)
-                                if self.CONTENT is not None:
-                                    frag.text=self.CONTENT
                                 item.toXML(frag)
                                 csmlfrag.append(frag)
                         else:
                             frag=ET.Element(ename)
-                            if self.CONTENT is not None:
-                                    frag.text=self.CONTENT
                             self.__dict__[att].toXML(frag)
                             csmlfrag.append(frag)
+            
         return csmlfrag
         
     def fromXML(self,csmlfrag):
+        ######## output for testing purposes ###############
+        if hasattr(self, 'CHILDREN'):
+            print "ELEMENT %s"%csmlfrag.tag
+            for child in self.CHILDREN:
+                print child       
+         #######################################
         # deal with attributes, e.g. gml id's
+        if csmlfrag.text is not None:
+                self.CONTENT = csmlfrag.text
         for item in csmlfrag.items():
             if item[0] in self.ATTRIBUTES:
@@ -105 +110 @@
         # self.CHILDREN (recursive - calls the fromXML method of children
         for frag in csmlfrag[:]:
-            if frag.text is not None:
-                self.CONTENT = frag.text
+            print "ELEMENT %s"%csmlfrag.tag
             for child in self.CHILDREN:
+                print child
                 ename = self.CHILDREN[child][0] #Element Name                    
                 if frag.tag == ename:
@@ -150 +155 @@
         AbstractFeature.__init__(self,**kwargs)
         self.CHILDREN=merge(self.CHILDREN,{'members':[[CSML('GridFeature'),CSML('PointFeature')], 'AbstractFeature']})
-        #CHOICE mechanism  used to declare that any element name can go here so long as it is of a type that 
-        #inherits from AbstractFeature - .i.e. a GridFeature, a PointFeature etc.
+
+#class TimePosition(AbstractGML):
+    #def __init__(self, **kwargs):
+        #AbstractGML.__init__(self,**kwargs)
+        #self.CHILDREN = {'':[CSML(''), '']}    
+
+class TimePosition(AbstractGML):
+    def __init__(self, **kwargs):
+        AbstractGML.__init__(self,**kwargs)
+        self.CHILDREN = {'':[CSML(''), '']}    
+        
+class ReferenceableGridCoverage(AbstractGML):
+    def __init__(self, **kwargs):
+        AbstractGML.__init__(self,**kwargs)
+        self.CHILDREN = {'':[CSML(''), '']}    
+
+class Phenomenon(AbstractGML):
+    def __init__(self, **kwargs):
+        AbstractGML.__init__(self,**kwargs)
+        self.CHILDREN = {'':[CSML(''), '']}    
         
 class GridFeature(AbstractFeature, csElement):
@@ -157 +180 @@
         AbstractFeature.__init__(self,**kwargs)
         #dummy child for now:
-        self.CHILDREN=merge(self.CHILDREN,{'test':[CSML('TestElement'), 'csString']})
-        #self.CHILDREN={'time':[GML('time'), GML('TimePosition')], 'value':[CSML('value'), 'ReferenceableGridCoverage'], 'parameter':[CSML('parameter'), SWE('Phenomenon')]} 
+        #self.CHILDREN=merge(self.CHILDREN,{'test':[CSML('TestElement'), 'csString']})
+        self.CHILDREN={'time':[GML('time'), GML('TimePosition')], 'value':[CSML('value'), 'ReferenceableGridCoverage'], 'parameter':[CSML('parameter'), 'Phenomenon']} 
 
 class AbstractFileExtract(AbstractGML, csElement):
@@ -175 +198 @@
         AbstractFeatureCollection.__init__(self,**kwargs)
     
+    
     def _getSubstitutionType(self,tag):
+        print tag
+        print 'returning..'
         if tag==CSML('GridFeature'):
+            print 'GF'
             return 'GridFeature'
         elif tag==CSML('PointFeature'):
+            print 'PF'
             return 'PointFeature'
-        else: return 'AbstractFeature'
+        else: 
+            print 'AF'
+            return 'AbstractFeature'
     
     def _getReverseSubsType(self, typename):
+        print 'REVERSE'
+        print typename
         if typename== 'GridFeature':
             return CSML('GridFeature')

TI02-CSML/branches/CSML2/test.xml

@@ -14 +14 @@
         <featureCollection>
             <GridFeature gml:id="feature1">
-                <TestElement>testblahtestbanana</TestElement>
                 <time></time>
                 <value></value>
                 <parameter></parameter>
             </GridFeature>
+            <GridFeature>more test blah</GridFeature>
     </featureCollection>
 </Dataset>