From 369d48423e4296295db6ed1bbe921e30414a02cf Mon Sep 17 00:00:00 2001 From: Jennifer Melot Date: Tue, 23 May 2023 09:59:33 -0400 Subject: [PATCH 1/2] Update ror schema Closes #1 --- schemas/ror.json | 661 ++++++++++++++++++++++++++++++----------------- 1 file changed, 419 insertions(+), 242 deletions(-) diff --git a/schemas/ror.json b/schemas/ror.json index cd58bf4..24a66b3 100644 --- a/schemas/ror.json +++ b/schemas/ror.json @@ -1,270 +1,447 @@ [ - { - "mode": "NULLABLE", - "name": "id", - "type": "STRING" - }, - { - "mode": "REPEATED", - "name": "links", - "type": "STRING" - }, - { - "mode": "REPEATED", - "name": "acronyms", - "type": "STRING" - }, - { - "mode": "REPEATED", - "name": "types", - "type": "STRING" - }, - { - "mode": "NULLABLE", - "name": "name", - "type": "STRING" - }, - { - "fields": [ - { + { "mode": "NULLABLE", - "name": "iso639", + "name": "name", "type": "STRING" - }, - { - "mode": "NULLABLE", - "name": "label", + }, + { + "mode": "REPEATED", + "name": "aliases", "type": "STRING" - } - ], - "mode": "REPEATED", - "name": "labels", - "type": "RECORD" - }, - { - "mode": "NULLABLE", - "name": "wikipedia_url", - "type": "STRING" - }, - { - "mode": "REPEATED", - "name": "aliases", - "type": "STRING" - }, - { - "mode": "NULLABLE", - "name": "status", - "type": "STRING" - }, - { - "fields": [ - { + }, + { "mode": "NULLABLE", - "name": "country_name", + "name": "wikipedia_url", "type": "STRING" - }, - { - "mode": "NULLABLE", - "name": "country_code", + }, + { + "mode": "REPEATED", + "name": "links", "type": "STRING" - } - ], - "mode": "NULLABLE", - "name": "country", - "type": "RECORD" - }, - { - "fields": [ - { - "fields": [ - { - "mode": "REPEATED", - "name": "all", - "type": "STRING" - }, - { - "mode": "NULLABLE", - "name": "preferred", - "type": "STRING" - } - ], - "mode": "NULLABLE", - "name": "HESA", - "type": "RECORD" - }, - { - "fields": [ - { - "mode": "REPEATED", - "name": "all", - "type": "STRING" - }, - { - "mode": "NULLABLE", - "name": "preferred", - "type": "STRING" - } - ], - "mode": "NULLABLE", - "name": "UKPRN", - "type": "RECORD" - }, - { - "fields": [ - { - "mode": "REPEATED", - "name": "all", - "type": "STRING" - }, - { - "mode": "NULLABLE", - "name": "preferred", - "type": "STRING" - } - ], + }, + { + "mode": "REPEATED", + "name": "types", + "type": "STRING" + }, + { "mode": "NULLABLE", - "name": "ISNI", - "type": "RECORD" - }, - { - "fields": [ - { - "mode": "REPEATED", - "name": "all", - "type": "STRING" - }, - { - "mode": "NULLABLE", - "name": "preferred", - "type": "STRING" - } - ], + "name": "email_address", + "type": "STRING" + }, + { + "mode": "REPEATED", + "name": "acronyms", + "type": "STRING" + }, + { "mode": "NULLABLE", - "name": "CNRS", - "type": "RECORD" - }, - { - "fields": [ - { - "mode": "REPEATED", - "name": "all", - "type": "STRING" - }, - { - "mode": "NULLABLE", - "name": "preferred", - "type": "INTEGER" - } - ], + "name": "id", + "type": "STRING" + }, + { "mode": "NULLABLE", - "name": "OrgRef", - "type": "RECORD" - }, - { + "name": "status", + "type": "STRING" + }, + { "fields": [ - { - "mode": "NULLABLE", - "name": "all", - "type": "STRING" - }, - { - "mode": "NULLABLE", - "name": "preferred", - "type": "STRING" - } + { + "mode": "NULLABLE", + "name": "iso639", + "type": "STRING" + }, + { + "mode": "NULLABLE", + "name": "label", + "type": "STRING" + } ], - "mode": "NULLABLE", - "name": "GRID", + "mode": "REPEATED", + "name": "labels", "type": "RECORD" - }, - { - "fields": [ - { - "mode": "REPEATED", - "name": "all", - "type": "STRING" - }, - { - "mode": "NULLABLE", - "name": "preferred", - "type": "STRING" - } - ], + }, + { + "mode": "REPEATED", + "name": "ip_addresses", + "type": "STRING" + }, + { "mode": "NULLABLE", - "name": "UCAS", - "type": "RECORD" - }, - { + "name": "established", + "type": "INTEGER" + }, + { "fields": [ - { - "mode": "REPEATED", - "name": "all", - "type": "STRING" - }, - { - "mode": "NULLABLE", - "name": "preferred", - "type": "STRING" - } + { + "mode": "NULLABLE", + "name": "country_name", + "type": "STRING" + }, + { + "mode": "NULLABLE", + "name": "country_code", + "type": "STRING" + } ], "mode": "NULLABLE", - "name": "Wikidata", + "name": "country", "type": "RECORD" - }, - { + }, + { "fields": [ - { - "mode": "REPEATED", - "name": "all", - "type": "STRING" - }, - { - "mode": "NULLABLE", - "name": "preferred", - "type": "INTEGER" - } + { + "mode": "NULLABLE", + "name": "id", + "type": "STRING" + }, + { + "mode": "NULLABLE", + "name": "label", + "type": "STRING" + }, + { + "mode": "NULLABLE", + "name": "type", + "type": "STRING" + } ], - "mode": "NULLABLE", - "name": "FundRef", + "mode": "REPEATED", + "name": "relationships", "type": "RECORD" - }, - { + }, + { "fields": [ - { - "mode": "REPEATED", - "name": "all", - "type": "STRING" - }, - { - "mode": "NULLABLE", - "name": "preferred", - "type": "INTEGER" - } + { + "fields": [ + { + "fields": [ + { + "mode": "NULLABLE", + "name": "license", + "type": "STRING" + }, + { + "mode": "NULLABLE", + "name": "attribution", + "type": "STRING" + } + ], + "mode": "NULLABLE", + "name": "license", + "type": "RECORD" + }, + { + "fields": [ + { + "mode": "NULLABLE", + "name": "code", + "type": "STRING" + }, + { + "mode": "NULLABLE", + "name": "ascii_name", + "type": "STRING" + }, + { + "mode": "NULLABLE", + "name": "name", + "type": "STRING" + }, + { + "mode": "NULLABLE", + "name": "id", + "type": "INTEGER" + } + ], + "mode": "NULLABLE", + "name": "geonames_admin2", + "type": "RECORD" + }, + { + "fields": [ + { + "mode": "NULLABLE", + "name": "code", + "type": "STRING" + }, + { + "mode": "NULLABLE", + "name": "ascii_name", + "type": "STRING" + }, + { + "mode": "NULLABLE", + "name": "name", + "type": "STRING" + }, + { + "mode": "NULLABLE", + "name": "id", + "type": "INTEGER" + } + ], + "mode": "NULLABLE", + "name": "geonames_admin1", + "type": "RECORD" + }, + { + "fields": [ + { + "mode": "NULLABLE", + "name": "name", + "type": "STRING" + }, + { + "mode": "NULLABLE", + "name": "code", + "type": "STRING" + } + ], + "mode": "NULLABLE", + "name": "nuts_level3", + "type": "RECORD" + }, + { + "fields": [ + { + "mode": "NULLABLE", + "name": "name", + "type": "STRING" + }, + { + "mode": "NULLABLE", + "name": "code", + "type": "STRING" + } + ], + "mode": "NULLABLE", + "name": "nuts_level2", + "type": "RECORD" + }, + { + "fields": [ + { + "mode": "NULLABLE", + "name": "name", + "type": "STRING" + }, + { + "mode": "NULLABLE", + "name": "code", + "type": "STRING" + } + ], + "mode": "NULLABLE", + "name": "nuts_level1", + "type": "RECORD" + }, + { + "mode": "NULLABLE", + "name": "city", + "type": "STRING" + }, + { + "mode": "NULLABLE", + "name": "id", + "type": "INTEGER" + } + ], + "mode": "NULLABLE", + "name": "geonames_city", + "type": "RECORD" + }, + { + "mode": "NULLABLE", + "name": "country_geonames_id", + "type": "INTEGER" + }, + { + "mode": "NULLABLE", + "name": "state_code", + "type": "STRING" + }, + { + "mode": "NULLABLE", + "name": "city", + "type": "STRING" + }, + { + "mode": "NULLABLE", + "name": "primary", + "type": "BOOLEAN" + }, + { + "mode": "NULLABLE", + "name": "state", + "type": "STRING" + }, + { + "mode": "NULLABLE", + "name": "line", + "type": "STRING" + }, + { + "mode": "NULLABLE", + "name": "lng", + "type": "FLOAT" + }, + { + "mode": "NULLABLE", + "name": "postcode", + "type": "INTEGER" + }, + { + "mode": "NULLABLE", + "name": "lat", + "type": "FLOAT" + } ], - "mode": "NULLABLE", - "name": "LinkedIn", + "mode": "REPEATED", + "name": "addresses", "type": "RECORD" - }, - { + }, + { "fields": [ - { - "mode": "REPEATED", - "name": "all", - "type": "STRING" - }, - { - "mode": "NULLABLE", - "name": "preferred", - "type": "INTEGER" - } + { + "fields": [ + { + "mode": "REPEATED", + "name": "all", + "type": "INTEGER" + }, + { + "mode": "NULLABLE", + "name": "preferred", + "type": "STRING" + } + ], + "mode": "NULLABLE", + "name": "UKPRN", + "type": "RECORD" + }, + { + "fields": [ + { + "mode": "REPEATED", + "name": "all", + "type": "STRING" + }, + { + "mode": "NULLABLE", + "name": "preferred", + "type": "STRING" + } + ], + "mode": "NULLABLE", + "name": "UCAS", + "type": "RECORD" + }, + { + "fields": [ + { + "mode": "REPEATED", + "name": "all", + "type": "INTEGER" + }, + { + "mode": "NULLABLE", + "name": "preferred", + "type": "STRING" + } + ], + "mode": "NULLABLE", + "name": "HESA", + "type": "RECORD" + }, + { + "fields": [ + { + "mode": "REPEATED", + "name": "all", + "type": "STRING" + }, + { + "mode": "NULLABLE", + "name": "preferred", + "type": "STRING" + } + ], + "mode": "NULLABLE", + "name": "ISNI", + "type": "RECORD" + }, + { + "fields": [ + { + "mode": "NULLABLE", + "name": "all", + "type": "STRING" + }, + { + "mode": "NULLABLE", + "name": "preferred", + "type": "STRING" + } + ], + "mode": "NULLABLE", + "name": "GRID", + "type": "RECORD" + }, + { + "fields": [ + { + "mode": "REPEATED", + "name": "all", + "type": "INTEGER" + }, + { + "mode": "NULLABLE", + "name": "preferred", + "type": "INTEGER" + } + ], + "mode": "NULLABLE", + "name": "FundRef", + "type": "RECORD" + }, + { + "fields": [ + { + "mode": "REPEATED", + "name": "all", + "type": "STRING" + }, + { + "mode": "NULLABLE", + "name": "preferred", + "type": "STRING" + } + ], + "mode": "NULLABLE", + "name": "Wikidata", + "type": "RECORD" + }, + { + "fields": [ + { + "mode": "REPEATED", + "name": "all", + "type": "INTEGER" + }, + { + "mode": "NULLABLE", + "name": "preferred", + "type": "INTEGER" + } + ], + "mode": "NULLABLE", + "name": "OrgRef", + "type": "RECORD" + } ], "mode": "NULLABLE", - "name": "Ringgold", + "name": "external_ids", "type": "RECORD" - } - ], - "mode": "NULLABLE", - "name": "external_ids", - "type": "RECORD" - } -] + } +] \ No newline at end of file From b220c98fe65ba2bcaf1ca82beadf9122ba20b874 Mon Sep 17 00:00:00 2001 From: Jennifer Melot Date: Tue, 23 May 2023 10:07:29 -0400 Subject: [PATCH 2/2] Fix some types --- schemas/ror.json | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/schemas/ror.json b/schemas/ror.json index 24a66b3..621b564 100644 --- a/schemas/ror.json +++ b/schemas/ror.json @@ -289,7 +289,7 @@ { "mode": "NULLABLE", "name": "postcode", - "type": "INTEGER" + "type": "STRING" }, { "mode": "NULLABLE", @@ -308,7 +308,7 @@ { "mode": "REPEATED", "name": "all", - "type": "INTEGER" + "type": "STRING" }, { "mode": "NULLABLE", @@ -342,7 +342,7 @@ { "mode": "REPEATED", "name": "all", - "type": "INTEGER" + "type": "STRING" }, { "mode": "NULLABLE", @@ -393,12 +393,12 @@ { "mode": "REPEATED", "name": "all", - "type": "INTEGER" + "type": "STRING" }, { "mode": "NULLABLE", "name": "preferred", - "type": "INTEGER" + "type": "STRING" } ], "mode": "NULLABLE", @@ -427,17 +427,34 @@ { "mode": "REPEATED", "name": "all", - "type": "INTEGER" + "type": "STRING" }, { "mode": "NULLABLE", "name": "preferred", - "type": "INTEGER" + "type": "STRING" } ], "mode": "NULLABLE", "name": "OrgRef", "type": "RECORD" + }, + { + "fields": [ + { + "mode": "REPEATED", + "name": "all", + "type": "STRING" + }, + { + "mode": "NULLABLE", + "name": "preferred", + "type": "STRING" + } + ], + "mode": "NULLABLE", + "name": "CNRS", + "type": "RECORD" } ], "mode": "NULLABLE",