Changeset 364

Timestamp:

31/07/15 12:12:00 (5 years ago)

Author:

mjuckes

Message:

adapted to deal with DLR usage of id attribute ... for one dataset

Location:

CCCC/trunk/ceda_cc

Files:

• config/esacci_vocabs/extraAtts.txt (modified) (1 diff)
• utils_c4.py (modified) (2 diffs)

CCCC/trunk/ceda_cc/config/esacci_vocabs/extraAtts.txt

@@ -5 +5 @@
 @ESA GlobSnow snow water equivalent L3B monthly aggregated|fi.fmi, , algorithm=Pulliainen2006, frequency=mon
 org.ghrsst, OSTIA-ESACCI-L4-v01.0, algorithm=OSTIA2-0, frequency=day
-DLR, ESACCI-OZONE-L3S-TC-MERGED-DLR_1M-20110501-fv0100.nc, algorith=DLR.merged, frequency=mon
+DLR, ESACCI-OZONE-L3S-TC-MERGED-DLR_1M, algorith=DLR.merged, frequency=mon

CCCC/trunk/ceda_cc/utils_c4.py

@@ -7 +7 @@
 from fcc_utils import mipTableScan
 from xceptions import *
+
+re_dlr01 = re.compile( 'MERGED-DLR_1M-[0-9]{8}-fv0100.nc$' )
 
 class timeInt(object):
@@ -464 +466 @@
     if self.fileId == None:
       id = self.globalAts['id']
+##
+## hack to allow for awkward usage in DLR ozone, where id is different for each file
+## may need to improve on this if problem exists for other files in different form
+##
+      xx = re_dlr01.findall( id )
+      if len(xx) != 0:
+        id = id[:-19]
       if id != '':
         self.fileId = '%s.%s' % (self.globalAts['naming_authority'],id)