[import] Match author role separated by dash

SlovakNationalGallery · Dec 13, 2024 · a255080 · a255080
1 parent d3615db
commit a255080
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/app/Matchers/AuthorityMatcher.php b/app/Matchers/AuthorityMatcher.php
@@ -97,14 +97,14 @@ protected function findByFullname($fullname)
 
     public static function parse($author)
     {
-        if (!preg_match('/^((?<surname>.*?)\s*(?<alt_surname>\(.*\))?(?<role>\s+-\s+.*)?,\s+)?(?<name>.*?)\s*(?<alt_name>\(.*\)|\/.*)?$/', $author, $matches)) {
+        if (!preg_match('/^((?<surname>.*?)\s*(?<alt_surname>\(.*\))?(?<role>\s+[-–]\s+.*)?,\s+)?(?<name>.*?)\s*(?<alt_name>\(.*\)|\/.*)?$/', $author, $matches)) {
             return null;
         }
 
         return [
             'surname' => $matches['surname'] ?: null,
             'alt_surname' => trim($matches['alt_surname'], '()') ?: null,
-            'role' => ltrim($matches['role'], ' -') ?: null,
+            'role' => ltrim($matches['role'], ' -–') ?: null,
             'name' => $matches['name'] ?: null,
             'alt_name' => trim($matches['alt_name'] ?? '', '()/') ?: null,
         ];

diff --git a/tests/Matchers/AuthorityMatcherTest.php b/tests/Matchers/AuthorityMatcherTest.php
@@ -7,10 +7,11 @@
 use App\Matchers\AuthorityMatcher;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Tests\TestCase;
+use Tests\WithoutSearchIndexing;
 
 class AuthorityMatcherTest extends TestCase
 {
-    use RefreshDatabase;
+    use RefreshDatabase, WithoutSearchIndexing;
 
     public function testMatchAll()
     {