diff --git a/module/finc/config/module.config.php b/module/finc/config/module.config.php
index 587fd069aff0237f1f14b10dfffe02e08d9f7a15..5c218d3ad92e79b8b75ab603375be7f878e37c63 100644
--- a/module/finc/config/module.config.php
+++ b/module/finc/config/module.config.php
@@ -91,17 +91,17 @@ $config = [
],
'recorddriver' => [
'factories' => [
- 'finc\RecordDriver\SolrDefault' => 'finc\RecordDriver\Factory::getSolrDefault',
- 'finc\RecordDriver\SolrMarc' => 'finc\RecordDriver\Factory::getSolrMarc',
- 'finc\RecordDriver\SolrMarcFinc' => 'finc\RecordDriver\Factory::getSolrMarcFinc',
- 'finc\RecordDriver\SolrMarcFincPDA' => 'finc\RecordDriver\Factory::getSolrMarcFincPDA',
- 'finc\RecordDriver\SolrMarcRemote' => 'finc\RecordDriver\Factory::getSolrMarcRemote',
- 'finc\RecordDriver\SolrMarcRemoteFinc' => 'finc\RecordDriver\Factory::getSolrMarcRemoteFinc',
- 'finc\RecordDriver\SolrAI' => 'finc\RecordDriver\Factory::getSolrAI',
- 'finc\RecordDriver\SolrIS' => 'finc\RecordDriver\Factory::getSolrIS',
- 'finc\RecordDriver\SolrLido' => 'finc\RecordDriver\Factory::getSolrLido',
- 'finc\RecordDriver\SolrLidoNdl' => 'finc\RecordDriver\Factory::getSolrLidoNdl',
- 'finc\RecordDriver\SolrDico' => 'finc\RecordDriver\Factory::getSolrDico',
+ 'finc\RecordDriver\SolrDefault' => 'VuFind\RecordDriver\SolrDefaultFactory',
+ 'finc\RecordDriver\SolrMarc' => 'VuFind\RecordDriver\SolrDefaultFactory',
+ 'finc\RecordDriver\SolrMarcFinc' => 'VuFind\RecordDriver\SolrDefaultFactory',
+ 'finc\RecordDriver\SolrMarcFincPDA' => 'VuFind\RecordDriver\SolrDefaultFactory',
+ 'finc\RecordDriver\SolrMarcRemote' => 'VuFind\RecordDriver\SolrDefaultFactory',
+ 'finc\RecordDriver\SolrMarcRemoteFinc' => 'VuFind\RecordDriver\SolrDefaultFactory',
+ 'finc\RecordDriver\SolrAI' => 'finc\RecordDriver\SolrAIFactory',
+ 'finc\RecordDriver\SolrIS' => 'VuFind\RecordDriver\AbstractBaseFactory',
+ 'finc\RecordDriver\SolrLido' => 'finc\RecordDriver\SolrLidoFactory',
+ 'finc\RecordDriver\SolrLidoNdl' => 'finc\RecordDriver\SolrLidoFactory',
+ 'finc\RecordDriver\SolrDico' => 'VuFind\RecordDriver\SolrDefaultWithoutSearchServiceFactory',
],
'aliases' => [
'VuFind\RecordDriver\SolrDefault' => 'finc\RecordDriver\SolrDefault',
@@ -271,9 +271,9 @@ $config = [
'zfc_rbac' => [
'vufind_permission_provider_manager' => [
'factories' => [
- //'catUserType' => 'finc\Role\PermissionProvider\Factory::getCatUserType',
- //'ipRangeFoFor' => 'finc\Role\PermissionProvider\Factory::getIpRangeFoFor',
- //'ipRegExFoFor' => 'finc\Role\PermissionProvider\Factory::getIpRegExFoFor' ,
+ 'catUserType' => 'finc\Role\PermissionProvider\Factory::getCatUserType',
+ 'ipRangeFoFor' => 'finc\Role\PermissionProvider\Factory::getIpRangeFoFor',
+ 'ipRegExFoFor' => 'finc\Role\PermissionProvider\Factory::getIpRegExFoFor' ,
'finc\Role\PermissionProvider\CatUserType' =>
'finc\Role\PermissionProvider\Factory::getCatUserType',
'finc\Role\PermissionProvider\IpRangeFoFor' =>
diff --git a/module/finc/src/finc/RecordDriver/Factory.php b/module/finc/src/finc/RecordDriver/Factory.php
deleted file mode 100644
index 5386839a71b6ba93df91443d2f8f8b051677784a..0000000000000000000000000000000000000000
--- a/module/finc/src/finc/RecordDriver/Factory.php
+++ /dev/null
@@ -1,260 +0,0 @@
-<?php
-/**
- * Record Driver Factory Class
- *
- * PHP version 5
- *
- * Copyright (C) Leipzig University Library 2014.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * @category VuFind
- * @package RecordDrivers
- * @author André Lahmann <lahmann@ub.uni-leipzig.de>
- * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link https://vufind.org/wiki/development:plugins:hierarchy_components Wiki
- */
-namespace finc\RecordDriver;
-
-use Interop\Container\ContainerInterface;
-
-/**
- * Record Driver Factory Class
- *
- * @category VuFind
- * @package RecordDrivers
- * @author André Lahmann <lahmann@ub.uni-leipzig.de>
- * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @link https://vufind.org/wiki/development:plugins:hierarchy_components Wiki
- *
- * @codeCoverageIgnore
- */
-class Factory
-{
- /**
- * Factory for SolrDefault record driver.
- *
- * @param ContainerInterface $container Service manager.
- *
- * @return SolrDefault
- */
- public static function getSolrDefault(ContainerInterface $container)
- {
- $driver = new SolrDefault(
- $container->get('VuFind\Config')->get('config'),
- null,
- $container->get('VuFind\Config')->get('searches')
- );
- $driver->attachSearchService($container->get('VuFind\Search'));
- return $driver;
- }
-
- /**
- * Factory for SolrMarc record driver.
- *
- * @param ContainerInterface $container Service manager.
- *
- * @return SolrMarc
- */
- public static function getSolrMarc(ContainerInterface $container)
- {
- $driver = new SolrMarc(
- $container->get('VuFind\Config')->get('config'),
- null,
- $container->get('VuFind\Config')->get('searches')
- );
- $driver->attachILS(
- $container->get('VuFind\ILSConnection'),
- $container->get('VuFind\ILSHoldLogic'),
- $container->get('VuFind\ILSTitleHoldLogic')
- );
- $driver->attachSearchService($container->get('VuFind\Search'));
- return $driver;
- }
-
- /**
- * Factory for SolrMarcPDA record driver.
- *
- * @param ContainerInterface $container Service manager.
- *
- * @return SolrMarcFincPDA
- */
- public static function getSolrMarcFincPDA(ContainerInterface $container)
- {
- $driver = new SolrMarcFincPDA(
- $container->get('VuFind\Config')->get('config'),
- null,
- $container->get('VuFind\Config')->get('searches')
- );
- //$driver->attachILS(
- // $container->get('VuFind\ILSConnection'),
- // $container->get('VuFind\ILSHoldLogic'),
- // $container->get('VuFind\ILSTitleHoldLogic')
- //);
- $driver->attachSearchService($container->get('VuFind\Search'));
- return $driver;
- }
-
- /**
- * Factory for SolrMarcRemote record driver.
- *
- * @param ContainerInterface $container Service manager.
- *
- * @return SolrMarcRemote
- */
- public static function getSolrMarcRemote(ContainerInterface $container)
- {
- $driver = new SolrMarcRemote(
- $container->get('VuFind\Config')->get('config'),
- null,
- $container->get('VuFind\Config')->get('searches')
- );
- $driver->attachILS(
- $container->get('VuFind\ILSConnection'),
- $container->get('VuFind\ILSHoldLogic'),
- $container->get('VuFind\ILSTitleHoldLogic')
- );
- $driver->attachSearchService($container->get('VuFind\Search'));
- return $driver;
- }
-
- /**
- * Factory for SolrAI record driver.
- *
- * @param ContainerInterface $container Service manager.
- *
- * @return SolrAI
- */
- public static function getSolrAI(ContainerInterface $container)
- {
- return new SolrAI(
- $container->get('VuFind\Config')->get('config'),
- $container->get('VuFind\Config')->get('SolrAI'),
- $container->get('VuFind\Config')->get('searches')
- );
- }
-
- /**
- * Factory for SolrIS record driver.
- *
- * @param ContainerInterface $container Service manager.
- *
- * @return SolrIS
- */
- public static function getSolrIS(ContainerInterface $container)
- {
- // Despite providing recordConfig to AI RecordDriver RecordDriver IS does not
- // need a recordConfig, thus null is provided
- return new SolrIS(
- $container->get('VuFind\Config')->get('config'),
- null,
- null
- );
- }
-
- /**
- * Factory for SolrMarcRemoteFinc record driver.
- *
- * @param ContainerInterface $container Service manager.
- *
- * @return SolrMarcRemoteFinc
- */
- public static function getSolrMarcRemoteFinc(ContainerInterface $container)
- {
- $driver = new SolrMarcRemoteFinc(
- $container->get('VuFind\Config')->get('config'),
- null,
- $container->get('VuFind\Config')->get('searches')
- );
- $driver->attachILS(
- $container->get('VuFind\ILSConnection'),
- $container->get('VuFind\ILSHoldLogic'),
- $container->get('VuFind\ILSTitleHoldLogic')
- );
- $driver->attachSearchService($container->get('VuFind\Search'));
- return $driver;
- }
-
- /**
- * Factory for SolrMarcFinc record driver.
- *
- * @param ContainerInterface $container Service manager.
- *
- * @return SolrMarcFinc
- */
- public static function getSolrMarcFinc(ContainerInterface $container)
- {
- $driver = new SolrMarcFinc(
- $container->get('VuFind\Config')->get('config'),
- null,
- $container->get('VuFind\Config')->get('searches')
- );
- $driver->attachILS(
- $container->get('VuFind\ILSConnection'),
- $container->get('VuFind\ILSHoldLogic'),
- $container->get('VuFind\ILSTitleHoldLogic')
- );
- $driver->attachSearchService($container->get('VuFind\Search'));
- return $driver;
- }
-
- /**
- * Factory for SolrLido record driver.
- *
- * @param ContainerInterface $container Service manager.
- *
- * @return SolrLidoNdl
- */
- public static function getSolrLidoNdl(ContainerInterface $container)
- {
- return new SolrLidoNdl(
- $container->get('VuFind\Config')->get('config'),
- null,
- $container->get('VuFind\Config')->get('searches'),
- $container->get('VuFind\DateConverter')
- );
- }
-
- /**
- * Factory for SolrLidoFinc record driver.
- *
- * @param ContainerInterface $container Service manager.
- *
- * @return SolrLido
- */
- public static function getSolrLido(ContainerInterface $container)
- {
- return new SolrLido(
- $container->get('VuFind\Config')->get('config'),
- null,
- $container->get('VuFind\Config')->get('searches'),
- $container->get('VuFind\DateConverter')
- );
- }
-
- /**
- * Factory for SolrDico record driver
- *
- * @param ContainerInterface $container Service Manager
- * @return SolrDico
- */
- public static function getSolrDico(ContainerInterface $container)
- {
- return new SolrDico(
- $container->get('VuFind\Config')->get('config'),
- null, //$container->get('VuFind\Config')->get('SolrDico'),
- $container->get('VuFind\Config')->get('searches')
- );
- }
-}
diff --git a/module/finc/src/finc/RecordDriver/SolrAIFactory.php b/module/finc/src/finc/RecordDriver/SolrAIFactory.php
new file mode 100644
index 0000000000000000000000000000000000000000..a649a6d178b7db8ed4805cb17c2ebea04b829bd3
--- /dev/null
+++ b/module/finc/src/finc/RecordDriver/SolrAIFactory.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Factory for SolrAI record drivers.
+ *
+ * PHP version 7
+ *
+ * Copyright (C) Villanova University 2018.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * @category VuFind
+ * @package RecordDrivers
+ * @author Dorian Merz <mer@ub.uni-leipzig.de>
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License
+ * @link https://vufind.org/wiki/development Wiki
+ */
+namespace finc\RecordDriver;
+
+use Interop\Container\ContainerInterface;
+use VuFind\RecordDriver\AbstractBaseFactory;
+
+/**
+ * Factory for SolrAI record drivers.
+ *
+ * @category VuFind
+ * @package RecordDrivers
+ * @author Dorian Merz <mer@ub.uni-leipzig.de>
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License
+ * @link https://vufind.org/wiki/development Wiki
+ */
+class SolrAIFactory extends AbstractBaseFactory
+{
+ /**
+ * Create an object
+ *
+ * @param ContainerInterface $container Service manager
+ * @param string $requestedName Service being created
+ * @param null|array $options Extra options (optional)
+ *
+ * @return object
+ *
+ * @throws ServiceNotFoundException if unable to resolve the service.
+ * @throws ServiceNotCreatedException if an exception is raised when
+ * creating a service.
+ * @throws ContainerException if any other error occurs
+ */
+ public function __invoke(ContainerInterface $container, $requestedName,
+ array $options = null
+ ) {
+ $solrAiConfig = $container->get('VuFind\Config')->get('SolrAI');
+ $searchConfig = $config = $container->get('VuFind\Config\PluginManager')->get('searches');
+ $options = [$solrAiConfig,$searchConfig];
+ return parent::__invoke($container, $requestedName, $options);
+ }
+}
diff --git a/module/finc/src/finc/RecordDriver/SolrLidoFactory.php b/module/finc/src/finc/RecordDriver/SolrLidoFactory.php
new file mode 100644
index 0000000000000000000000000000000000000000..f7ddb80d343f01381cd7230dbaa33384e279b199
--- /dev/null
+++ b/module/finc/src/finc/RecordDriver/SolrLidoFactory.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Factory for SolrLido record drivers.
+ *
+ * PHP version 7
+ *
+ * Copyright (C) Villanova University 2018.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * @category VuFind
+ * @package RecordDrivers
+ * @author Dorian Merz <mer@ub.uni-leipzig.de>
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License
+ * @link https://vufind.org/wiki/development Wiki
+ */
+namespace finc\RecordDriver;
+
+use Interop\Container\ContainerInterface;
+use VuFind\RecordDriver\AbstractBaseFactory;
+
+/**
+ * Factory for SolrLido record drivers.
+ *
+ * @category VuFind
+ * @package RecordDrivers
+ * @author Dorian Merz <mer@ub.uni-leipzig.de>
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License
+ * @link https://vufind.org/wiki/development Wiki
+ */
+class SolrLidoFactory extends AbstractBaseFactory
+{
+ /**
+ * Create an object
+ *
+ * @param ContainerInterface $container Service manager
+ * @param string $requestedName Service being created
+ * @param null|array $options Extra options (optional)
+ *
+ * @return object
+ *
+ * @throws ServiceNotFoundException if unable to resolve the service.
+ * @throws ServiceNotCreatedException if an exception is raised when
+ * creating a service.
+ * @throws ContainerException if any other error occurs
+ */
+ public function __invoke(ContainerInterface $container, $requestedName,
+ array $options = null
+ ) {
+ $searchConfig = $config = $container->get('VuFind\Config\PluginManager')->get('searches');
+ $dateConverter = $container->get('VuFind\DateConverter');
+ $options = [null,$searchConfig,$dateConverter];
+ return parent::__invoke($container, $requestedName, $options);
+ }
+}