Skip to content

[FINNA-4364] Fix title_in_hierarchy fields to array #109

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

Merged
EreMaijala merged 2 commits into from
May 6, 2026
Merged

[FINNA-4364] Fix title_in_hierarchy fields to array #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78d80eb
Fix title_in_hierarchy fields to array
mshroom May 6, 2026
e131b78
Merge branch 'dev' into finna-4364-b
mshroom May 6, 2026
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 src/RecordManager/Finna/Record/Ead3.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,10 +457,10 @@ protected function addHierarchyTitles(array &$data, string $sequenceUnitId): voi
{
// Note: title_in_hierarchy is only needed if it differs from title.
if ($this->getDriverParam('addIdToHierarchyTitle', true)) {
$data['title_in_hierarchy'] = trim("$sequenceUnitId " . $data['title']);
$data['title_in_hierarchy'] = [trim("$sequenceUnitId " . $data['title'])];
foreach (['fi', 'sv', 'en', 'se'] as $language) {
if ('' !== ($langTitle = $data['title_' . $language . '_txt'] ?? '')) {
$data['title_in_hierarchy_' . $language . '_str'] = trim("$sequenceUnitId $langTitle");
$data['title_in_hierarchy_' . $language . '_str_mv'] = [trim("$sequenceUnitId " . $langTitle)];
}
}
}
Expand Down
10 changes: 6 additions & 4 deletions src/RecordManager/Finna/Record/Lido.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,8 @@ class Lido extends \RecordManager\Base\Record\Lido
*/
protected $hierarchyFieldsInAllFields = [
'is_hierarchy_title', 'hierarchy_parent_title', 'hierarchy_top_title', 'title_in_hierarchy',
'title_in_hierarchy_en_str_', 'title_in_hierarchy_fi_str', 'title_in_hierarchy_se_str',
'title_in_hierarchy_sv_str',
'title_in_hierarchy_en_str_mv', 'title_in_hierarchy_fi_str_mv', 'title_in_hierarchy_se_str_mv',
'title_in_hierarchy_sv_str_mv',
];

/**
Expand Down Expand Up @@ -2280,10 +2280,12 @@ protected function addHierarchyTitles(array &$data): void
{
// Note: title_in_hierarchy is only needed if it differs from title.
if ($this->getDriverParam('addIdToHierarchyTitle', true)) {
$data['title_in_hierarchy'] = trim($this->getIdentifier() . ' ' . $data['title']);
$data['title_in_hierarchy'] = [trim($this->getIdentifier() . ' ' . $data['title'])];
foreach (['fi', 'sv', 'en', 'se'] as $language) {
if ('' !== ($langTitle = $data['title_' . $language . '_txt'] ?? '')) {
$data['title_in_hierarchy_' . $language . '_str'] = trim($this->getIdentifier() . ' ' . $langTitle);
$data['title_in_hierarchy_' . $language . '_str_mv'] = [
trim($this->getIdentifier() . ' ' . $langTitle),
];
}
}
}
Expand Down
10 changes: 5 additions & 5 deletions tests/RecordManagerTest/Finna/Record/Ead3Test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,9 +569,9 @@ public static function sksProvider(): array
'addIdToHierarchyTitle=true' => [
'true',
[
'no_lang' => '1 1 Sundvall Gustaf Edvard S 1:a) 1',
'fi' => '1 1 Sundvall Gustaf Edvard S 1:a) 1',
'sv' => '1 1 Sundvall Gustaf Edvard S 1:a) 1 swe',
'no_lang' => ['1 1 Sundvall Gustaf Edvard S 1:a) 1'],
'fi' => ['1 1 Sundvall Gustaf Edvard S 1:a) 1'],
'sv' => ['1 1 Sundvall Gustaf Edvard S 1:a) 1 swe'],
],
],
'addIdToHierarchyTitle=false' => [
Expand Down Expand Up @@ -867,8 +867,8 @@ public function testSKS(string $addIdToHierarchyTitle, ?array $expectedTitleInHi
];
if (null !== $expectedTitleInHierarchy) {
$expected['title_in_hierarchy'] = $expectedTitleInHierarchy['no_lang'];
$expected['title_in_hierarchy_fi_str'] = $expectedTitleInHierarchy['fi'];
$expected['title_in_hierarchy_sv_str'] = $expectedTitleInHierarchy['sv'];
$expected['title_in_hierarchy_fi_str_mv'] = $expectedTitleInHierarchy['fi'];
$expected['title_in_hierarchy_sv_str_mv'] = $expectedTitleInHierarchy['sv'];
}

$this->assertEquals(
Expand Down
6 changes: 3 additions & 3 deletions tests/RecordManagerTest/Finna/Record/LidoTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -735,9 +735,9 @@ public function testLidoHierarchies()
$fields['hierarchy_parent_title']
);
$this->assertEquals('testi-000000418', $fields['hierarchy_sequence']);
$this->assertEquals('testi-418 Testi joka puuttui', $fields['title_in_hierarchy']);
$this->assertEquals('testi-418 Testi joka puuttui', $fields['title_in_hierarchy_fi_str']);
$this->assertEquals('testi-418 The test that was missing', $fields['title_in_hierarchy_en_str']);
$this->assertEquals(['testi-418 Testi joka puuttui'], $fields['title_in_hierarchy']);
$this->assertEquals(['testi-418 Testi joka puuttui'], $fields['title_in_hierarchy_fi_str_mv']);
$this->assertEquals(['testi-418 The test that was missing'], $fields['title_in_hierarchy_en_str_mv']);
$this->assertContains('Yksikkötestikokoelma; Kaikki testit kautta aikojen', $fields['allfields']);
$this->assertContains('Puuttuvien testien kokoelma', $fields['allfields']);
$this->assertContains('testi-418 Testi joka puuttui', $fields['allfields']);
Expand Down
Loading