Merge pull request #550 from beatrycze-volk/update-solarium

Update Solarium to 5.1.6
This commit is contained in:
Sebastian Meyer 2020-12-09 16:02:34 +01:00 committed by GitHub
commit e01990c535
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 deletions

View File

@ -247,7 +247,7 @@ class Solr
$solrInfo['password'] = $conf['solrPass'];
// Set port if not set.
$solrInfo['port'] = \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange($conf['solrPort'], 1, 65535, 8983);
// Append core name to path.
// Trim path of slashes.
$solrInfo['path'] = trim($conf['solrPath'], '/');
// Timeout
$solrInfo['timeout'] = \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange($conf['solrTimeout'], 1, intval(ini_get('max_execution_time')), 10);
@ -276,7 +276,7 @@ class Solr
$host = $solrInfo['host'];
}
// Return entire request URL.
return $solrInfo['scheme'] . '://' . $host . ':' . $solrInfo['port'] . '/' . $solrInfo['path'] . '/' . $core;
return $solrInfo['scheme'] . '://' . $host . ':' . $solrInfo['port'] . '/' . $solrInfo['path'] . '/solr/' . $core;
}
/**

View File

@ -192,7 +192,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: (default is "/solr/")</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>
@ -375,7 +375,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: (Standard ist "/solr/")</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>

View File

@ -35,7 +35,7 @@
"typo3/cms-core": "~8.7.32|~9.5.17",
"typo3/cms-tstemplate": "~8.7.32|~9.5.17",
"ubl/php-iiif-prezi-reader": "0.3.0",
"solarium/solarium": "^4.2"
"solarium/solarium": "^5.1.6"
},
"replace": {
"typo3-ter/dlf": "self.version"

View File

@ -37,7 +37,7 @@ solrHost = localhost
# cat=Solr; type=int[0-65535]; label=LLL:EXT:dlf/Resources/Private/Language/Labels.xml:config.solrPort
solrPort = 8983
# cat=Solr; type=string; label=LLL:EXT:dlf/Resources/Private/Language/Labels.xml:config.solrPath
solrPath = /solr/
solrPath = /
# cat=Solr; type=string; label=LLL:EXT:dlf/Resources/Private/Language/Labels.xml:config.solrUser
solrUser =
# cat=Solr; type=string; label=LLL:EXT:dlf/Resources/Private/Language/Labels.xml:config.solrPass