Merge pull request #10912 from GaziYucel/i10905

#10905 do not migrate null author affiliation
pkp · Feb 9, 2025 · fe8d119 · fe8d119
2 parents e67286a + 73615a8
commit fe8d119
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/classes/migration/upgrade/v3_5_0/I7135_CreateNewRorRegistryCacheTables.php b/classes/migration/upgrade/v3_5_0/I7135_CreateNewRorRegistryCacheTables.php
@@ -87,7 +87,8 @@ function (JoinClause $join) {
                     $join
                         ->on('rs.setting_value', '=', 'as.setting_value')
                         ->where('as.setting_name', '=', 'affiliation')
-                        ->where('rs.setting_name', '=', 'name');
+                        ->where('rs.setting_name', '=', 'name')
+                        ->whereNotNull('as.setting_value');
                 }
             )
             ->join('rors as r', 'r.ror_id', '=', 'rs.ror_id')

diff --git a/schemas/ror.json b/schemas/ror.json
@@ -34,7 +34,7 @@
 			"description": "The display language on ror.org of this institution.",
 			"apiSummary": true,
 			"validation": [
-				"regex:/^([A-Za-z]{2,4})(?<sc>[_-]([A-Za-z]{4,5}|[0-9]{4}))?([_-]([A-Za-z]{2}|[0-9]{3}))?(@[a-z]{2,30}(?&sc)?)?$/"
+				"regex:/^((([A-Za-z]{2,4})(?<sc>[_-]([A-Za-z]{4,5}|[0-9]{4}))?([_-]([A-Za-z]{2}|[0-9]{3}))?(@[a-z]{2,30}(?&sc)?)?)|(no_lang_code))$/"
 			]
 		},
 		"isActive": {