- Timestamp:
- 26/01/07 10:55:50 (14 years ago)
- Location:
- TI02-CSML/trunk/csml
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
TI02-CSML/trunk/csml/parser.py
r2057 r2059 371 371 AbstractGML.__init__(self,**kwargs) 372 372 #note __insertedExtract is used in resolving xlinks and shouldn't be written to directly (except by the code which handles the xlink resolutions) 373 children={'__insertedExtract':[FILEFORMATS,'FileExtract' ]}373 children={'__insertedExtract':[FILEFORMATS,'FileExtract',CSML('__insertedExtract')]} 374 374 addchildren(self,children) 375 375 a =['uom'] … … 481 481 def __init__(self, **kwargs): 482 482 AbstractGML.__init__(self,**kwargs) 483 children={'coordinateList':[CSML('coordinateList'),'csString'], 'timePositionList':[CSML('timePositionList'),'TimePositionList'],'__insertedExtract':[ [CSML('NetCDFExtract'),CSML('NASAAmesExtract'),CSML('AggregatedArray')],'FileExtract',CSML('__insertedExtract')]}483 children={'coordinateList':[CSML('coordinateList'),'csString'], 'timePositionList':[CSML('timePositionList'),'TimePositionList'],'__insertedExtract':[FILEFORMATS,'FileExtract',CSML('__insertedExtract')]} 484 484 addchildren(self,children) 485 485 a=['frame'] -
TI02-CSML/trunk/csml/parser_extra.py
r2057 r2059 108 108 109 109 110 def __find CLmatch(self, href):110 def __findSDmatch(self, href): 111 111 for sd in csml.csmllibs.csmlextra.listify(self.dataset.storageDescriptor.descriptors): 112 if type(sd) in [csml.parser.NetCDFExtract]: 113 #print dir(sd) 114 #print sd 112 if type(sd) in [csml.parser.NetCDFExtract, csml.parser.AggregatedArray]: 115 113 if hasattr(sd, 'id'): 116 #print sd 117 if sd.id == href: 114 if sd.id == href: 118 115 return sd 119 #print 'found match'120 116 121 117 122 118 123 119 … … 147 143 if hasattr(ordinate.coordAxisValues,'coordinateList'): 148 144 if ordinate.coordAxisValues.coordinateList.CONTENT[:1] == '#': 149 dataforClist= self.__find CLmatch(ordinate.coordAxisValues.coordinateList.CONTENT[1:])145 dataforClist= self.__findSDmatch(ordinate.coordAxisValues.coordinateList.CONTENT[1:]) 150 146 if dataforClist is not None: 151 147 setattr(ordinate.coordAxisValues, '__insertedExtract', dataforClist) 152 148 break 149 153 150 #now the rangeSet: 154 155 #for feature in self.dataset.featureCollection.featureMembers: 156 #if hasattr(feature.value.rangeSet, 'valueArray'): 157 ##could be an xlink here.. 158 #for vc in csml.csmllibs.csmlextra.listify(feature.value.rangeSet.valueArray.valueComponent): 159 #if hasattr(vc, 'href'): 160 #self.dataset=csml.csmllibs.csmlxlink.resolveXlink(vc, self.dataset) 161 # sys.exit() 151 for feature in self.dataset.featureCollection.featureMembers: 152 if hasattr(feature.value.rangeSet, 'valueArray'): 153 #could be an xlink here.. 154 for vc in csml.csmllibs.csmlextra.listify(feature.value.rangeSet.valueArray.valueComponent): 155 if hasattr(vc, 'href'): 156 dataforQlist=self.__findSDmatch(vc.href[1:]) 157 if dataforQlist is not None: 158 if not hasattr(vc, 'quantityList'): 159 setattr(vc, 'quantityList', csml.parser.MeasureOrNullList()) 160 setattr(vc.quantityList, '__insertedExtract', dataforQlist) 161 162 162 return self.dataset
Note: See TracChangeset
for help on using the changeset viewer.