Ignore:
Timestamp:
05/06/15 15:35:25 (6 years ago)
Author:
mjuckes
Message:

updates to iso 8601 check and esa-cci config

File:
1 edited

Legend:

Unmodified
Added
Removed
  • CCCC/trunk/ceda_cc/utils_c4.py

    r331 r340  
    334334        if len(bits) == 8: 
    335335          self.fnDict['additional'] = bits[-3] 
    336          
     336 
     337           
     338     
    337339    if self.pcfg.groupIndex != None: 
    338340      self.group = self.fnParts[self.pcfg.groupIndex] 
     
    353355 
    354356    self.var = self.fnParts[self.pcfg.varIndex] 
     357    print self.fnDict 
     358    if self.pcfg.projectV.id in ['ESA-CCI']: 
     359      if  self.fnDict['project'] == 'GlobSnow': 
     360        if self.fnDict['additional'] == 'weekly': 
     361          self.var += 'weekly' 
    355362 
    356363    if self.pcfg.fnvdict != None: 
     
    10651072        assert pattern in ['ISO8601 duration'], 'value of pattern [%s] for ISO constraint not recognised' % pattern 
    10661073        if pattern == 'ISO8601 duration': 
    1067           thispat = '^(P([0-9]+Y){0,1}([0-9]+M){0,1}([0-9]+D){0,1}(T([0-9]+H){0,1}([0-9]+M){0,1}([0-9]+(.[0-9]+){0,1}S){0,1}){0,1})$' 
     1074          thispat = '^(P([0-9]+Y){0,1}([0-9]+M){0,1}([0-9]+D){0,1}(T([0-9]+H){0,1}([0-9]+M){0,1}([0-9]+(.[0-9]+){0,1}S){0,1}){0,1})$|^(P[0-9]+W)$' 
    10681075        self.re_pat = re.compile( thispat ) 
    10691076        self.pattern = thispat 
Note: See TracChangeset for help on using the changeset viewer.