D-Net
/
dnet-applications
16
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix creation of group ids

This commit is contained in:
Michele Artini 2020-09-29 11:48:45 +02:00
parent 5c04deadd4
commit 7520fef31f
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/utils/DatabaseUtils.java
View File

@ -179,6 +179,8 @@ public class DatabaseUtils {
if (forceUpdate || openaireConflictRepository.countByGroupNull() > 0) { if (forceUpdate || openaireConflictRepository.countByGroupNull() > 0) {
log.info("Recreating conflicts group...");
openaireConflictRepository.resetGroupIds(); openaireConflictRepository.resetGroupIds();
final Map<String, Set<String>> groups = new HashMap<>(); final Map<String, Set<String>> groups = new HashMap<>();
@ -212,6 +214,8 @@ public class DatabaseUtils {
} }
} }
} }
log.info("...conflicts group recreated");
} }
} }
@ -287,11 +291,13 @@ public class DatabaseUtils {
return jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(OrganizationConflict.class), id); return jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(OrganizationConflict.class), id);
} }
@Transactional
public void importSimRels() { public void importSimRels() {
try { try {
log.info("Importing conflicts and duplicates..."); log.info("Importing conflicts and duplicates...");
jdbcTemplate.update(IOUtils.toString(getClass().getResourceAsStream("/sql/importNewRels.sql"))); jdbcTemplate.update(IOUtils.toString(getClass().getResourceAsStream("/sql/importNewRels.sql")));
log.info("...done"); log.info("...done");
verifyConflictGroups(true);
} catch (final Exception e) { } catch (final Exception e) {
log.error("Error importing conflicts and duplicates", e); log.error("Error importing conflicts and duplicates", e);
} }