From e23fb47fbab37a662154c3b71dafe5b56a90b46f Mon Sep 17 00:00:00 2001
From: Ere Maijala <ere.maijala@helsinki.fi>
Date: Thu, 23 Mar 2017 16:39:26 +0200
Subject: [PATCH] Added generic ILS exception handling in MyResearch actions.
(#917)
---
.../Controller/MyResearchController.php | 32 +++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/module/VuFind/src/VuFind/Controller/MyResearchController.php b/module/VuFind/src/VuFind/Controller/MyResearchController.php
index 90f7cb3a255..4ea33b475fd 100644
--- a/module/VuFind/src/VuFind/Controller/MyResearchController.php
+++ b/module/VuFind/src/VuFind/Controller/MyResearchController.php
@@ -29,6 +29,7 @@ namespace VuFind\Controller;
use VuFind\Exception\Auth as AuthException,
VuFind\Exception\Forbidden as ForbiddenException,
+ VuFind\Exception\ILS as ILSException,
VuFind\Exception\Mail as MailException,
VuFind\Exception\ListPermission as ListPermissionException,
VuFind\Exception\RecordMissing as RecordMissingException,
@@ -79,6 +80,37 @@ class MyResearchController extends AbstractBase
$this->setFollowupUrlToReferer();
}
+ /**
+ * Execute the request
+ *
+ * @param \Zend\Mvc\MvcEvent $event Event
+ *
+ * @return mixed
+ * @throws Exception\DomainException
+ */
+ public function onDispatch(\Zend\Mvc\MvcEvent $event)
+ {
+ // Catch any ILSExceptions thrown during processing and display a generic
+ // failure message to the user (instead of going to the fatal exception
+ // screen). This offers a slightly more forgiving experience when there is
+ // an unexpected ILS issue. Note that most ILS exceptions are handled at a
+ // lower level in the code (see \VuFind\ILS\Connection and the config.ini
+ // loadNoILSOnFailure setting), but there are some rare edge cases (for
+ // example, when the MultiBackend driver fails over to NoILS while used in
+ // combination with MultiILS authentication) that could lead here.
+ try {
+ return parent::onDispatch($event);
+ } catch (ILSException $exception) {
+ // Always display generic message:
+ $this->flashMessenger()->addErrorMessage('ils_connection_failed');
+ // In development mode, also show technical failure message:
+ if ('development' == APPLICATION_ENV) {
+ $this->flashMessenger()->addErrorMessage($exception->getMessage());
+ }
+ return $this->createViewModel();
+ }
+ }
+
/**
* Prepare and direct the home page where it needs to go
*
--
GitLab