Merge pull request #6810 from ORCID/RemoveRinggoldFromTypeahead

Remove RINGGOLD from the orgs query
ORCID · Jun 9, 2023 · 41676c2 · 41676c2
2 parents 10ae936 + b1650aa
commit 41676c2
Show file tree

Hide file tree

Showing 48 changed files with 3 additions and 2,626 deletions.
diff --git a/orcid-api-web/tutorial/affiliations.md b/orcid-api-web/tutorial/affiliations.md
@@ -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)
 

diff --git a/orcid-core/src/main/java/org/orcid/core/cli/LoadRinggoldData.java b/orcid-core/src/main/java/org/orcid/core/cli/LoadRinggoldData.java
diff --git a/orcid-core/src/main/java/org/orcid/core/solr/OrcidSolrOrgsClient.java b/orcid-core/src/main/java/org/orcid/core/solr/OrcidSolrOrgsClient.java
@@ -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 {

diff --git a/orcid-core/src/test/java/org/orcid/core/cli/LoadRinggoldDataTest.java b/orcid-core/src/test/java/org/orcid/core/cli/LoadRinggoldDataTest.java
diff --git a/orcid-core/src/test/resources/ringgold/test_AddDisambiguatedOrg/file_alt_names.json b/orcid-core/src/test/resources/ringgold/test_AddDisambiguatedOrg/file_alt_names.json
diff --git a/orcid-core/src/test/resources/ringgold/test_AddDisambiguatedOrg/file_deleted_ids.json b/orcid-core/src/test/resources/ringgold/test_AddDisambiguatedOrg/file_deleted_ids.json
diff --git a/orcid-core/src/test/resources/ringgold/test_AddDisambiguatedOrg/file_identifiers.json b/orcid-core/src/test/resources/ringgold/test_AddDisambiguatedOrg/file_identifiers.json
diff --git a/orcid-core/src/test/resources/ringgold/test_AddDisambiguatedOrg/file_institutions.json b/orcid-core/src/test/resources/ringgold/test_AddDisambiguatedOrg/file_institutions.json
diff --git a/orcid-core/src/test/resources/ringgold/test_AddExternalIdentifier/file_alt_names.json b/orcid-core/src/test/resources/ringgold/test_AddExternalIdentifier/file_alt_names.json
diff --git a/orcid-core/src/test/resources/ringgold/test_AddExternalIdentifier/file_deleted_ids.json b/orcid-core/src/test/resources/ringgold/test_AddExternalIdentifier/file_deleted_ids.json
diff --git a/orcid-core/src/test/resources/ringgold/test_AddExternalIdentifier/file_identifiers.json b/orcid-core/src/test/resources/ringgold/test_AddExternalIdentifier/file_identifiers.json
diff --git a/orcid-core/src/test/resources/ringgold/test_AddExternalIdentifier/file_institutions.json b/orcid-core/src/test/resources/ringgold/test_AddExternalIdentifier/file_institutions.json
diff --git a/orcid-core/src/test/resources/ringgold/test_DeprecateADisambiguatedOrg/file_alt_names.json b/orcid-core/src/test/resources/ringgold/test_DeprecateADisambiguatedOrg/file_alt_names.json
diff --git a/orcid-core/src/test/resources/ringgold/test_DeprecateADisambiguatedOrg/file_deleted_ids.json b/orcid-core/src/test/resources/ringgold/test_DeprecateADisambiguatedOrg/file_deleted_ids.json
diff --git a/orcid-core/src/test/resources/ringgold/test_DeprecateADisambiguatedOrg/file_identifiers.json b/orcid-core/src/test/resources/ringgold/test_DeprecateADisambiguatedOrg/file_identifiers.json
diff --git a/...d-core/src/test/resources/ringgold/test_DeprecateADisambiguatedOrg/file_institutions.json b/...d-core/src/test/resources/ringgold/test_DeprecateADisambiguatedOrg/file_institutions.json
diff --git a/...src/test/resources/ringgold/test_LinkExistingOrgToNewDisambiguatedOrg/file_alt_names.json b/...src/test/resources/ringgold/test_LinkExistingOrgToNewDisambiguatedOrg/file_alt_names.json
diff --git a/...c/test/resources/ringgold/test_LinkExistingOrgToNewDisambiguatedOrg/file_deleted_ids.json b/...c/test/resources/ringgold/test_LinkExistingOrgToNewDisambiguatedOrg/file_deleted_ids.json
diff --git a/...c/test/resources/ringgold/test_LinkExistingOrgToNewDisambiguatedOrg/file_identifiers.json b/...c/test/resources/ringgold/test_LinkExistingOrgToNewDisambiguatedOrg/file_identifiers.json
diff --git a/.../test/resources/ringgold/test_LinkExistingOrgToNewDisambiguatedOrg/file_institutions.json b/.../test/resources/ringgold/test_LinkExistingOrgToNewDisambiguatedOrg/file_institutions.json
diff --git a/...-core/src/test/resources/ringgold/test_RemoveAndAddExternalIdentifier/file_alt_names.json b/...-core/src/test/resources/ringgold/test_RemoveAndAddExternalIdentifier/file_alt_names.json
diff --git a/...ore/src/test/resources/ringgold/test_RemoveAndAddExternalIdentifier/file_deleted_ids.json b/...ore/src/test/resources/ringgold/test_RemoveAndAddExternalIdentifier/file_deleted_ids.json
diff --git a/...ore/src/test/resources/ringgold/test_RemoveAndAddExternalIdentifier/file_identifiers.json b/...ore/src/test/resources/ringgold/test_RemoveAndAddExternalIdentifier/file_identifiers.json
diff --git a/...re/src/test/resources/ringgold/test_RemoveAndAddExternalIdentifier/file_institutions.json b/...re/src/test/resources/ringgold/test_RemoveAndAddExternalIdentifier/file_institutions.json
diff --git a/orcid-core/src/test/resources/ringgold/test_UpdateDisambiguatedOrgs/file_alt_names.json b/orcid-core/src/test/resources/ringgold/test_UpdateDisambiguatedOrgs/file_alt_names.json
diff --git a/orcid-core/src/test/resources/ringgold/test_UpdateDisambiguatedOrgs/file_deleted_ids.json b/orcid-core/src/test/resources/ringgold/test_UpdateDisambiguatedOrgs/file_deleted_ids.json
diff --git a/orcid-core/src/test/resources/ringgold/test_UpdateDisambiguatedOrgs/file_identifiers.json b/orcid-core/src/test/resources/ringgold/test_UpdateDisambiguatedOrgs/file_identifiers.json
diff --git a/orcid-core/src/test/resources/ringgold/test_UpdateDisambiguatedOrgs/file_institutions.json b/orcid-core/src/test/resources/ringgold/test_UpdateDisambiguatedOrgs/file_institutions.json
diff --git a/orcid-core/src/test/resources/ringgold/test_addOrg/file_alt_names.json b/orcid-core/src/test/resources/ringgold/test_addOrg/file_alt_names.json
diff --git a/orcid-core/src/test/resources/ringgold/test_addOrg/file_deleted_ids.json b/orcid-core/src/test/resources/ringgold/test_addOrg/file_deleted_ids.json
diff --git a/orcid-core/src/test/resources/ringgold/test_addOrg/file_identifiers.json b/orcid-core/src/test/resources/ringgold/test_addOrg/file_identifiers.json
diff --git a/orcid-core/src/test/resources/ringgold/test_addOrg/file_institutions.json b/orcid-core/src/test/resources/ringgold/test_addOrg/file_institutions.json
diff --git a/orcid-core/src/test/resources/ringgold/test_base/file_alt_names.json b/orcid-core/src/test/resources/ringgold/test_base/file_alt_names.json
diff --git a/orcid-core/src/test/resources/ringgold/test_base/file_deleted_ids.json b/orcid-core/src/test/resources/ringgold/test_base/file_deleted_ids.json
diff --git a/orcid-core/src/test/resources/ringgold/test_base/file_identifiers.json b/orcid-core/src/test/resources/ringgold/test_base/file_identifiers.json
diff --git a/orcid-core/src/test/resources/ringgold/test_base/file_institutions.json b/orcid-core/src/test/resources/ringgold/test_base/file_institutions.json
diff --git a/orcid-core/src/test/resources/ringgold/zip/Ringgold_Identify_json_add_disambiguated_org.zip b/orcid-core/src/test/resources/ringgold/zip/Ringgold_Identify_json_add_disambiguated_org.zip
diff --git a/...d-core/src/test/resources/ringgold/zip/Ringgold_Identify_json_add_external_identifier.zip b/...d-core/src/test/resources/ringgold/zip/Ringgold_Identify_json_add_external_identifier.zip
diff --git a/orcid-core/src/test/resources/ringgold/zip/Ringgold_Identify_json_add_org.zip b/orcid-core/src/test/resources/ringgold/zip/Ringgold_Identify_json_add_org.zip
diff --git a/...e/src/test/resources/ringgold/zip/Ringgold_Identify_json_deprecated_disambiguated_org.zip b/...e/src/test/resources/ringgold/zip/Ringgold_Identify_json_deprecated_disambiguated_org.zip
diff --git a/orcid-core/src/test/resources/ringgold/zip/Ringgold_Identify_json_do_nothing.zip b/orcid-core/src/test/resources/ringgold/zip/Ringgold_Identify_json_do_nothing.zip
diff --git a/orcid-core/src/test/resources/ringgold/zip/Ringgold_Identify_json_link_orgs.zip b/orcid-core/src/test/resources/ringgold/zip/Ringgold_Identify_json_link_orgs.zip
diff --git a/...ore/src/test/resources/ringgold/zip/Ringgold_Identify_json_remove_external_identifier.zip b/...ore/src/test/resources/ringgold/zip/Ringgold_Identify_json_remove_external_identifier.zip
diff --git a/...core/src/test/resources/ringgold/zip/Ringgold_Identify_json_update_disambiguated_orgs.zip b/...core/src/test/resources/ringgold/zip/Ringgold_Identify_json_update_disambiguated_orgs.zip
diff --git a/...eb/src/main/java/org/orcid/scheduler/loader/source/cli/LoadDataForOrganizationSource.java b/...eb/src/main/java/org/orcid/scheduler/loader/source/cli/LoadDataForOrganizationSource.java
@@ -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);
             }