diff --git a/module/finc/sql/migrations/mysql/migrateData_Vufind1ToVufind5_Common.sql b/module/finc/sql/migrations/mysql/migrateData_Vufind1ToVufind5_Common.sql index 8717ced29bc9fefe0b4a026e64f43bd22ce87678..88bb3096c02e6c8a37ce86cff0b33517bed03a39 100644 --- a/module/finc/sql/migrations/mysql/migrateData_Vufind1ToVufind5_Common.sql +++ b/module/finc/sql/migrations/mysql/migrateData_Vufind1ToVufind5_Common.sql @@ -194,14 +194,6 @@ ALTER TABLE session MODIFY COLUMN data mediumtext, MODIFY COLUMN created datetime NOT NULL DEFAULT '2000-01-01 00:00:00'; --- Apply constraint modifications - -ALTER TABLE session - DROP INDEX last_used; - -ALTER TABLE session - ADD UNIQUE(last_used); - -- Set chracter set to utf8 ALTER TABLE session diff --git a/module/finc/src/finc/RecordDriver/SolrDefaultFincTrait.php b/module/finc/src/finc/RecordDriver/SolrDefaultFincTrait.php index 05fa243e4861f23aa7276b7b3e0b2930aa0437af..f5fb36b670842cb7f3d977259c2943941603bdbf 100644 --- a/module/finc/src/finc/RecordDriver/SolrDefaultFincTrait.php +++ b/module/finc/src/finc/RecordDriver/SolrDefaultFincTrait.php @@ -164,8 +164,15 @@ trait SolrDefaultFincTrait if (is_null($settings)) return false; if ($settings instanceof Config) $settings = $settings->toArray(); foreach ((array) $settings as $value) { - list($methodName, $methodReturn) = explode(':', $value); - if (in_array($methodReturn, (array) $this->tryMethod($methodName))) { + $conf = explode(':', $value); + $methodName = array_shift($conf); + if (empty($conf)) + { + return $methodName === 'enabled'; + } + $methodReturn = array_shift($conf); + if (in_array($methodReturn, (array) $this->tryMethod($methodName))) + { // as the current permission matches the current record, // return it return true; diff --git a/module/finc/src/finc/Resolver/Driver/Redi.php b/module/finc/src/finc/Resolver/Driver/Redi.php index d6435fe2f95efa6b227c53b8d1dccada9e37825a..6bd0a2d30d8abfa2050edf0e13467ce9d0bac8a5 100644 --- a/module/finc/src/finc/Resolver/Driver/Redi.php +++ b/module/finc/src/finc/Resolver/Driver/Redi.php @@ -9,6 +9,7 @@ * @category VuFind * @package Resolver_Drivers * @author Robert Lange <lange@ub.uni-leipzig.de> + * @author Gregor Gawol <gawol@ub.uni-leipzig.de> * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License * @link https://vufind.org/wiki/development:plugins:link_resolver_drivers Wiki */ @@ -22,6 +23,7 @@ use \VuFind\Resolver\Driver\Redi as RediBase; * @category VuFind * @package Resolver_Drivers * @author Robert Lange <lange@ub.uni-leipzig.de> + * @author Gregor Gawol <gawol@ub.uni-leipzig.de> * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License * @link https://vufind.org/wiki/development:plugins:link_resolver_drivers Wiki */ @@ -29,6 +31,18 @@ class Redi extends RediBase { use ResolverTrait; + /** + * Constructor + * + * @param string $config redi configuration + * @param \Zend\Http\Client $httpClient HTTP client + */ + public function __construct($config, \Zend\Http\Client $httpClient) + { + $this->baseUrl = $config->url; + $this->httpClient = $httpClient; + } + /** * Fetch Links * diff --git a/module/finc/src/finc/View/Helper/Root/ResultFeed.php b/module/finc/src/finc/View/Helper/Root/ResultFeed.php index 3a5a20ba2fb6c7e153177ef89ac30a6add2368ad..26b9fdb2409372220b62751b66e4871913c7115e 100644 --- a/module/finc/src/finc/View/Helper/Root/ResultFeed.php +++ b/module/finc/src/finc/View/Helper/Root/ResultFeed.php @@ -63,7 +63,7 @@ class ResultFeed extends \VuFind\View\Helper\Root\ResultFeed } $entry->setTitle(empty($title) ? $record->getBreadcrumb() : $title); $serverUrl = $this->getView()->plugin('serverurl'); - $recordLink = $this->getView()->plugin('recordlink'); + $recordLink = $this->getView()->plugin('recordLink'); try { $url = $serverUrl($recordLink->getUrl($record)); } catch (\Zend\Mvc\Router\Exception\RuntimeException $e) {