Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove RINGGOLD from the orgs query #6810

Merged
merged 4 commits into from
Jun 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion orcid-api-web/tutorial/affiliations.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ Editing the affiliations sections of a record requires a 3 step OAuth token with

- **end-date** _(optional)_ The date the affiliation ended or will end

- **organization** _(required)_ Information about the organization the affiliation was with. A Ringgold, Grid, ROR, or Crossref Funder Registry organization identifier is required in 3.0+
- **organization** _(required)_ Information about the organization the affiliation was with. A ROR, or Crossref Funder Registry organization identifier is required in 3.0+

- **address** _(required)_ Information about the physical location of the organization the affiliation is with. A city and country are required (region is optional)

Expand Down
542 changes: 0 additions & 542 deletions orcid-core/src/main/java/org/orcid/core/cli/LoadRinggoldData.java

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public List<OrgDisambiguatedSolrDocument> getOrgs(String searchTerm, int firstRe
query.addOrUpdateSort("org-disambiguated-popularity", ORDER.desc);
}

query.addFilterQuery(String.format("(%s:(%s OR %s OR %s))", SolrConstants.ORG_DISAMBIGUATED_ID_SOURCE_TYPE, "ROR", "RINGGOLD", "FUNDREF"));
query.addFilterQuery(String.format("(%s:(%s OR %s))", SolrConstants.ORG_DISAMBIGUATED_ID_SOURCE_TYPE, "ROR", "FUNDREF"));
LOGGER.debug("SOLR Query: " + query.toQueryString());

try {
Expand Down
728 changes: 0 additions & 728 deletions orcid-core/src/test/java/org/orcid/core/cli/LoadRinggoldDataTest.java

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,7 @@ public static void main(String[] args) {
if(StringUtils.equalsIgnoreCase(loadData.orgType, FUNDREF_TYPE)) {
LOG.info("Loading orgs from Fundref");
loadData.orgLoadManager.loadOrg(loadData.fundrefOrgSource);
}
else if(StringUtils.equalsIgnoreCase(loadData.orgType, RINGGOLD_TYPE)) {
LOG.info("Loading orgs from Ringgold");
loadData.orgLoadManager.loadOrg(loadData.ringgoldOrgSource);
}
else { //default to ROR
} else { //default to ROR
LOG.info("Loading orgs from ROR");
loadData.orgLoadManager.loadOrg(loadData.rorOrgSource);
}
Expand Down
Loading