diff --git a/module/VuFind/config/module.config.php b/module/VuFind/config/module.config.php index 7908a726c2235e41db6284c12beb39eee1b935cd..8c4bb408ed9cf0101613a330c61d42c4991ef528 100644 --- a/module/VuFind/config/module.config.php +++ b/module/VuFind/config/module.config.php @@ -266,6 +266,7 @@ $config = array( }, 'VuFind\WorldCatConnection' => function ($sm) { return new \VuFind\Connection\WorldCat( + $sm->get('VuFind\Config')->get('config'), $sm->get('VuFind\Http')->createClient() ); }, diff --git a/module/VuFind/src/VuFind/Connection/WorldCat.php b/module/VuFind/src/VuFind/Connection/WorldCat.php index 862c939454e6a672af414e543566a13ffeefd626..e4e2f86b6bc5895c1c4f9b3213c62a476792dd55 100644 --- a/module/VuFind/src/VuFind/Connection/WorldCat.php +++ b/module/VuFind/src/VuFind/Connection/WorldCat.php @@ -27,7 +27,6 @@ * @link http://vufind.org/wiki/vufind2:developer_manual Wiki */ namespace VuFind\Connection; -use VuFind\Config\Reader as ConfigReader; /** * WorldCat SRU Search Interface @@ -57,14 +56,15 @@ class WorldCat extends SRU /** * Constructor * - * @param \Zend\Http\Client $client An HTTP client object + * @param \Zend\Config\Config $config VuFind configuration + * @param \Zend\Http\Client $client An HTTP client object */ - public function __construct(\Zend\Http\Client $client) - { + public function __construct(\Zend\Config\Config $config, + \Zend\Http\Client $client + ) { parent::__construct( 'http://www.worldcat.org/webservices/catalog/search/sru', $client ); - $config = ConfigReader::getConfig(); $this->wskey = isset($config->WorldCat->apiKey) ? $config->WorldCat->apiKey : null; $this->limitCodes = isset($config->WorldCat->LimitCodes)