Changeset 2023 for TI02-CSML/trunk/csml

Timestamp:

19/01/07 16:30:07 (13 years ago)

Author:

domlowe

Message:

oops, commit properly this time- Wrapped classes working generally. Still to fix descriptors/members

Location:

TI02-CSML/trunk/csml

Files:

• XMLInstances/CSMLExample_SuperWrap.xml (modified) (3 diffs)
• parser.py (modified) (7 diffs)

TI02-CSML/trunk/csml/XMLInstances/CSMLExample_SuperWrap.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Dataset xmlns="http://ndg.nerc.ac.uk/csml" xmlns:gml="http://www.opengis.net/gml" xmlns:swe="http://www.opengis.net/swe" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xlink="http://www.w3.org/1999/xlink" xsi:schemaLocation="http://ndg.nerc.ac.uk/csml
-../XMLSchemas/csmlMain.xsd">
+<Dataset xmlns="http://ndg.nerc.ac.uk/csml" xmlns:gml="http://www.opengis.net/gml" xmlns:swe="http://www.opengis.net/swe" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xlink="http://www.w3.org/1999/xlink" xsi:schemaLocation="http://ndg.nerc.ac.uk/csml ../XMLSchemas/csmlMain.xsd" gml:id='testsuperwrap'>
     <CSMLFeatureCollection>
         <crsDictionary>
@@ -294 +293 @@
         </featureMember>
         <!-- ========================================================= -->
-    <CSMLFeatureCollection>
+    </CSMLFeatureCollection>
     <CSMLStorageDescriptor>
             <descriptor>
@@ -391 +390 @@
                 </NetCDFExtract>
             </descriptor>
-        </CSMLStorageDescriptor>
+        </CSMLStorageDescriptor> 
 
 </Dataset>

TI02-CSML/trunk/csml/parser.py

@@ -107 +107 @@
     
     def __getattribute__(self, name):
-        if CSML(name) in object.__dict__:
-            return object.__getattribute__(self,CSML(name))
-        elif GML(name) in object.__dict__:
-            return object.__getattribute__(self,GML(name))
-        elif XLINK(name) in object.__dict__:
-            return object.__getattribute__(self,XLINK(name))
-        else:
-            return object.__getattribute__(self,name) 
+            if CSML(name) in object.__dict__:
+                return object.__getattribute__(self,CSML(name))
+            elif GML(name) in object.__dict__:
+                return object.__getattribute__(self,GML(name))
+            elif XLINK(name) in object.__dict__:
+                return object.__getattribute__(self,XLINK(name))
+            else:
+                return object.__getattribute__(self,name) 
         
     def __removeURI(self, qname):
@@ -259 +259 @@
                         else:
                             childobj.fromXML(frag)
+                            
                         #set this object to be an attribute of the 'parent' (self) object
                         if hasattr(self, child):
@@ -426 +427 @@
     def __init__(self, **kwargs):
         AbstractGML.__init__(self,**kwargs)
-        children={'coordinateList':[CSML('coordinateList'),'csString'], 'timePositionList':[CSML('timePositionList'),'csString']}
+        children={'coordinateList':[CSML('coordinateList'),'csString'], 'timePositionList':[CSML('timePositionList'),'TimePositionList']}
         addchildren(self,children)
         a=['frame']
@@ -455 +456 @@
         a=['frame', 'calendarEraName','indeterminatePosition']
         addatts(self,a)
+        addchildren(self,{})
     
 
@@ -698 +700 @@
         addchildren(self,children)
 
-class FeatureCollection(AbstractFeatureCollection,csElement):
+class CSMLStorageDescriptor(csElement):
+    def __init__(self,**kwargs):
+        addatts(self,[])
+        children={'descriptors':[[CSML('NetCDFExtract'),CSML('PointFeature'),CSML('AggregatedArray')], 'FileExtract', CSML('descriptor')]}
+        addchildren(self,children)
+    
+
+class CSMLFeatureCollection(AbstractFeatureCollection,csElement):
     def __init__(self,**kwargs):
         AbstractFeatureCollection.__init__(self,**kwargs)
@@ -761 +770 @@
     def __init__(self, **kwargs):
         AbstractGML.__init__(self,**kwargs)
-        children = {'featureCollection':[GML('FeatureCollection') ,'FeatureCollection'],'fileExtracts':[FILEFORMATS, 'ArrayDescriptor']}
+        children = {'featureCollection':[CSML('CSMLFeatureCollection') ,'CSMLFeatureCollection'],'storageDescriptor':[CSML('CSMLStorageDescriptor'), 'CSMLStorageDescriptor']}
         addchildren(self,children)
     def toXML(self):
@@ -767 +776 @@
         csElement.toXML(self, csmlfrag)
         return csmlfrag
-    def _getSubstitutionType(self,tag):
-        if tag==CSML('NetCDFExtract'):
-            return 'NetCDFExtract'
-        elif tag==CSML('NASAAmesExtract'):
-            return 'NASAAmesExtract'
-        else: return 'ArrayDescriptor'
-    def _getReverseSubsType(self, typename):
-        if typename== 'NetCDFExtract':
-            return CSML('NetCDFExtract')
-        elif typename == 'NASAAmesExtract':
-            return CSML('NASAAmesExtract')
-        else: return CSML('ArrayDescriptor')
+    #def _getSubstitutionType(self,tag):  
+        #if tag==CSML('NetCDFExtract'):
+            #return 'NetCDFExtract'
+        #elif tag==CSML('NASAAmesExtract'):
+            #return 'NASAAmesExtract'
+        #else: return 'ArrayDescriptor'
+    #def _getReverseSubsType(self, typename):
+        #if typename== 'NetCDFExtract':
+            #return CSML('NetCDFExtract')
+        #elif typename == 'NASAAmesExtract':
+            #return CSML('NASAAmesExtract')
+        #else: return CSML('ArrayDescriptor')
         
         return typename