diff --git a/conf/recordmanager.ini.sample.finna b/conf/recordmanager.ini.sample.finna index 1a5d8122..67fd089b 100644 --- a/conf/recordmanager.ini.sample.finna +++ b/conf/recordmanager.ini.sample.finna @@ -27,3 +27,8 @@ ; Example for allowing IIIF json files. ;allowed_media_types[] = application/ld+json;profile="http://iiif.io/api/presentation/3/context.json" +; The following section can be used to change the Solr fields used when indexing +; records, particularly for hierarchical records. Any field can also be set to empty +; to disable it. +;[Solr Fields] +;container_title_facet = diff --git a/src/RecordManager/Finna/Solr/SolrUpdater.php b/src/RecordManager/Finna/Solr/SolrUpdater.php index 14e6d984..5b026ce2 100644 --- a/src/RecordManager/Finna/Solr/SolrUpdater.php +++ b/src/RecordManager/Finna/Solr/SolrUpdater.php @@ -31,6 +31,7 @@ use RecordManager\Base\Record\AbstractRecord; +use function in_array; use function intval; use function is_callable; use function strlen; @@ -73,6 +74,19 @@ protected function augmentAndProcessFields( $data['catalog_date'] = $date; } } + if ( + $containerTitleFacetField = $this->config['Solr Fields']['container_title_facet'] + ?? 'container_title_str_mv' + ) { + // Use hierarchy_top_title for ead and ead3 formats instead of hierarchy_parent_title. + if (in_array($record['format'], ['ead', 'ead3'])) { + if (isset($data['hierarchy_top_title'])) { + $data[$containerTitleFacetField] = (array)$data['hierarchy_top_title']; + } + } elseif ($this->hierarchyParentTitleField && isset($data[$this->hierarchyParentTitleField])) { + $data[$containerTitleFacetField] = (array)$data[$this->hierarchyParentTitleField]; + } + } $this->addSeriesKeys($data, $metadataRecord); } diff --git a/tests/RecordManagerTest/Finna/Solr/SolrUpdaterTest.php b/tests/RecordManagerTest/Finna/Solr/SolrUpdaterTest.php index 37f6b4ef..889ea8a9 100644 --- a/tests/RecordManagerTest/Finna/Solr/SolrUpdaterTest.php +++ b/tests/RecordManagerTest/Finna/Solr/SolrUpdaterTest.php @@ -31,6 +31,8 @@ namespace RecordManagerTest\Finna\Solr; use ArrayIterator; +use Generator; +use PHPUnit\Framework\MockObject\MockObject; use RecordManager\Base\Database\DatabaseInterface; use RecordManager\Base\Database\MongoDatabase; use RecordManager\Base\Enrichment\PluginManager as EnrichmentPluginManager; @@ -42,7 +44,11 @@ use RecordManager\Base\Utils\Logger; use RecordManager\Base\Utils\MetadataUtils; use RecordManager\Base\Utils\WorkerPoolManager; +use RecordManager\Finna\Record\Ead; +use RecordManager\Finna\Record\Ead3; +use RecordManager\Finna\Record\Lido; use RecordManager\Finna\Record\Marc; +use RecordManager\Finna\Record\Qdc; use RecordManager\Finna\Solr\SolrUpdater; use RecordManager\Finna\Utils\FieldMapper; use RecordManagerTest\Base\Feature\FixtureTrait; @@ -95,6 +101,22 @@ class SolrUpdaterTest extends \PHPUnit\Framework\TestCase 'marc_format_sub.map,regexp', ], ], + 'tost' => [ + 'institution' => 'tost', + 'format' => 'ead', + ], + 'tyst' => [ + 'institution' => 'tyst', + 'format' => 'lido', + ], + 'tast' => [ + 'institution' => 'tast', + 'format' => 'qdc', + ], + 'cat_archive' => [ + 'institution' => 'cat_archive', + 'format' => 'ead3', + ], ]; /** @@ -121,7 +143,7 @@ function ($format, $data, $oaiID, $source, $extraData = []) use ($record) { return $cloneRecord; } ); - $fixture = $this->getFixture('record/marc4.xml', 'Finna'); + $fixture = $this->getFixture('SolrUpdaterTest/marc_host_record.xml', 'Finna'); $record->setData('test', 'oaitest', $fixture, []); $date = strtotime('2020-10-20 13:01:00'); $dbRecord = [ @@ -140,7 +162,6 @@ function ($format, $data, $oaiID, $source, $extraData = []) use ($record) { 'normalized_data' => null, 'host_record_id' => 'test.1', ]; - $params = [ 'host_record_id' => [ '$in' => array_values($dbRecord['linking_id']), @@ -151,7 +172,7 @@ function ($format, $data, $oaiID, $source, $extraData = []) use ($record) { ]; $records = new ArrayIterator([ [ - 'original_data' => $this->getFixture('record/marc5.xml', 'Finna'), + 'original_data' => $this->getFixture('SolrUpdaterTest/marc_component_part.xml', 'Finna'), 'normalized_data' => '', '_id' => 'part_1', 'source_id' => 'test', @@ -160,7 +181,7 @@ function ($format, $data, $oaiID, $source, $extraData = []) use ($record) { 'date' => '2025-01-01', ], [ - 'original_data' => $this->getFixture('record/marc6.xml', 'Finna'), + 'original_data' => $this->getFixture('SolrUpdaterTest/marc_component_part_2.xml', 'Finna'), '_id' => 'part_2', 'normalized_data' => '', 'source_id' => 'test', @@ -169,18 +190,13 @@ function ($format, $data, $oaiID, $source, $extraData = []) use ($record) { 'date' => '2025-01-01', ], ]); - $recordMap = [ - [$params, [], $records[0]], - ]; + $database = $this->getDatabase($records, $params); $dsOverride = [ 'test' => [ 'mergeMultiLevelParts' => true, 'componentParts' => 'merge_all', ], ]; - $database = $this->getMockBuilder(MongoDatabase::class)->disableOriginalConstructor()->getMock(); - $database->expects($this->any())->method('findRecord')->willReturnMap($recordMap); - $database->expects($this->any())->method('findRecords')->willReturn($records); $solrUpdater = $this->getSolrUpdater( dsConfigOverrides: $dsOverride, database: $database @@ -200,6 +216,10 @@ function ($format, $data, $oaiID, $source, $extraData = []) use ($record) { 'code' => 'a', 'data' => 'part_1', ], + [ + 'code' => 'e', + 'data' => 'Component part title 1', + ], [ 'code' => 'h', 'data' => 'fin', @@ -215,6 +235,10 @@ function ($format, $data, $oaiID, $source, $extraData = []) use ($record) { 'code' => 'a', 'data' => 'part_2', ], + [ + 'code' => 'e', + 'data' => 'Component part title 2', + ], [ 'code' => 'h', 'data' => 'fin', @@ -227,17 +251,592 @@ function ($format, $data, $oaiID, $source, $extraData = []) use ($record) { $this->assertEquals($expected, $fields); } + /** + * Test single record processing data provider + * + * @return Generator + */ + public static function getTestProcessSingleRecordData(): Generator + { + $date = strtotime('2020-10-20 13:01:00'); + yield 'Test single marc record with container title field' => [ + [ + '_id' => '123', + 'oai_id' => '', + 'linking_id' => [ + '010101', + ], + 'host_record_id' => 'test123', + 'source_id' => 'test', + 'deleted' => false, + 'created' => $date, + 'updated' => $date, + 'date' => $date, + 'format' => 'marc', + 'original_data' => 'SolrUpdaterTest/marc_component_part.xml', + 'normalized_data' => null, + ], + [ + 'record_format' => 'marc', + 'allfields' => [ + 'Component part title 1', + 'Test string', + 'Test parent string', + ], + 'format' => 'Book/Book', + 'illustrated' => 'Not Illustrated', + 'language' => [ + 'fin', + ], + 'publishDate' => [ + '2013', + ], + 'publishDateRange' => [ + '[2013-01-01 TO 2013-12-31]', + ], + 'publishDateSort' => '2013', + 'title_alt' => [ + 'Component part title 1', + ], + 'title_full' => 'Component part title 1', + 'title_short' => 'Component part title 1', + 'title_sort' => 'component part title 1', + 'title' => 'Component part title 1', + 'main_date_str' => '2013', + 'main_date' => '2013-01-01T00:00:00Z', + 'search_daterange_mv' => [ + '[2013-01-01 TO 2013-12-31]', + ], + 'publication_daterange' => '[2013-01-01 TO 2013-12-31]', + 'major_genre_str_mv' => 'nonfiction', + 'source_str_mv' => 'test', + 'datasource_str_mv' => [ + 'test', + ], + 'format_ext_str_mv' => 'Book/Book', + 'linking_id_str_mv' => [ + '010101', + ], + 'id' => '123', + 'institution' => 'test', + 'first_indexed' => '1970-01-01T00:00:00Z', + 'last_indexed' => '1970-01-01T00:00:00Z', + 'catalog_date' => '1970-01-01T00:00:00Z', + 'hierarchy_parent_id' => [ + 'test123', + ], + 'hierarchy_parent_title' => [ + 'Host record title 1', + ], + 'container_title' => 'Host record title 1', + 'container_title_str_mv' => [ + 'Host record title 1', + ], + ], + ]; + + yield 'Test single ead record with hierarchy_top_title' => [ + [ + '_id' => 'test456', + 'oai_id' => '', + 'linking_id' => [], + 'source_id' => 'tost', + 'deleted' => false, + 'created' => $date, + 'updated' => $date, + 'date' => $date, + 'format' => 'ead', + 'original_data' => 'SolrUpdaterTest/ead.xml', + 'normalized_data' => null, + ], + [ + 'record_format' => 'ead', + 'allfields' => [ + 'Ead record test title', + 'Test identifier', + '12-12-1999', + 'Test physical description', + 'Test physical location', + 'fin', + 'eng', + 'Kralloo Mipsten', + 'Snerpaloosi Instiploop', + 'In web', + 'Test scope content', + 'test/interview', + 'Saksa', + '11.11111, 22.22222', + 'Somewhere', + 'Something', + 'Person interview', + 'CC BY 4.0', + 'Hierarchy top title', + 'Hierarchy parent title', + ], + 'author2' => [ + 'Kralloo Mipsten', + ], + 'description' => 'Test scope content', + 'format' => 'test/interview', + 'institution' => 'Snerpaloosi Instiploop', + 'language' => ['fin', 'eng'], + 'physical' => ['Test physical description'], + 'title_full' => 'Test identifier Ead record test title (1999)', + 'title_short' => 'Ead record test title (1999)', + 'title_sort' => 'ead record test title (1999)', + 'title_sub' => 'Test identifier', + 'title' => 'Test identifier Ead record test title (1999)', + 'topic_facet' => [ + 'Something', + 'Person interview', + ], + 'topic' => [ + 'Something', + 'Person interview', + ], + 'location_geo' => 'POINT(22.22222 11.11111)', + 'center_coords' => '22.22222 11.11111', + 'geographic_facet' => [ + 'Saksa', + 'Somewhere', + ], + 'geographic' => [ + 'Saksa', + 'Somewhere', + ], + 'hierarchytype' => 'Default', + 'hierarchy_top_id' => 'tost.271', + 'hierarchy_top_title' => 'Hierarchy top title', + 'hierarchy_sequence' => '0000020', + 'hierarchy_parent_id' => 'tost.272', + 'hierarchy_parent_title' => 'Hierarchy parent title', + 'title_in_hierarchy' => [ + 'Test identifier Test identifier Ead record test title', + ], + 'container_title_str_mv' => ['Hierarchy top title'], + 'unit_daterange' => '1999-12-12', + 'search_daterange_mv' => '1999-12-12', + 'main_date_str' => '1999', + 'main_date' => '1999-12-12T00:00:00Z', + 'hierarchy_sequence_str' => '0000020', + 'source_str_mv' => 'Snerpaloosi Instiploop', + 'datasource_str_mv' => 'tost', + 'online_boolean' => '1', + 'online_str_mv' => 'Snerpaloosi Instiploop', + 'free_online_boolean' => '1', + 'free_online_str_mv' => 'Snerpaloosi Instiploop', + 'identifier' => 'Test identifier', + 'material' => "\n \n ", + 'usage_rights_str_mv' => ['CC BY 4.0'], + 'usage_rights_ext_str_mv' => ['CC BY 4.0'], + 'author_facet' => ['Kralloo Mipsten'], + 'format_ext_str_mv' => ['test/interview'], + 'media_type_str_mv' => ['audio/mpeg'], + 'id' => 'test456', + 'first_indexed' => '1970-01-01T00:00:00Z', + 'last_indexed' => '1970-01-01T00:00:00Z', + 'catalog_date' => '1970-01-01T00:00:00Z', + 'series' => 'Hierarchy parent title', + ], + ]; + + yield 'Test single lido record with hierarchy_parent_title' => [ + [ + '_id' => 'test223', + 'oai_id' => '', + 'linking_id' => [], + 'source_id' => 'tyst', + 'deleted' => false, + 'created' => $date, + 'updated' => $date, + 'date' => $date, + 'format' => 'lido', + 'original_data' => 'SolrUpdaterTest/lido.xml', + 'normalized_data' => null, + ], + [ + 'record_format' => 'lido', + 'allfields' => [ + '12345', + 'Maalaus', + 'Maisema', + 'Joku kokoelma', + ], + 'collection' => 'Joku kokoelma', + 'format' => 'Maalaus', + 'title_full' => 'Maisema', + 'title_short' => 'Maisema', + 'title_sort' => 'maisema', + 'title' => 'Maisema', + 'hierarchy_parent_title' => [ + 'Joku kokoelma', + ], + 'source_str_mv' => 'tyst', + 'datasource_str_mv' => 'tyst', + 'format_ext_str_mv' => [ + 'Maalaus', + ], + 'id' => 'test223', + 'first_indexed' => '1970-01-01T00:00:00Z', + 'last_indexed' => '1970-01-01T00:00:00Z', + 'catalog_date' => '1970-01-01T00:00:00Z', + 'container_title_str_mv' => [ + 'Joku kokoelma', + ], + 'title_en_txt' => 'Maalaus', + ], + ]; + + yield 'Test single qdc record with hierarchy_parent_title' => [ + [ + '_id' => 'test223', + 'oai_id' => '', + 'linking_id' => [], + 'source_id' => 'tast', + 'deleted' => false, + 'created' => $date, + 'updated' => $date, + 'date' => $date, + 'format' => 'qdc', + 'original_data' => 'SolrUpdaterTest/qdc.xml', + 'normalized_data' => null, + ], + [ + 'record_format' => 'qdc', + 'allfields' => [ + 'Test qdc record', + 'Ukko, testi', + 'teest', + 'test', + '2021-06-16T06:31:44Z', + '2021', + 'Article', + 'okm_type', + 'okm_type_2', + 'other_type', + 'Citation', + '111111', + 'en', + 'Part of this', + 'Hierarchy parent title', + 'CC BY-NC-ND 4.0', + 'Publisher name, here', + 'http://dx.doi.org/https://doi.org/10.34416/svc.00029', + '10138_331330', + ], + 'author' => [ + 'Ukko, testi', + ], + 'author_sort' => 'Ukko, testi', + 'ctrlnum' => [ + '10138_331330', + ], + 'format' => 'Article', + 'issn' => [ + '111111', + ], + 'language' => [ + 'en', + ], + 'publishDate' => [ + '2021', + ], + 'publishDateRange' => [ + '[2021-01-01 TO 2021-12-31]', + ], + 'publishDateSort' => '2021', + 'publisher' => [ + 'Publisher name, here', + ], + 'series' => [ + 'Part of this', + ], + 'title_full' => 'Test qdc record', + 'title_short' => 'Test qdc record', + 'title_sort' => 'test qdc record', + 'title' => 'Test qdc record', + 'topic_facet' => [ + 'teest', + 'test', + ], + 'topic' => [ + 'teest', + 'test', + ], + 'url' => [ + 'http://dx.doi.org/https://doi.org/10.34416/svc.00029', + ], + 'main_date_str' => '2021', + 'main_date' => '2021-01-01T00:00:00Z', + 'publication_daterange' => '[2021-01-01 TO 2021-12-31]', + 'search_daterange_mv' => [ + '[2021-01-01 TO 2021-12-31]', + ], + 'usage_rights_str_mv' => [ + 'CC BY-NC-ND 4.0', + ], + 'usage_rights_ext_str_mv' => [ + 'CC BY-NC-ND 4.0', + ], + 'source_str_mv' => 'tast', + 'datasource_str_mv' => 'tast', + 'author_facet' => [ + 'Ukko, testi', + ], + 'format_ext_str_mv' => 'Article', + 'id' => 'test223', + 'work_keys_str_mv' => [ + 'AT ukkotesti testqdc', + ], + 'institution' => 'tast', + 'first_indexed' => '1970-01-01T00:00:00Z', + 'last_indexed' => '1970-01-01T00:00:00Z', + 'catalog_date' => '1970-01-01T00:00:00Z', + 'hierarchy_parent_title' => [ + 'Hierarchy parent title', + ], + 'container_title_str_mv' => [ + 'Hierarchy parent title', + ], + 'title_fi_txt' => 'Test qdc record', + ], + ]; + + $expectedEad3Results = [ + 'record_format' => 'ead3', + 'allfields' => [ + 'Test did note', + 'Test swe name', + 'Test eng name', + 'Test fin name', + 'Test id', + 'purr-238', + 'Test analogic id', + 'Test old id', + '1880-XX-XX/1880-XX-XX', + 'Test main title', + 'Reinmrr, Agaprr', + 'Suomi', + 'Image of test', + 'Tietosisältö', + 'Testi kuvaus', + 'Käyttöehdot', + 'CC BY-NC-ND 4.0 (miau-miau)', + 'Asiasanat ja luokat', + 'Testi 1', + 'Test 1', + 'Testi 2', + 'Test 2', + 'Etelä-Karjala-mrr', + 'Test hierarchy top title', + '173852008554500', + ], + 'author' => [ + 'Reinmrr, Agaprr', + ], + 'author_sort' => 'Reinmrr, Agaprr', + 'description' => 'Testi kuvaus', + 'format' => 'Testi 1/Testi 2', + 'geographic_facet' => [ + 'Etelä-Karjala-mrr', + ], + 'geographic' => [ + 'Etelä-Karjala-mrr', + ], + 'institution' => 'SKS KRA', + 'language' => [ + 'fin', + ], + 'series' => 'Test hierarchy parent title', + 'thumbnail' => 'https://example.com/frobnar/thumb', + 'title_full' => 'Test id Test main title‎ (1880)', + 'title_short' => 'Test main title‎ (1880)', + 'title_sort' => 'test id test main title‎ (1880)', + 'title_sub' => 'Test id', + 'title' => 'Test id Test main title‎ (1880)', + 'hierarchytype' => 'Default', + 'hierarchy_top_id' => 'cat_archive.173852005642800', + 'hierarchy_top_title' => 'Test hierarchy top title', + 'hierarchy_sequence' => '0000464', + 'hierarchy_parent_id' => 'cat_archive.173852005642800_173852006211600', + 'hierarchy_parent_title' => 'Test hierarchy parent title', + 'title_in_hierarchy' => [ + 'Test id Test id Test main title', + ], + 'container_title_str_mv' => [ + 'Test hierarchy top title', + ], + 'unit_daterange' => '[1880-01-01 TO 1880-12-31]', + 'search_daterange_mv' => [ + '[1880-01-01 TO 1880-12-31]', + ], + 'era_facet' => '1880', + 'main_date_str' => '1880', + 'main_date' => '1880-01-01T00:00:00Z', + 'hierarchy_sequence_str' => '0000464', + 'source_str_mv' => 'SKS KRA', + 'datasource_str_mv' => 'cat_archive', + 'online_boolean' => '1', + 'online_str_mv' => 'SKS KRA', + 'free_online_boolean' => '1', + 'free_online_str_mv' => 'SKS KRA', + 'identifier' => '173852008554500', + 'media_type_str_mv' => [ + 'image/jpeg', + ], + 'usage_rights_str_mv' => [ + 'https://creativecommons.org/licenses/by-nc-nd/4.0/deed.fi', + ], + 'usage_rights_ext_str_mv' => [ + 'https://creativecommons.org/licenses/by-nc-nd/4.0/deed.fi', + ], + 'author_facet' => [ + 'Reinmrr, Agaprr', + ], + 'author2_id_str_mv' => [ + 'EAC_228481117', + ], + 'author2_id_role_str_mv' => [ + 'EAC_228481117###Arkistonmuodostaja', + 'EAC_228481117###Kuvataiteilija', + ], + 'format_ext_str_mv' => 'Testi 1/Testi 2', + 'geographic_id_str_mv' => [ + 'http://www.yso.fi/onto/yso/p94106', + ], + 'file_identifier_str_mv' => [ + 'mrr_full.tif', + 'mrr_thumb.tif', + ], + 'id' => 'ttt111', + 'work_keys_str_mv' => [ + 'AT reinmrragaprr tes', + ], + 'first_indexed' => '1970-01-01T00:00:00Z', + 'last_indexed' => '1970-01-01T00:00:00Z', + 'catalog_date' => '1970-01-01T00:00:00Z', + ]; + + yield 'Test single ead3 record with hierarchy top title' => [ + [ + '_id' => 'ttt111', + 'oai_id' => '', + 'linking_id' => [], + 'source_id' => 'cat_archive', + 'deleted' => false, + 'created' => $date, + 'updated' => $date, + 'date' => $date, + 'format' => 'ead3', + 'original_data' => 'SolrUpdaterTest/ead3.xml', + 'normalized_data' => null, + ], + $expectedEad3Results, + ]; + unset($expectedEad3Results['container_title_str_mv']); + yield 'Test single ead3 record with setting container_title_facet setting to an empty value' => [ + [ + '_id' => 'ttt111', + 'oai_id' => '', + 'linking_id' => [], + 'source_id' => 'cat_archive', + 'deleted' => false, + 'created' => $date, + 'updated' => $date, + 'date' => $date, + 'format' => 'ead3', + 'original_data' => 'SolrUpdaterTest/ead3.xml', + 'normalized_data' => null, + ], + $expectedEad3Results, + [ + 'Solr Fields' => [ + 'container_title_facet' => '', + ], + ], + ]; + } + + /** + * Test single record processing + * + * @param array $dbRecord Array presenting a record from database to be processed. + * @param array $expected Array for expected test results + * @param array $config Main config + * + * @return void + */ + #[\PHPUnit\Framework\Attributes\DataProvider('getTestProcessSingleRecordData')] + public function testProcessSingleRecord(array $dbRecord, array $expected, array $config = []): void + { + $dbRecord['original_data'] = $this->getFixture($dbRecord['original_data'], 'Finna'); + $config = array_merge_recursive($this->config, $config); + $database = $this->getDatabase(); + $solrUpdater = $this->getSolrUpdater(database: $database, config: $config); + $result = $solrUpdater->processSingleRecord($dbRecord); + $testRecord = $result['records'][0]; + // Leave out testing full record but confirm that it exists. + $this->assertTrue(!empty($testRecord['fullrecord'])); + unset($testRecord['fullrecord']); + $this->assertEquals($expected, $testRecord); + } + + /** + * Get database for storing test records found from database. + * + * @param ?ArrayIterator, array> $dbRecords Records found in the database + * @param ?array $params Params to use for searching records from database + * + * @return MockObject + */ + protected function getDatabase( + ?ArrayIterator $dbRecords = null, + ?array $params = null + ): MockObject&DatabaseInterface { + $dbRecords ??= new ArrayIterator([ + [ + 'original_data' => $this->getFixture('SolrUpdaterTest/marc_host_record.xml', 'Finna'), + 'normalized_data' => '', + '_id' => 'test123', + 'source_id' => 'test', + 'oai_id' => 'testoai1', + 'format' => 'marc', + 'date' => '2025-01-01', + ], + ]); + + $params ??= [ + 'host_record_id' => [ + '$in' => ['test12345'], + ], + 'deleted' => false, + 'suppressed' => ['$in' => [null, false]], + 'source_id' => 'test', + ]; + $recordMap = [ + [$params, [], $dbRecords[0]], + ]; + $database = $this->getMockBuilder(MongoDatabase::class)->disableOriginalConstructor()->getMock(); + $database->expects($this->any())->method('findRecord')->willReturnMap($recordMap); + $database->expects($this->any())->method('findRecords')->willReturn($dbRecords); + return $database; + } + /** * Create SolrUpdater * - * @param array $dsConfigOverrides Data source config overrides - * @param ?DatabaseInterface $database Database mock object + * @param array $dsConfigOverrides Data source config overrides + * @param array $dbRecord Database record + * @param MockObject|DatabaseInterface|null $database Database mock object + * @param array $config Main config * * @return SolrUpdater */ protected function getSolrUpdater( array $dsConfigOverrides = [], - ?DatabaseInterface $database = null + array $dbRecord = [], + MockObject|DatabaseInterface|null $database = null, + array $config = [] ): SolrUpdater { $dsConfig = array_merge_recursive( $this->dataSourceConfig, @@ -256,7 +855,7 @@ protected function getSolrUpdater( $metaDataUtils = $this->getMockBuilder(MetadataUtils::class)->onlyMethods([]) ->disableOriginalConstructor()->getMock(); - $record = $this->getMockBuilder(Marc::class)->onlyMethods(['createRecord'])->setConstructorArgs([ + $marcRecord = $this->getMockBuilder(Marc::class)->onlyMethods(['createRecord'])->setConstructorArgs([ [], [], $this->createMock(Logger::class), @@ -265,25 +864,87 @@ protected function getSolrUpdater( $this->createMock(FormatCalculator::class), $recordPluginManager, ])->getMock(); - - $record->expects($this->any())->method('createRecord')->willReturnCallback( - function ($format, $data, $oaiID, $source, $extraData = []) use ($record) { - $cloneRecord = clone $record; - $cloneRecord->setData($source, $oaiID, $data, $extraData); - return $cloneRecord; + $marcRecord->expects($this->any())->method('createRecord')->willReturnCallback( + function ($format, $data, $oaiID, $source, $extraData = []) use ($marcRecord) { + $cloned = clone $marcRecord; + $cloned->setData($source, $oaiID, $data, $extraData); + return $cloned; } ); + $eadRecord = $this->getMockBuilder(Ead::class)->onlyMethods([])->setConstructorArgs([ + [], + [], + $this->createMock(Logger::class), + $metaDataUtils, + fn ($metadata) => new MarcMarc($metadata), + $this->createMock(FormatCalculator::class), + $recordPluginManager, + ])->getMock(); + $lidoRecord = $this->getMockBuilder(Lido::class)->onlyMethods([])->setConstructorArgs([ + [], + [], + $this->createMock(Logger::class), + $metaDataUtils, + fn ($metadata) => new MarcMarc($metadata), + $this->createMock(FormatCalculator::class), + $recordPluginManager, + ])->getMock(); + + $qdcRecord = $this->getMockBuilder(Qdc::class)->onlyMethods([])->setConstructorArgs([ + [], + [], + $this->createMock(Logger::class), + $metaDataUtils, + $this->createMock(HttpService::class), + $database, + ])->getMock(); + + $ead3Record = $this->getMockBuilder(Ead3::class)->onlyMethods([])->setConstructorArgs([ + [], + [], + $this->createMock(Logger::class), + $metaDataUtils, + $this->createMock(HttpService::class), + $database, + ])->getMock(); + + $recordMap = [ + [ + 'marc', + null, + clone $marcRecord, + ], + [ + 'ead', + null, + clone $eadRecord, + ], + [ + 'lido', + null, + clone $lidoRecord, + ], + [ + 'qdc', + null, + clone $qdcRecord, + ], + [ + 'ead3', + null, + clone $ead3Record, + ], + ]; + + $recordPluginManager->expects($this->any())->method('get')->willReturnMap($recordMap); - $recordPluginManager->expects($this->any())->method('get')->willReturnCallback(function () use ($record) { - return clone $record; - }); $fieldMapper = new FieldMapper( $this->getFixtureDir('Finna') . 'config/basic', [], $this->dataSourceConfig ); $solrUpdater = new SolrUpdater( - $this->config, + $config, $dsConfig, $database, $logger, diff --git a/tests/fixtures/Finna/SolrUpdaterTest/ead.xml b/tests/fixtures/Finna/SolrUpdaterTest/ead.xml new file mode 100644 index 00000000..6bdbc70d --- /dev/null +++ b/tests/fixtures/Finna/SolrUpdaterTest/ead.xml @@ -0,0 +1,55 @@ + + + + Ead record test title + Test identifier + 12-12-1999 + + Test physical description + + Test physical location + + fin + eng + + + Kralloo Mipsten + + + Snerpaloosi Instiploop + + + +

In web

+ + + + + +

Test scope content

+ + + + test/interview + + + Saksa + + + + 11.11111, 22.22222 + Somewhere + + + + Something + Person interview + + +

CC BY 4.0

+ + + + + + diff --git a/tests/fixtures/Finna/SolrUpdaterTest/ead3.xml b/tests/fixtures/Finna/SolrUpdaterTest/ead3.xml new file mode 100644 index 00000000..ef2ed543 --- /dev/null +++ b/tests/fixtures/Finna/SolrUpdaterTest/ead3.xml @@ -0,0 +1,70 @@ + + + + Test did note + + + Test swe name + Test eng name + Test fin name + + + Test id + purr-238 + Test analogic id + Test old id + 1880-XX-XX/1880-XX-XX + Test main title + + + Reinmrr, Agaprr + + + + Suomi + + + + + +

Image of test

+ + + + + Tietosisältö +

Testi kuvaus

+ + + Käyttöehdot +

+ CC BY-NC-ND 4.0 (miau-miau) +

+ + + + Reinmrr, Agaprr + + + + Asiasanat ja luokat + + Testi 1 + Test 1 + Test 1 + + + Testi 2 + Test 2 + Test 2 + + + Etelä-Karjala-mrr + + + + + + + + diff --git a/tests/fixtures/Finna/SolrUpdaterTest/lido.xml b/tests/fixtures/Finna/SolrUpdaterTest/lido.xml new file mode 100644 index 00000000..35532774 --- /dev/null +++ b/tests/fixtures/Finna/SolrUpdaterTest/lido.xml @@ -0,0 +1,41 @@ + + + + 12345 + + + + + Maalaus + + + + + + + + Joku kokoelma + + + + Kokoelma + + + + + + + + + Maalaus + + + + + Maisema + + + + + + diff --git a/tests/fixtures/Finna/SolrUpdaterTest/marc_component_part.xml b/tests/fixtures/Finna/SolrUpdaterTest/marc_component_part.xml new file mode 100644 index 00000000..29c04396 --- /dev/null +++ b/tests/fixtures/Finna/SolrUpdaterTest/marc_component_part.xml @@ -0,0 +1,20 @@ + + + 01195cam a22004094i 4500 + + FI-MELINDA + 20160322194428.0 + 140327s2013 fi 000 0 fin d + + Component part title 1 + + + Test string + 961827 + Test parent string + + + 010101 + + + diff --git a/tests/fixtures/Finna/SolrUpdaterTest/marc_component_part_2.xml b/tests/fixtures/Finna/SolrUpdaterTest/marc_component_part_2.xml new file mode 100644 index 00000000..0d6c458f --- /dev/null +++ b/tests/fixtures/Finna/SolrUpdaterTest/marc_component_part_2.xml @@ -0,0 +1,20 @@ + + + 01195cac a22004094i 4500 + 123 + FI-MELINDA + 20160322194428.0 + 140327s2013 fi 000 0 fin d + + Component part title 2 + + + Test string + 961827 + Test parent string + + + 010101 + + + diff --git a/tests/fixtures/Finna/SolrUpdaterTest/marc_host_record.xml b/tests/fixtures/Finna/SolrUpdaterTest/marc_host_record.xml new file mode 100644 index 00000000..8b5c3493 --- /dev/null +++ b/tests/fixtures/Finna/SolrUpdaterTest/marc_host_record.xml @@ -0,0 +1,12 @@ + + + 01195cam a22004094i 4500 + 123 + FI-MELINDA + 20160322194428.0 + 140327s2013 fi 000 0 fin d + + Host record title 1 + + + diff --git a/tests/fixtures/Finna/SolrUpdaterTest/qdc.xml b/tests/fixtures/Finna/SolrUpdaterTest/qdc.xml new file mode 100644 index 00000000..dc152490 --- /dev/null +++ b/tests/fixtures/Finna/SolrUpdaterTest/qdc.xml @@ -0,0 +1,22 @@ + + + Test qdc record + Ukko, testi + teest + test + 2021-06-16T06:31:44Z + 2021 + Article + okm_type + okm_type_2 + other_type + Citation + 111111 + en + Part of this + Hierarchy parent title + CC BY-NC-ND 4.0 + Publisher name, here + http://dx.doi.org/https://doi.org/10.34416/svc.00029 + 10138_331330 +