Added the config to group/re-index all ROR, removed ringgold references

ORCID · Jun 29, 2023 · 86b0941 · 86b0941
1 parent 2b66222
commit 86b0941
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 11 deletions.
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
@@ -22,7 +22,6 @@ public class LoadDataForOrganizationSource {
 
     private OrgLoadSource rorOrgSource;
     private OrgLoadSource fundrefOrgSource;
-    private OrgLoadSource ringgoldOrgSource;
 
     private static final String ROR_TYPE="ROR";
     private static final String FUNDREF_TYPE="FUNDREF";
@@ -44,7 +43,6 @@ private void init() {
         orgLoadManager = (OrgLoadManager) context.getBean("orgLoadManager");
         rorOrgSource = (OrgLoadSource) context.getBean("rorOrgDataSource");
         fundrefOrgSource = (OrgLoadSource) context.getBean("fundrefOrgDataSource");
-        ringgoldOrgSource = (OrgLoadSource) context.getBean("ringgoldOrgDataSource");
     }
 
     public static void main(String[] args) {

diff --git a/...id/scheduler/loader/source/cli/ProcessOrganizationAsPartOfGroupForDisambiguatedOrgId.java b/...id/scheduler/loader/source/cli/ProcessOrganizationAsPartOfGroupForDisambiguatedOrgId.java
@@ -24,11 +24,7 @@ public class ProcessOrganizationAsPartOfGroupForDisambiguatedOrgId {
     private static final Logger LOG = LoggerFactory.getLogger(ProcessOrganizationAsPartOfGroupForDisambiguatedOrgId.class);
     private OrgDisambiguatedManager orgDisambiguatedManager;
     private OrgDisambiguatedDao orgDisambiguatedDao;
-
-
-    private OrgLoadSource rorOrgSource;
-    private OrgLoadSource fundrefOrgSource;
-    private OrgLoadSource ringgoldOrgSource;
+
 
     private static final String ROR_TYPE="ROR";
     private static final String FUNDREF_TYPE="FUNDREF";
@@ -48,9 +44,6 @@ public class ProcessOrganizationAsPartOfGroupForDisambiguatedOrgId {
     private void init() {
         ApplicationContext context = new ClassPathXmlApplicationContext("orcid-scheduler-context.xml");
         orgDisambiguatedManager = (OrgDisambiguatedManager) context.getBean("orgDisambiguatedManager");
-        rorOrgSource = (OrgLoadSource) context.getBean("rorOrgDataSource");
-        fundrefOrgSource = (OrgLoadSource) context.getBean("fundrefOrgDataSource");
-        ringgoldOrgSource = (OrgLoadSource) context.getBean("ringgoldOrgDataSource");
         orgDisambiguatedDao = (OrgDisambiguatedDao) context.getBean("orgDisambiguatedDao");
     }
 

diff --git a/...d-scheduler-web/src/main/java/org/orcid/scheduler/loader/source/ror/RorOrgLoadSource.java b/...d-scheduler-web/src/main/java/org/orcid/scheduler/loader/source/ror/RorOrgLoadSource.java
@@ -66,6 +66,9 @@ public class RorOrgLoadSource implements OrgLoadSource {
 
     @Value("${org.orcid.core.orgs.ror.localDataPath:/tmp/grid/ror.json}")
     private String localDataPath;
+
+    @Value("${org.orcid.core.orgs.ror.indexAllEnabled:false}")
+    private boolean indexAllEnabled;
 
     @Resource
     private OrgDisambiguatedDao orgDisambiguatedDao;
@@ -223,7 +226,7 @@ private boolean loadData() {
     private OrgDisambiguatedEntity processInstitute(String sourceId, String name, Iso3166Country country, String city, String region, String url, String orgType) {
         OrgDisambiguatedEntity existingBySourceId = orgDisambiguatedDao.findBySourceIdAndSourceType(sourceId, OrgDisambiguatedSourceType.ROR.name());
         if (existingBySourceId != null) {
-            if (entityChanged(existingBySourceId, name, country.value(), city, region, url, orgType)) {
+            if (entityChanged(existingBySourceId, name, country.value(), city, region, url, orgType) || indexAllEnabled) {
                 existingBySourceId.setCity(city);
                 existingBySourceId.setCountry(country.name());
                 existingBySourceId.setName(name);

diff --git a/properties/development.properties b/properties/development.properties
@@ -233,3 +233,6 @@ org.orcid.core.profile.lockout.window=5
 
 # ISSN Loader Cron Configuration
 org.orcid.scheduler.web.loadIssnCronConfig=0 0 0 * * FRI
+
+# Added the config to index all RORs not only the changed ones
+org.orcid.core.orgs.ror.indexAllEnabled=false