diff --git a/config/vufind/config.ini b/config/vufind/config.ini
index cb94e6a44693b56271f0dd87920368eed98959e4..28cef5fc5ca21734d11d9b8aef0754291cace6dc 100644
--- a/config/vufind/config.ini
+++ b/config/vufind/config.ini
@@ -1033,10 +1033,10 @@ show_in_holdings = false ; include in holdings tab of record view
; help users find resources through your link resolver and to manage citations in
; Zotero.
[OpenURL]
-; If a resolver base URL is enabled, it will be used to link ISSNs to your link
-; resolver and to access articles in Summon if that module is enabled. Earlier
-; versions of VuFind included some parameters as part of the URL; at this point,
-; any extra parameters will be ignored -- please provide only the base URL.
+; If a resolver base URL is enabled, it will be used to link from records to your
+; OpenURL resolver. An OpenURL resolver is typically used to e.g. link to full text
+; from article metadata, but it may provide other services too. Extra parameters may
+; be added if necessary.
;url = "http://openurl.myuniversity.edu/sfx_local"
; This string will be included as part of your OpenURL referer ID (the full string
@@ -1048,7 +1048,7 @@ rfr_id = vufind.svn.sourceforge.net
; By specifying your link resolver type, you can allow VuFind to optimize its
; OpenURLs for a particular platform. Current legal values: "sfx", "360link",
-; "EZB", "Redi," "demo" or "other" (default is "other" if commented out; "demo"
+; "EZB", "Redi," "demo" or "generic" (default is "generic" if commented out; "demo"
; generates fake values for use in testing the embed setting below).
;resolver = sfx
diff --git a/module/VuFind/src/VuFind/AjaxHandler/GetResolverLinks.php b/module/VuFind/src/VuFind/AjaxHandler/GetResolverLinks.php
index 16483c1aa03c7db72ddde29ef1ad0b1abf6540dc..8e24b129313e10b0145b9c37008566c8815dcc8f 100644
--- a/module/VuFind/src/VuFind/AjaxHandler/GetResolverLinks.php
+++ b/module/VuFind/src/VuFind/AjaxHandler/GetResolverLinks.php
@@ -105,7 +105,7 @@ class GetResolverLinks extends AbstractBase implements TranslatorAwareInterface
$searchClassId = $params->fromQuery('searchClassId', '');
$resolverType = isset($this->config->OpenURL->resolver)
- ? $this->config->OpenURL->resolver : 'other';
+ ? $this->config->OpenURL->resolver : 'generic';
if (!$this->pluginManager->has($resolverType)) {
return $this->formatResponse(
$this->translate("Could not load driver for $resolverType"),
diff --git a/module/VuFind/src/VuFind/Resolver/Driver/AbstractBaseFactory.php b/module/VuFind/src/VuFind/Resolver/Driver/AbstractBaseFactory.php
new file mode 100644
index 0000000000000000000000000000000000000000..0b20abfada74d49920ba914c11425c5b214a07ff
--- /dev/null
+++ b/module/VuFind/src/VuFind/Resolver/Driver/AbstractBaseFactory.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Generic factory suitable for most resolver 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 Resolver_Drivers
+ * @author Demian Katz <demian.katz@villanova.edu>
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License
+ * @link https://vufind.org/wiki/development Wiki
+ */
+namespace VuFind\Resolver\Driver;
+
+use Interop\Container\ContainerInterface;
+use Zend\ServiceManager\Factory\FactoryInterface;
+
+/**
+ * Generic factory suitable for most resolver drivers.
+ *
+ * @category VuFind
+ * @package Resolver_Drivers
+ * @author Demian Katz <demian.katz@villanova.edu>
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License
+ * @link https://vufind.org/wiki/development Wiki
+ */
+class AbstractBaseFactory implements FactoryInterface
+{
+ /**
+ * 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
+ ) {
+ $config = $container->get('VuFind\Config\PluginManager')->get('config');
+ return new $requestedName(
+ $config->OpenURL->url,
+ ...($options ?: [])
+ );
+ }
+}
diff --git a/module/VuFind/src/VuFind/Resolver/Driver/DriverWithHttpClientFactory.php b/module/VuFind/src/VuFind/Resolver/Driver/DriverWithHttpClientFactory.php
index f9afb1ead8903020d64afc12bdfaca2c89009451..ecd7e14b920dfebc230a9c06231d0a6466bde1ef 100644
--- a/module/VuFind/src/VuFind/Resolver/Driver/DriverWithHttpClientFactory.php
+++ b/module/VuFind/src/VuFind/Resolver/Driver/DriverWithHttpClientFactory.php
@@ -28,7 +28,6 @@
namespace VuFind\Resolver\Driver;
use Interop\Container\ContainerInterface;
-use Zend\ServiceManager\Factory\FactoryInterface;
/**
* Generic factory suitable for most resolver drivers.
@@ -39,7 +38,7 @@ use Zend\ServiceManager\Factory\FactoryInterface;
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License
* @link https://vufind.org/wiki/development Wiki
*/
-class DriverWithHttpClientFactory implements FactoryInterface
+class DriverWithHttpClientFactory extends AbstractBaseFactory
{
/**
* Create an object
@@ -58,11 +57,12 @@ class DriverWithHttpClientFactory implements FactoryInterface
public function __invoke(ContainerInterface $container, $requestedName,
array $options = null
) {
- $config = $container->get('VuFind\Config\PluginManager')->get('config');
- return new $requestedName(
- $config->OpenURL->url,
- $container->get('VuFindHttp\HttpService')->createClient(),
- ...($options ?: [])
- );
+ $client = $container->get('VuFindHttp\HttpService')->createClient();
+ if ($options) {
+ array_unshift($options, $client);
+ } else {
+ $options = [$client];
+ }
+ return parent::__invoke($container, $requestedName, $options);
}
}
diff --git a/module/VuFind/src/VuFind/Resolver/Driver/Generic.php b/module/VuFind/src/VuFind/Resolver/Driver/Generic.php
new file mode 100644
index 0000000000000000000000000000000000000000..dc356d9a48794ae0fbc3a767c2037880ebfa27ab
--- /dev/null
+++ b/module/VuFind/src/VuFind/Resolver/Driver/Generic.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Generic Link Resolver Driver
+ *
+ * PHP version 7
+ *
+ * Copyright (C) The National Library of Finland 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 Resolver_Drivers
+ * @author Ere Maijala <ere.maijala@helsinki.fi>
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License
+ * @link https://vufind.org/wiki/development:plugins:link_resolver_drivers Wiki
+ */
+namespace VuFind\Resolver\Driver;
+
+/**
+ * Generic Link Resolver Driver
+ *
+ * @category VuFind
+ * @package Resolver_Drivers
+ * @author Ere Maijala <ere.maijala@helsinki.fi>
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License
+ * @link https://vufind.org/wiki/development:plugins:link_resolver_drivers Wiki
+ */
+class Generic extends AbstractBase
+{
+ /**
+ * Fetch Links
+ *
+ * Fetches a set of links corresponding to an OpenURL
+ *
+ * @param string $openURL openURL (url-encoded)
+ *
+ * @return string raw data returned by resolver
+ */
+ public function fetchLinks($openURL)
+ {
+ return '';
+ }
+
+ /**
+ * Parse Links
+ *
+ * Parses an XML file returned by a link resolver
+ * and converts it to a standardised format for display
+ *
+ * @param string $url Data returned by fetchLinks
+ *
+ * @return array Array of values
+ */
+ public function parseLinks($url)
+ {
+ return [];
+ }
+}
diff --git a/module/VuFind/src/VuFind/Resolver/Driver/PluginManager.php b/module/VuFind/src/VuFind/Resolver/Driver/PluginManager.php
index dc9f1167f5043c707608dec3b9ba9cc675d60179..44380f9bfc67dce98a6efdbcec7343e973b0f496 100644
--- a/module/VuFind/src/VuFind/Resolver/Driver/PluginManager.php
+++ b/module/VuFind/src/VuFind/Resolver/Driver/PluginManager.php
@@ -50,6 +50,8 @@ class PluginManager extends \VuFind\ServiceManager\AbstractPluginManager
'sfx' => 'VuFind\Resolver\Driver\Sfx',
'redi' => 'VuFind\Resolver\Driver\Redi',
'threesixtylink' => 'VuFind\Resolver\Driver\Threesixtylink',
+ 'generic' => 'VuFind\Resolver\Driver\Generic',
+ 'other' => 'generic'
];
/**
@@ -68,6 +70,8 @@ class PluginManager extends \VuFind\ServiceManager\AbstractPluginManager
'VuFind\Resolver\Driver\DriverWithHttpClientFactory',
'VuFind\Resolver\Driver\Redi' =>
'VuFind\Resolver\Driver\DriverWithHttpClientFactory',
+ 'VuFind\Resolver\Driver\Generic' =>
+ 'VuFind\Resolver\Driver\AbstractBaseFactory',
];
/**