diff --git a/ckanext/spatial/harvesters/waf.py b/ckanext/spatial/harvesters/waf.py index 5338d87e..c9299d5b 100644 --- a/ckanext/spatial/harvesters/waf.py +++ b/ckanext/spatial/harvesters/waf.py @@ -244,17 +244,26 @@ def fetch_stage(self, harvest_object): ,adjacent=False, joinString=' ').setResultsName('date') ) -iis = parse.SkipTo("
").suppress() \ - + parse.OneOrMore("
").suppress() \ - + parse.Optional(parse.Combine( - parse.Word(parse.alphanums+'/') + - parse.Word(parse.alphanums+':') + - parse.Word(parse.alphas) - , adjacent=False, joinString=' ').setResultsName('date') - ) \ - + parse.Word(parse.nums).suppress() \ - + parse.Literal('").suppress() \ + + parse.OneOrMore("
").suppress() \ + + parse.Optional(parse.Combine( + parse.Word(parse.alphanums+'/') + + parse.Word(parse.alphanums+':') + + parse.Word(parse.alphas) + , adjacent=False, joinString=' ').setResultsName('date') + ) \ + + parse.Optional(parse.Combine( + parse.Word(parse.alphas+',') + + parse.Word(parse.alphas) + + parse.Word(parse.nums+',') + + parse.Word(parse.nums) + + parse.Word(parse.nums+':') + + parse.Word(parse.alphas) + , adjacent=False, joinString=' ').setResultsName('date') + ) \ + + parse.Word(parse.nums).suppress() \ + + parse.Literal('