Changeset 278 for CCCC


Ignore:
Timestamp:
30/01/15 13:51:23 (5 years ago)
Author:
astephen
Message:

test

Location:
CCCC/trunk/ceda_cc
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • CCCC/trunk/ceda_cc/config/esacci_vocabs/institutions.txt

    r269 r278  
    7272VU University Amsterdam VUA 
    7373Wageningen University  N/A 
     74ESACCI  N/A 
    7475World Glacier Monitoring Service  WGMS 
  • CCCC/trunk/ceda_cc/config_c4.py

    r277 r278  
    227227      self.controlledFnParts = ['level','cciProject','var','version'] 
    228228      self.requiredVarAttributes = ['long_name', 'standard_name', 'units'] 
    229       self.drsMappings = {'variable':'@var','platform':'platform','sensor':'sensor','level':'#level', \ 
     229      self.drsMappings = {'variable':'#var','platform':'platform','sensor':'sensor','level':'#level', \ 
     230                'standard_name':'*standard_name', \ 
    230231                'spatial_resolution':'spatial_resolution', 'ecv':'@ecv','version':'#version','convention_version':'#gdsv'} 
    231232      self.globalAttributesInFn = [None,] 
     
    414415               'cdm_data_type':utils.listControl( 'cdm_data_type', lrdr.getSimpleList( 'threddsDataType.txt', bit=0 ) ), \ 
    415416               'time_coverage_duration':utils.patternControl( 'time_coverage_duration',  'ISO8601 duration', cls='ISO',examples=['P1Y'] ), \ 
    416                'spatial_resolution':utils.patternControl( 'spatial_resolution',  '([0-9]+(.[0-9]+){0,1})(km|m).*', examples=['20km'] ), \ 
     417               'spatial_resolution':utils.patternControl( 'spatial_resolution',  '([0-9]+(.[0-9]+){0,1})[\s]*(km|m).*', examples=['20km','1 km at nadir'] ), \ 
    417418               'project':utils.listControl( 'project', ['Climate Change Initiative - European Space Agency'] ), \ 
    418419               'cciProject':utils.listControl( 'cciproject', cciProjectList ), \ 
  • CCCC/trunk/ceda_cc/unitTestsS1.py

    r277 r278  
    8787        cga.globalAts =  {'platform':'platform','sensor':'sensor', \ 
    8888                'spatial_resolution':'1 km'} 
     89        cga.varAts = { 'var':{ 'standard_name':'dummy'} } 
    8990        cga.var = 'var' 
    9091        cga.completed = True 
  • CCCC/trunk/ceda_cc/utils_c4.py

    r277 r278  
    395395      elif self.drsMappings[k] == '@ecv': 
    396396        ee[k] = self.pcfg.ecvMappings[ self.parent.fnDict['project'] ] 
     397      elif self.drsMappings[k][0] == '*': 
     398        thisk = self.drsMappings[k][1:] 
     399        ee[k] = self.varAts[self.var][thisk] 
    397400      elif self.drsMappings[k][0] == '#': 
    398401        thisk = self.drsMappings[k][1:] 
Note: See TracChangeset for help on using the changeset viewer.