Changeset 2059 for TI02-CSML

Timestamp:

26/01/07 10:55:50 (13 years ago)

Author:

domlowe

Message:

xlinks in rangeSet also resolve to insertedElement.

Location:

TI02-CSML/trunk/csml

Files:

• parser.py (modified) (2 diffs)
• parser_extra.py (modified) (2 diffs)

TI02-CSML/trunk/csml/parser.py

@@ -371 +371 @@
         AbstractGML.__init__(self,**kwargs)
         #note __insertedExtract is used in resolving xlinks and shouldn't be written to directly (except by the code which handles the xlink resolutions)
-        children={'__insertedExtract':[FILEFORMATS,'FileExtract']}
+        children={'__insertedExtract':[FILEFORMATS,'FileExtract',CSML('__insertedExtract')]}
         addchildren(self,children)
         a =['uom'] 
@@ -481 +481 @@
     def __init__(self, **kwargs):
         AbstractGML.__init__(self,**kwargs)
-        children={'coordinateList':[CSML('coordinateList'),'csString'], 'timePositionList':[CSML('timePositionList'),'TimePositionList'],'__insertedExtract':[[CSML('NetCDFExtract'),CSML('NASAAmesExtract'),CSML('AggregatedArray')],'FileExtract',CSML('__insertedExtract')]}
+        children={'coordinateList':[CSML('coordinateList'),'csString'], 'timePositionList':[CSML('timePositionList'),'TimePositionList'],'__insertedExtract':[FILEFORMATS,'FileExtract',CSML('__insertedExtract')]}
         addchildren(self,children)
         a=['frame']

TI02-CSML/trunk/csml/parser_extra.py

@@ -108 +108 @@
         
                         
-    def __findCLmatch(self, href):
+    def __findSDmatch(self, href):
         for sd in csml.csmllibs.csmlextra.listify(self.dataset.storageDescriptor.descriptors):
-            if type(sd) in [csml.parser.NetCDFExtract]:
-                #print dir(sd)
-                #print sd
+            if type(sd) in [csml.parser.NetCDFExtract, csml.parser.AggregatedArray]:
                 if hasattr(sd, 'id'):
-                    #print sd
-                    if sd.id == href:
+                     if sd.id == href:
                         return sd
-                        #print 'found match'
                         
-                        
+              
                 
         
@@ -147 +143 @@
                         if hasattr(ordinate.coordAxisValues,'coordinateList'):
                             if ordinate.coordAxisValues.coordinateList.CONTENT[:1] == '#':
-                                dataforClist= self.__findCLmatch(ordinate.coordAxisValues.coordinateList.CONTENT[1:])
+                                dataforClist= self.__findSDmatch(ordinate.coordAxisValues.coordinateList.CONTENT[1:])
                                 if dataforClist is not None:
                                     setattr(ordinate.coordAxisValues, '__insertedExtract', dataforClist)
                     break
+            
             #now the rangeSet:
-            
-            #for feature in self.dataset.featureCollection.featureMembers:
-            #if hasattr(feature.value.rangeSet, 'valueArray'):
-                ##could be an xlink here..
-                #for vc in  csml.csmllibs.csmlextra.listify(feature.value.rangeSet.valueArray.valueComponent):
-                    #if hasattr(vc, 'href'):
-                        #self.dataset=csml.csmllibs.csmlxlink.resolveXlink(vc, self.dataset)
-#        sys.exit()
+        for feature in self.dataset.featureCollection.featureMembers:
+            if hasattr(feature.value.rangeSet, 'valueArray'):
+                #could be an xlink here..
+                for vc in  csml.csmllibs.csmlextra.listify(feature.value.rangeSet.valueArray.valueComponent):
+                    if hasattr(vc, 'href'):
+                        dataforQlist=self.__findSDmatch(vc.href[1:])
+                        if dataforQlist is not None:
+                            if not hasattr(vc, 'quantityList'):
+                                setattr(vc, 'quantityList', csml.parser.MeasureOrNullList())
+                            setattr(vc.quantityList, '__insertedExtract', dataforQlist)
+
         return self.dataset