Filter by is-funding-org only on funding requests, and, filter by ROR…

… in all affiliation requests
ORCID · Jan 31, 2024 · 6aa06fd · 6aa06fd
1 parent ca8c85e
commit 6aa06fd
Showing 1 changed file with 6 additions and 4 deletions.
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
@@ -54,16 +54,18 @@ public List<OrgDisambiguatedSolrDocument> getOrgs(String searchTerm, int firstRe
         StringBuilder queryString = new StringBuilder(SOLR_ORGS_QUERY.replace("%s", searchTerm));
         if (fundersOnly) {
             queryString.append(" AND is-funding-org:true");
-        } else {
-            queryString.append(" AND is-funding-org:false");
-        }
+        } 
 
         SolrQuery query = new SolrQuery();
         query.setQuery(queryString.toString());
         query.addOrUpdateSort("score", ORDER.desc);
         query.addOrUpdateSort("org-disambiguated-popularity", ORDER.desc);
+        if(fundersOnly) {
+            query.addFilterQuery(String.format("(%s:(%s OR %s))", SolrConstants.ORG_DISAMBIGUATED_ID_SOURCE_TYPE, "ROR", "FUNDREF"));
+        } else {
+            query.addFilterQuery(String.format("(%s:(%s))", SolrConstants.ORG_DISAMBIGUATED_ID_SOURCE_TYPE, "ROR"));
+        }
 
-        query.addFilterQuery(String.format("(%s:(%s OR %s))", SolrConstants.ORG_DISAMBIGUATED_ID_SOURCE_TYPE, "ROR", "FUNDREF"));
         LOGGER.debug("SOLR Query: " + query.toQueryString());
 
         try {