opencultureconsulting
/
kitodo-presentation
mirror of https://github.com/kitodo/kitodo-presentation.git
2
0
Fork 0
Code Issues Releases Activity

Fix path settings (hopefully)

This commit is contained in:
Sebastian Meyer 2020-12-08 17:07:48 +01:00 committed by GitHub
parent 5b3eac3a29
commit 6419ddebe3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Classes/Common/Solr.php
View File

@ -248,7 +248,7 @@ class Solr
// Set port if not set.
$solrInfo['port'] = \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange($conf['solrPort'], 1, 65535, 8983);
// Append core name to path.
$solrInfo['path'] = trim($conf['solrPath'], '/') . '/solr';
$solrInfo['path'] = trim($conf['solrPath'], '/');
// Timeout
$solrInfo['timeout'] = \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange($conf['solrTimeout'], 1, intval(ini_get('max_execution_time')), 10);
return $solrInfo;
@ -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;
}
/**
@ -578,7 +578,7 @@ class Solr
'scheme' => $solrInfo['scheme'],
'host' => $solrInfo['host'],
'port' => $solrInfo['port'],
'path' => '/',
'path' => '/' . $solrInfo['path'],
'core' => $core,
'username' => $solrInfo['username'],
'password' => $solrInfo['password'],