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

Fixes for runtime issues noticed in tests with main branch #1430

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fixes for runtime issues noticed in tests with main branch #1430

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0070204
Catch runtime warning when setting for library is missing
stweil Jan 16, 2025
b25e4f2
Catch runtime error when setting for Solr core is missing
stweil Jan 16, 2025
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
9 changes: 7 additions & 2 deletions Classes/Controller/OaiPmhController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ protected function verbGetRecord()
*/
protected function verbIdentify()
{
$library = $this->libraryRepository->findByUid($this->settings['library']);
$library = $this->libraryRepository->findByUid($this->settings['library'] ?? 0);

$oaiIdentifyInfo = [];

Expand Down Expand Up @@ -642,7 +642,12 @@ protected function fetchDocumentSet(): array

$solrQuery .= ' AND timestamp:[' . $from . ' TO ' . $until . ']';

$solr = Solr::getInstance($this->settings['solrcore']);
$solrcore = $this->settings['solrcore'] ?? false;
if (!$solrcore) {
$this->logger->error('Solr core not configured');
return $documentSet;
}
$solr = Solr::getInstance($solrcore);
if (!$solr->ready) {
$this->logger->error('Apache Solr not available');
return $documentSet;
Expand Down
Loading