Merge pull request #6810 from ORCID/RemoveRinggoldFromTypeahead

Remove RINGGOLD from the orgs query

Author: amontenegro

orcid-api-web/tutorial/affiliations.md

@@ -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 {

orcid-core/src/main/java/org/orcid/core/cli/LoadRinggoldData.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);
             }