From 417e2eacb7e42f35f98bcf5487bb540b5d7fa2e8 Mon Sep 17 00:00:00 2001 From: Dorian Merz <merz@ub.uni-leipzig.de> Date: Fri, 22 Oct 2021 11:16:07 +0200 Subject: [PATCH] refs #20819 [de_105] refactor getMyILLrequests * move to finc * adapt regex config * TODO: remove init() * refactor ILL config --- de_105/config/vufind/FincLibero.ini | 2 +- .../src/de_105/ILS/Driver/FincLibero.php | 33 ------------------- 2 files changed, 1 insertion(+), 34 deletions(-) diff --git a/de_105/config/vufind/FincLibero.ini b/de_105/config/vufind/FincLibero.ini index 023f762a1d5..e35b02b22e7 100644 --- a/de_105/config/vufind/FincLibero.ini +++ b/de_105/config/vufind/FincLibero.ini @@ -74,4 +74,4 @@ extraHoldFields = pickUpLocation ; Interlibrary loans setting [ILLRequests] ; Filter settings for diplaying ILL request at separately views -filterReserved = "ILL:.*" +itemPattern = "/^ILL:.*$/" diff --git a/module/de_105/src/de_105/ILS/Driver/FincLibero.php b/module/de_105/src/de_105/ILS/Driver/FincLibero.php index e3eb81c8dad..ec7c5a4438c 100644 --- a/module/de_105/src/de_105/ILS/Driver/FincLibero.php +++ b/module/de_105/src/de_105/ILS/Driver/FincLibero.php @@ -43,14 +43,6 @@ namespace de_105\ILS\Driver; */ class FincLibero extends \finc\ILS\Driver\FincLibero { - /** - * Limitations of ILL requests to filter holds - * - * @var string - * @access protected - */ - protected $illRequestsFilterReserved; - /** * Initialize the driver. * @@ -121,31 +113,6 @@ class FincLibero extends \finc\ILS\Driver\FincLibero return []; } - /** - * Customized getMyILLRequests-method to return items with properties: - * - document.item = URI dÞrfte nicht zum UBL/eigenen Namespace gehÃķren - * copied from de_zi4/FincLibero - * - * @param array $patron Array returned from patronLogin() - * @todo refactor, check #11718 and #17230 - * - * @return array - */ - public function getMyILLRequests($patron) - { - // filters for getMyILLRequests are: - // document.item = URI must not part of own UBL specific namespace - $filter = ['regex'=> - [ - //'item' => "/^(?:(?!".$this->getDaiaIdPrefixNamespace().")).*$/", - 'item' => "/^".$this->illRequestsFilterReserved."$/" - ] - ]; - // get items-docs for given filters - $items = $this->paiaGetItems($patron, $filter); - return $this->mapPaiaItems($items, 'myHoldsMapping'); - } - /** * Returns an array with status information for provided item. * -- GitLab