Merge branch 'hotfix/2.4.4'

Author: chrisseto

share/harvest/harvester.py

@@ -61,7 +61,8 @@ def __init__(self, app_config):
         self.config = app_config
         self.rate_limit = getattr(self.config, 'rate_limit', self.rate_limit)
         self.allowance = self.rate_limit[0]
-        self.requests = RateLimittedProxy(requests, *self.rate_limit)
+        # TODO Add custom user agent
+        self.requests = RateLimittedProxy(requests.Session(), *self.rate_limit)
 
     @cached_property
     def source(self):

share/harvest/oai.py

@@ -11,6 +11,10 @@
 logger = logging.getLogger(__name__)
 
 
+class OAIHarvestException(Exception):
+    pass
+
+
 class OAIHarvester(Harvester, metaclass=abc.ABCMeta):
 
     metadata_prefix = 'oai_dc'
@@ -84,6 +88,10 @@ def fetch_page(self, url: furl, token: str=None) -> (list, str):
 
         parsed = etree.fromstring(resp.content, parser=etree.XMLParser(recover=True))
 
+        error = parsed.xpath('//ns0:error', namespaces=self.namespaces)
+        if error:
+            raise OAIHarvestException(error[0].get('code'), error[0].text)
+
         records = parsed.xpath('//ns0:record', namespaces=self.namespaces)
         token = (parsed.xpath('//ns0:resumptionToken/node()', namespaces=self.namespaces) + [None])[0]