diff --git a/module/VuFind/src/VuFind/Search/Base/Options.php b/module/VuFind/src/VuFind/Search/Base/Options.php index 66067027688a719ed594480b3999ba092ef2d71c..9e30bf8e117dcb271d21d8ead18bdfae22004d98 100644 --- a/module/VuFind/src/VuFind/Search/Base/Options.php +++ b/module/VuFind/src/VuFind/Search/Base/Options.php @@ -226,6 +226,13 @@ abstract class Options implements TranslatorAwareInterface */ protected $autocompleteEnabled = false; + /** + * Configuration file to read global settings from + * + * @var string + */ + protected $mainIni = 'config'; + /** * Configuration file to read search settings from * @@ -405,6 +412,17 @@ abstract class Options implements TranslatorAwareInterface return $this->facetsIni; } + /** + * Get the name of the ini file used for loading primary settings in this + * object. + * + * @return string + */ + public function getMainIni() + { + return $this->mainIni; + } + /** * Get the name of the ini file used for configuring search parameters in this * object. diff --git a/module/VuFind/src/VuFind/Search/Favorites/Options.php b/module/VuFind/src/VuFind/Search/Favorites/Options.php index f11d416cdea90e455e036b4df6e697ba221fbd3c..8c049e629278798898c84d33a9c01c47377fdfe1 100644 --- a/module/VuFind/src/VuFind/Search/Favorites/Options.php +++ b/module/VuFind/src/VuFind/Search/Favorites/Options.php @@ -52,7 +52,7 @@ class Options extends \VuFind\Search\Base\Options 'title' => 'sort_title', 'author' => 'sort_author', 'year DESC' => 'sort_year', 'year' => 'sort_year asc' ]; - $config = $configLoader->get('config'); + $config = $configLoader->get($this->mainIni); if (isset($config->Social->lists_default_limit)) { $this->defaultLimit = $config->Social->lists_default_limit; } diff --git a/module/VuFind/src/VuFind/Search/Solr/Options.php b/module/VuFind/src/VuFind/Search/Solr/Options.php index 236afca7f484b1af3d42e3fd73bd791b7aa0e0ec..760b81e44b2d62026cd2f4ae58b7591697df8870 100644 --- a/module/VuFind/src/VuFind/Search/Solr/Options.php +++ b/module/VuFind/src/VuFind/Search/Solr/Options.php @@ -186,7 +186,7 @@ class Options extends \VuFind\Search\Base\Options } // Load Spelling preferences - $config = $configLoader->get('config'); + $config = $configLoader->get($this->mainIni); if (isset($config->Spelling->enabled)) { $this->spellcheck = $config->Spelling->enabled; } diff --git a/module/VuFind/src/VuFind/Search/Solr/Params.php b/module/VuFind/src/VuFind/Search/Solr/Params.php index fabb58c0acc7a138eba26594040960e5c78384b5..06ac6f635efc49dbaa480855a60058466b7a5bc9 100644 --- a/module/VuFind/src/VuFind/Search/Solr/Params.php +++ b/module/VuFind/src/VuFind/Search/Solr/Params.php @@ -402,7 +402,7 @@ class Params extends \VuFind\Search\Base\Params */ public function getQueryIDLimit() { - $config = $this->configLoader->get('config'); + $config = $this->configLoader->get($this->getOptions()->getMainIni()); return isset($config->Index->maxBooleanClauses) ? $config->Index->maxBooleanClauses : 1024; } diff --git a/module/VuFind/src/VuFind/Search/Tags/Options.php b/module/VuFind/src/VuFind/Search/Tags/Options.php index 5fd63400ee3efce21b853642572d9f1785449257..05dcca6376703a1ff32821660d9de8eb3be60360 100644 --- a/module/VuFind/src/VuFind/Search/Tags/Options.php +++ b/module/VuFind/src/VuFind/Search/Tags/Options.php @@ -54,7 +54,7 @@ class Options extends \VuFind\Search\Base\Options public function __construct(\VuFind\Config\PluginManager $configLoader) { parent::__construct($configLoader); - $config = $configLoader->get('config'); + $config = $configLoader->get($this->mainIni); if (isset($config->Social->show_solr_options_in_tag_search) && $config->Social->show_solr_options_in_tag_search ) {