Merge branch 'hotfix/1.1.5'

oaiharvest/__init__.py

@@ -1,4 +1,4 @@
 __name__ = "OAI-PMH Harvester"
 __package = "oaiharvest"
 __all__ = ['harvest', 'metadata']
-__version__ = "1.1.4"
+__version__ = "1.1.5"

oaiharvest/exceptions.py

@@ -0,0 +1,11 @@
+"""OAI-PMH Harvesting Exceptions."""
+
+
+class OAIPMHHarvestException(Exception):
+    """Base Class for OAI-PMH Harvesting Exceptions."""
+    pass
+
+
+class NotOAIPMHBaseURLException(OAIPMHHarvestException):
+    """URL is not an OAI-PMH base URL."""
+    pass

oaiharvest/harvest.py

@@ -42,7 +42,7 @@
 Distributed under the terms of the BSD 3-clause License
 <http://opensource.org/licenses/BSD-3-Clause>.
 """
-from __future__ import with_statement
+from __future__ import with_statement, absolute_import
 
 import logging
 import os
@@ -56,8 +56,9 @@
 from oaipmh.client import Client
 from oaipmh.error import NoRecordsMatchError
 
-from metadata import DefaultingMetadataRegistry, XMLMetadataReader
-from registry import verify_database
+from .exceptions import NotOAIPMHBaseURLException
+from .metadata import DefaultingMetadataRegistry, XMLMetadataReader
+from .registry import verify_database
 
 
 class OAIHarvester(object):
@@ -75,6 +76,14 @@ def _listRecords(self, baseUrl, metadataPrefix="oai_dc", **kwargs):
         # Add metatdataPrefix to args
         kwargs['metadataPrefix'] = metadataPrefix
         client = Client(baseUrl, metadata_registry)
+        # Check that baseUrl actually represents an OAI-PMH target
+        try:
+            client.identify()
+        except IndexError:
+            raise NotOAIPMHBaseURLException(
+                "{0} does not appear to be an OAI-PMH compatible base URL"
+                "".format(baseUrl)
+            )
         # Check server timestamp granularity support
         client.updateGranularity()
         for record in client.listRecords(**kwargs):