Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Solarium to 5.1.6 #550

Merged
merged 8 commits into from
Dec 9, 2020
Merged

Update Solarium to 5.1.6 #550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
446a434
Update Solarium to 5.1.6
beatrycze-volk Dec 1, 2020
dc758ae
Apply suggestions from code review
beatrycze-volk Dec 8, 2020
5b3eac3
Restore append core name to path and remove cloud comment
beatrycze-volk Dec 8, 2020
6419dde
Fix path settings (hopefully)
sebastian-meyer Dec 8, 2020
0db08bd
Fix comment
sebastian-meyer Dec 8, 2020
cfdedba
Revert path changes in endpoint config
sebastian-meyer Dec 8, 2020
5ed2289
Merge branch 'master' into update-solarium
sebastian-meyer Dec 8, 2020
dcbd317
Merge branch 'master' into update-solarium
sebastian-meyer Dec 9, 2020
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
4 changes: 2 additions & 2 deletions Classes/Common/Solr.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ public static function getSolrConnectionInfo()
$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'], '/');
beatrycze-volk marked this conversation as resolved.
Show resolved Hide resolved
// Timeout
$solrInfo['timeout'] = \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange($conf['solrTimeout'], 1, intval(ini_get('max_execution_time')), 10);
Expand Down Expand Up @@ -276,7 +276,7 @@ public static function getSolrUrl($core = '')
$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;
}

/**
Expand Down
4 changes: 2 additions & 2 deletions Resources/Private/Language/Labels.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
beatrycze-volk marked this conversation as resolved.
Show resolved Hide resolved
<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>
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ext_conf_template.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down