catch CswErrors in reimport_batch()

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 ## Development
 
-- Catch Exceptions raised by a failing `text_traceback()` during error handling for CSW communication.
+- Improved Exception handling in several places.
 - More F-Strings.
 
 ## [1.4.1](https://github.com/berlinonline/ckanext-fisbroker/releases/tag/1.4.1)

ckanext/fisbroker/blueprint.py

@@ -17,8 +17,6 @@
 from ckan.model import Package, Session
 from ckan.plugins import toolkit
 
-from owslib.csw import CatalogueServiceWeb
-
 from requests.exceptions import RequestException, ConnectionError
 
 from ckanext.harvest.model import (
@@ -27,6 +25,7 @@
     HarvestObjectExtra,
     HarvestGatherError
 )
+from ckanext.spatial.lib.csw_client import CswError
 
 from ckanext.fisbroker import HARVESTER_ID
 from ckanext.fisbroker.csw_client import CswService
@@ -196,7 +195,7 @@ def reimport_batch(package_ids, context):
                 err.save()
                 raise NotFoundInFisbrokerError(package_id, fb_guid)
 
-    except (RequestException, ProtocolError, ConnectionError, AttributeError) as error:
+    except (RequestException, ProtocolError, ConnectionError, AttributeError, CswError) as error:
         raise NoConnectionError(package_id, harvester_url, str(error.__class__.__name__))
     finally:
         # finish harvest job, both successfully and unsuccessfully

ckanext/fisbroker/csw_client.py

@@ -128,7 +128,7 @@ def getrecordbyid(self, ids=[], esn="full", outputschema="gmd", retries=3, wait_
                 try:
                     err = f"Error getting record by id: {text_traceback()}"
                 except Exception as e2:
-                    err = f"Error getting record by id, text_traceback() failed ({e2})"
+                    err = f"Error getting record by id, text_traceback() failed ({e})"
                 if attempt < retries:
                     log.info(err)
                     log.info(f"waiting {wait_time} seconds...")