Add API endpoint for Solarium 4.x

This commit is contained in:
Sebastian Meyer 2021-01-19 10:38:59 +01:00
parent b8a4e7a6d0
commit a52b1d3c22
2 changed files with 7 additions and 2 deletions

View File

@ -329,6 +329,11 @@ class Solr
if (!empty($config['path'])) {
$config['path'] .= '/';
}
// Add "/solr" API endpoint when using Solarium <5.x
// Todo: Remove when dropping support for Solarium 4.x
if (!\Solarium\Client::checkMinimal('5.0.0')) {
$config['path'] .= 'solr/';
}
// Set connection timeout lower than PHP's max_execution_time.
$max_execution_time = intval(ini_get('max_execution_time')) ?: 30;
$config['timeout'] = MathUtility::forceIntegerInRange($conf['solrTimeout'], 1, $max_execution_time, 10);

View File

@ -193,7 +193,7 @@
<label index="config.solrHttps">Use HTTPS: (default is "FALSE")</label>
<label index="config.solrHost">Solr Server Host: (default is "localhost")</label>
<label index="config.solrPort">Solr Server Port: (default is "8983")</label>
<label index="config.solrPath">Solr Server Path: omit API endpoint "/solr" when using Solarium 5.x (default is "/")</label>
<label index="config.solrPath">Solr Server Path: without API endpoint "/solr" (default is "/")</label>
<label index="config.solrUser">Solr Server User: (default is "")</label>
<label index="config.solrPass">Solr Server Password: (default is "")</label>
<label index="config.solrTimeout">Solr Server Timeout: (default is "10")</label>
@ -378,7 +378,7 @@
<label index="config.solrHttps">HTTPS verwenden: (Standard ist "FALSE")</label>
<label index="config.solrHost">Solr Server Host: (Standard ist "localhost")</label>
<label index="config.solrPort">Solr Server Port: (Standard ist "8983")</label>
<label index="config.solrPath">Solr Server Pfad: bei Solarium 5.x ohne API-Endpunkt "/solr" (Standard ist "/")</label>
<label index="config.solrPath">Solr Server Pfad: ohne API-Endpunkt "/solr" (Standard ist "/")</label>
<label index="config.solrUser">Solr Server Benutzername: (Standard ist "")</label>
<label index="config.solrPass">Solr Server Kennwort: (Standard ist "")</label>
<label index="config.solrTimeout">Solr Server Timeout: (Standard ist "10")</label>