-
Notifications
You must be signed in to change notification settings - Fork 171
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Updated ROR Loader to use V2 of the ROR schema, the additional fields…
… not stored yet
- Loading branch information
1 parent
f57f9c6
commit 00bc0d3
Showing
7 changed files
with
1,178 additions
and
513 deletions.
There are no files selected for viewing
907 changes: 469 additions & 438 deletions
907
...d-scheduler-web/src/main/java/org/orcid/scheduler/loader/source/ror/RorOrgLoadSource.java
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
75 changes: 71 additions & 4 deletions
75
orcid-scheduler-web/src/test/resources/ror/ror_1_org_2_ext_ids_#2_preferred.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,71 @@ | ||
|
|
||
| [ | ||
| { "name": "org_1","country": {"country_code": "AU", "country_name": "Australia" },"wikipedia_url": null, "email_address": null, "links": ["http://link1.com"], "aliases": ["alias 1"], "acronyms": ["ACR_1"], "types": ["type_1"], "ip_addresses": [], "addresses": [{ "line_1": "", "line_2": "", "line_3": null, "lat": 0, "lng": 0, "postcode": "", "primary": false, "city": "City One", "state": "Alabama", "state_code": "AL", "country": "United States", "country_code": "US", "geonames_city": { "id": 2172517, "city": "Canberra", "nuts_level1": null, "nuts_level2": null, "nuts_level3": null, "geonames_admin1": { "name": "ACT", "ascii_name": "ACT", "code": "AU.01" }, "geonames_admin2": null, "license": { "attribution": "Data from geonames.org under a CC-BY 3.0 license", "license": "http://creativecommons.org/licenses/by/3.0/" } } }], "labels": [], "id": "ror.1", "status": "active", "established": 1946, "relationships": [{ "type": "Related", "label": "Calvary Hospital", "id": "grid.460694.9" }, { "type": "Related", "label": "Canberra Hospital", "id": "grid.413314.0" }, { "type": "Related", "label": "Goulburn Base Hospital", "id": "grid.460721.6" }], "external_ids": { "Wikidata": { "preferred": "WIKIDATA2", "all": ["WIKIDATA1", "WIKIDATA2"] } }, "weight": 1 } | ||
| ] | ||
| [ | ||
| { | ||
| "names":[ | ||
| { | ||
| "value":"org_1", | ||
| "types":[ | ||
| "ror_display", | ||
| "label" | ||
| ], | ||
| "lang":null | ||
| } | ||
| ], | ||
| "locations": [ | ||
| { | ||
| "geonames_id": 2078025, | ||
| "geonames_details": { | ||
| "country_code": "AU", | ||
| "country_name": "Australia", | ||
| "lat": -35.024038, | ||
| "lng": 138.572615, | ||
| "name": "Adelaide" | ||
| } | ||
| } | ||
| ], | ||
| "email_address": null, | ||
| "links": [ | ||
| "http://link1.com" | ||
| ], | ||
| "aliases": [ | ||
| "alias 1" | ||
| ], | ||
| "acronyms": [ | ||
| "ACR_1" | ||
| ], | ||
| "types": [ | ||
| "type_1" | ||
| ], | ||
| "ip_addresses": [], | ||
| "labels": [], | ||
| "id": "ror.1", | ||
| "status": "active", | ||
| "established": 1946, | ||
| "relationships": [ | ||
| { | ||
| "type": "Related", | ||
| "label": "Calvary Hospital", | ||
| "id": "grid.460694.9" | ||
| }, | ||
| { | ||
| "type": "Related", | ||
| "label": "Canberra Hospital", | ||
| "id": "grid.413314.0" | ||
| }, | ||
| { | ||
| "type": "Related", | ||
| "label": "Goulburn Base Hospital", | ||
| "id": "grid.460721.6" | ||
| } | ||
| ], | ||
| "external_ids": [ | ||
| { | ||
| "type": "Wikidata", | ||
| "preferred": "WIKIDATA2", | ||
| "all": [ | ||
| "WIKIDATA1", | ||
| "WIKIDATA2" | ||
| ] | ||
| } | ||
| ] | ||
| } | ||
| ] |
94 changes: 93 additions & 1 deletion
94
orcid-scheduler-web/src/test/resources/ror/ror_1_org_5_external_identifiers.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,95 @@ | ||
| [ | ||
| { "name": "org_1", "country": {"country_code": "AU", "country_name": "Australia" },"wikipedia_url": "http://en.wikipedia.org/wiki/org_1", "email_address": null, "links": ["http://link1.com"], "aliases": ["alias 1"], "acronyms": ["ACR_1"], "types": ["type_1"], "ip_addresses": [], "addresses": [{ "line_1": "", "line_2": "", "line_3": null, "lat": 0, "lng": 0, "postcode": "", "primary": false, "city": "City One", "state": "Alabama", "state_code": "AL", "country": "United States", "country_code": "US", "geonames_city": { "id": 2172517, "city": "Canberra", "nuts_level1": null, "nuts_level2": null, "nuts_level3": null, "geonames_admin1": { "name": "ACT", "ascii_name": "ACT", "code": "AU.01" }, "geonames_admin2": null, "license": { "attribution": "Data from geonames.org under a CC-BY 3.0 license", "license": "http://creativecommons.org/licenses/by/3.0/" } } }], "labels": [], "id": "ror.1", "status": "active", "established": 1946, "relationships": [{ "type": "Related", "label": "Calvary Hospital", "id": "grid.460694.9" }, { "type": "Related", "label": "Canberra Hospital", "id": "grid.413314.0" }, { "type": "Related", "label": "Goulburn Base Hospital", "id": "grid.460721.6" }], "external_ids": { "ISNI": { "preferred": null, "all": ["ISNI1"] }, "FundRef": { "preferred": "FUNDREF1", "all": ["FUNDREF1"] }, "OrgRef": { "preferred": null, "all": ["ORGREF1"] }, "Wikidata": { "preferred": null, "all": ["WIKIDATA1"] } }, "weight": 1 } | ||
| { | ||
| "names": [ | ||
| { | ||
| "value": "org_1", | ||
| "types": [ | ||
| "ror_display", | ||
| "label" | ||
| ], | ||
| "lang": null | ||
| } ], | ||
|
|
||
| "locations":[ | ||
| { | ||
| "geonames_id":2078025, | ||
| "geonames_details":{ | ||
| "country_code":"AU", | ||
| "country_name":"Australia", | ||
| "lat":-35.024038, | ||
| "lng":138.572615, | ||
| "name":"Adelaide" | ||
| } | ||
| } | ||
| ], | ||
| "email_address":null, | ||
| "links":[ | ||
| "http://link1.com" | ||
| ], | ||
| "aliases":[ | ||
| "alias 1" | ||
| ], | ||
| "acronyms":[ | ||
| "ACR_1" | ||
| ], | ||
| "types":[ | ||
| "type_1" | ||
| ], | ||
| "ip_addresses":[ | ||
|
|
||
| ], | ||
| "labels":[ | ||
|
|
||
| ], | ||
| "id":"ror.1", | ||
| "status":"active", | ||
| "established":1946, | ||
| "relationships":[ | ||
| { | ||
| "type":"Related", | ||
| "label":"Calvary Hospital", | ||
| "id":"grid.460694.9" | ||
| }, | ||
| { | ||
| "type":"Related", | ||
| "label":"Canberra Hospital", | ||
| "id":"grid.413314.0" | ||
| }, | ||
| { | ||
| "type":"Related", | ||
| "label":"Goulburn Base Hospital", | ||
| "id":"grid.460721.6" | ||
| } | ||
| ], | ||
| "external_ids":[ | ||
| { | ||
| "type":"ISNI", | ||
| "preferred":null, | ||
| "all":[ | ||
| "ISNI1" | ||
| ] | ||
| }, | ||
| { | ||
| "type":"FundRef", | ||
| "preferred":"FUNDREF1", | ||
| "all":[ | ||
| "FUNDREF1" | ||
| ] | ||
| }, | ||
| { | ||
| "type":"OrgRef", | ||
| "preferred":null, | ||
| "all":[ | ||
| "ORGREF1" | ||
| ] | ||
| }, | ||
| { | ||
| "type":"Wikidata", | ||
| "preferred":null, | ||
| "all":[ | ||
| "WIKIDATA1" | ||
| ] | ||
| } | ||
| ] | ||
| } | ||
| ] |
99 changes: 96 additions & 3 deletions
99
orcid-scheduler-web/src/test/resources/ror/ror_1_org_6_external_identifiers.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,96 @@ | ||
| [ | ||
| { "name": "org_1", "country": {"country_code": "AU", "country_name": "Australia" },"wikipedia_url": "http://en.wikipedia.org/wiki/org_1", "email_address": null, "links": ["http://link1.com"], "aliases": ["alias 1"], "acronyms": ["ACR_1"], "types": ["type_1"], "ip_addresses": [], "addresses": [{ "line_1": "", "line_2": "", "line_3": null, "lat": 0, "lng": 0, "postcode": "", "primary": false, "city": "City One", "state": "Alabama", "state_code": "AL", "country": "United States", "country_code": "US", "geonames_city": { "id": 2172517, "city": "Canberra", "nuts_level1": null, "nuts_level2": null, "nuts_level3": null, "geonames_admin1": { "name": "ACT", "ascii_name": "ACT", "code": "AU.01" }, "geonames_admin2": null, "license": { "attribution": "Data from geonames.org under a CC-BY 3.0 license", "license": "http://creativecommons.org/licenses/by/3.0/" } } }], "labels": [], "id": "ror.1", "status": "active", "established": 1946, "relationships": [{ "type": "Related", "label": "Calvary Hospital", "id": "grid.460694.9" }, { "type": "Related", "label": "Canberra Hospital", "id": "grid.413314.0" }, { "type": "Related", "label": "Goulburn Base Hospital", "id": "grid.460721.6" }], "external_ids": { "ISNI": { "preferred": null, "all": ["ISNI1"] }, "FundRef": { "preferred": "FUNDREF1", "all": ["FUNDREF1", "FUNDREF2"] }, "OrgRef": { "preferred": null, "all": ["ORGREF1"] }, "Wikidata": { "preferred": null, "all": ["WIKIDATA1"] } }, "weight": 1 } | ||
| ] | ||
| [ | ||
| { | ||
| "names":[ | ||
| { | ||
| "value":"org_1", | ||
| "types":[ | ||
| "ror_display", | ||
| "label" | ||
| ], | ||
| "lang":null | ||
| } | ||
| ], | ||
| "locations":[ | ||
| { | ||
| "geonames_id":2078025, | ||
| "geonames_details":{ | ||
| "country_code":"AU", | ||
| "country_name":"Australia", | ||
| "lat":-35.024038, | ||
| "lng":138.572615, | ||
| "name":"Adelaide" | ||
| } | ||
| } | ||
| ], | ||
| "email_address":null, | ||
| "links":[ | ||
| "http://link1.com" | ||
| ], | ||
| "aliases":[ | ||
| "alias 1" | ||
| ], | ||
| "acronyms":[ | ||
| "ACR_1" | ||
| ], | ||
| "types":[ | ||
| "type_1" | ||
| ], | ||
| "ip_addresses":[ | ||
|
|
||
| ], | ||
| "labels":[ | ||
|
|
||
| ], | ||
| "id":"ror.1", | ||
| "status":"active", | ||
| "established":1946, | ||
| "relationships":[ | ||
| { | ||
| "type":"Related", | ||
| "label":"Calvary Hospital", | ||
| "id":"grid.460694.9" | ||
| }, | ||
| { | ||
| "type":"Related", | ||
| "label":"Canberra Hospital", | ||
| "id":"grid.413314.0" | ||
| }, | ||
| { | ||
| "type":"Related", | ||
| "label":"Goulburn Base Hospital", | ||
| "id":"grid.460721.6" | ||
| } | ||
| ], | ||
| "external_ids":[ | ||
| { | ||
| "type":"ISNI", | ||
| "preferred":null, | ||
| "all":[ | ||
| "ISNI1" | ||
| ] | ||
| }, | ||
| { | ||
| "type":"FundRef", | ||
| "preferred":"FUNDREF1", | ||
| "all":[ | ||
| "FUNDREF1", | ||
| "FUNDREF2" | ||
| ] | ||
| }, | ||
| { | ||
| "type":"OrgRef", | ||
| "preferred":null, | ||
| "all":[ | ||
| "ORGREF1" | ||
| ] | ||
| }, | ||
| { | ||
| "type":"Wikidata", | ||
| "preferred":null, | ||
| "all":[ | ||
| "WIKIDATA1" | ||
| ] | ||
| } | ||
| ] | ||
| } | ||
| ] |
Oops, something went wrong.