Skip to content
Draft
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
e809783
Use config array instead of object in ProQuestFSG search factory
rtloftus Sep 3, 2026
36acdf7
backend reqs
rtloftus Sep 3, 2026
f0d68c9
composer fix
rtloftus Sep 3, 2026
1981620
composer fix
rtloftus Sep 3, 2026
42e90d0
backend blender fix
rtloftus Sep 3, 2026
288b3bd
openurl
rtloftus Sep 3, 2026
45d8974
record collection
rtloftus Sep 3, 2026
9423c35
composer fix
rtloftus Sep 3, 2026
4ae1524
composer fix
rtloftus Sep 3, 2026
53b29f8
Merge branch 'dev' into proquest-fsg
demiankatz Sep 4, 2026
990e333
Update module/VuFindSearch/src/VuFindSearch/Backend/EDS/Backend.php
rtloftus Sep 8, 2026
82df893
Update module/VuFind/src/VuFind/Search/Factory/AbstractSolrBackendFac…
rtloftus Sep 8, 2026
6d81afb
Update module/VuFind/src/VuFind/Search/Factory/AbstractSolrBackendFac…
rtloftus Sep 8, 2026
d3b5222
Update module/VuFindSearch/src/VuFindSearch/Backend/Blender/Response/…
rtloftus Sep 8, 2026
e8104d7
Update module/VuFindSearch/src/VuFindSearch/Backend/Blender/Response/…
rtloftus Sep 8, 2026
5742236
Update module/VuFindSearch/src/VuFindSearch/Backend/Blender/Backend.php
rtloftus Sep 8, 2026
02b9cd1
Update module/VuFindSearch/src/VuFindSearch/Backend/Blender/Backend.php
rtloftus Sep 8, 2026
1660fcb
Update module/VuFindSearch/src/VuFindSearch/Backend/Solr/SimilarBuild…
rtloftus Sep 8, 2026
00968cf
fixed parser error
rtloftus Sep 8, 2026
e14e20a
similarbuilder reversion
rtloftus Sep 9, 2026
c51b2a7
sb test
rtloftus Sep 9, 2026
2d96c8a
reversion of sb part
rtloftus Sep 9, 2026
364bf48
eds backend test reversion
rtloftus Sep 9, 2026
66aa6df
eds backend reversion
rtloftus Sep 9, 2026
e43ae5c
recordcollection reversion
rtloftus Sep 9, 2026
0777f4c
blender backend
rtloftus Sep 9, 2026
c66489f
blender backend test
rtloftus Sep 9, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
use Laminas\Http\Client;
use Laminas\ServiceManager\Factory\FactoryInterface;
use Psr\Container\ContainerInterface;
use VuFind\Config\Config;
use VuFind\Service\GetServiceTrait;

/**
Expand Down Expand Up @@ -87,16 +86,16 @@ protected function createHttpClient(
/**
* Create cache for the connector if enabled in configuration.
*
* @param Config $searchConfig Search configuration
* @param array $searchConfig Search configuration
*
* @return ?StorageInterface
*/
protected function createConnectorCache(Config $searchConfig): ?StorageInterface
protected function createConnectorCache(array $searchConfig): ?StorageInterface
Comment thread
rtloftus marked this conversation as resolved.
{
if (empty($searchConfig->SearchCache->adapter)) {
if (empty($searchConfig['SearchCache']['adapter'])) {
return null;
}
$cacheConfig = $searchConfig->SearchCache->toArray();
$cacheConfig = $searchConfig['SearchCache'];
$options = $cacheConfig['options'] ?? [];
if (empty($options['namespace'])) {
$options['namespace'] = 'Index';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
use Psr\Container\ContainerExceptionInterface as ContainerException;
use Psr\Container\ContainerInterface;
use Psr\Log\LoggerInterface;
use VuFind\Config\Config;
use VuFindSearch\Backend\ProQuestFSG\Backend;
use VuFindSearch\Backend\ProQuestFSG\Connector;
use VuFindSearch\Backend\ProQuestFSG\Response\XML\RecordCollectionFactory;
Expand All @@ -62,16 +61,16 @@ class ProQuestFSGBackendFactory extends AbstractBackendFactory
/**
* VuFind configuration.
*
* @var Config
* @var array
*/
protected Config $config;
protected array $config;

/**
* ProQuestFSG configuration.
*
* @var Config
* @var array
*/
protected Config $proQuestFSGConfig;
protected array $proQuestFSGConfig;

/**
* Create an object.
Expand All @@ -96,8 +95,8 @@ public function __invoke(
) {
$this->setup($container);
$configManager = $this->getService(\VuFind\Config\ConfigManagerInterface::class);
$this->config = $configManager->getConfigObject('config');
$this->proQuestFSGConfig = $configManager->getConfigObject('ProQuestFSG');
$this->config = $configManager->getConfigArray('config');
$this->proQuestFSGConfig = $configManager->getConfigArray('ProQuestFSG');
if ($this->serviceLocator->has(\VuFind\Log\Logger::class)) {
$this->logger = $this->getService(\VuFind\Log\Logger::class);
}
Expand Down Expand Up @@ -127,7 +126,7 @@ protected function createBackend(Connector $connector): Backend
*/
protected function createConnector(): Connector
{
$connector = new Connector($this->createHttpClient(), $this->proQuestFSGConfig->toArray());
$connector = new Connector($this->createHttpClient(), $this->proQuestFSGConfig);
$connector->setLogger($this->logger);
if ($cache = $this->createConnectorCache($this->proQuestFSGConfig)) {
$connector->setCache($cache);
Expand Down