From 61319b2e8324d73620ed3618acd527333fbceef6 Mon Sep 17 00:00:00 2001 From: Claudio Atzori Date: Fri, 25 Mar 2022 16:38:33 +0100 Subject: [PATCH] updated dhp-schema version; set entity-level dataInfo before & after merging the fields from the group of duplicates --- .../eu/dnetlib/dhp/oa/dedup/DedupRecordFactory.java | 2 +- .../eu/dnetlib/dhp/oa/dedup/EntityMergerTest.java | 11 ++++++++++- pom.xml | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dhp-workflows/dhp-dedup-openaire/src/main/java/eu/dnetlib/dhp/oa/dedup/DedupRecordFactory.java b/dhp-workflows/dhp-dedup-openaire/src/main/java/eu/dnetlib/dhp/oa/dedup/DedupRecordFactory.java index b8ae4ca02..d345cf98f 100644 --- a/dhp-workflows/dhp-dedup-openaire/src/main/java/eu/dnetlib/dhp/oa/dedup/DedupRecordFactory.java +++ b/dhp-workflows/dhp-dedup-openaire/src/main/java/eu/dnetlib/dhp/oa/dedup/DedupRecordFactory.java @@ -107,7 +107,7 @@ public class DedupRecordFactory { entity.setId(id); entity.setLastupdatetimestamp(ts); - entity.getDataInfo().setDeletedbyinference(false); + entity.setDataInfo(dataInfo); return entity; } diff --git a/dhp-workflows/dhp-dedup-openaire/src/test/java/eu/dnetlib/dhp/oa/dedup/EntityMergerTest.java b/dhp-workflows/dhp-dedup-openaire/src/test/java/eu/dnetlib/dhp/oa/dedup/EntityMergerTest.java index e86f91f99..aa3722ce5 100644 --- a/dhp-workflows/dhp-dedup-openaire/src/test/java/eu/dnetlib/dhp/oa/dedup/EntityMergerTest.java +++ b/dhp-workflows/dhp-dedup-openaire/src/test/java/eu/dnetlib/dhp/oa/dedup/EntityMergerTest.java @@ -77,7 +77,16 @@ class EntityMergerTest implements Serializable { // verify id assertEquals(dedupId, pub_merged.getId()); - assertEquals(pub_top.getJournal(), pub_merged.getJournal()); + assertEquals(pub_top.getJournal().getName(), pub_merged.getJournal().getName()); + assertEquals(pub_top.getJournal().getIssnOnline(), pub_merged.getJournal().getIssnOnline()); + assertEquals(pub_top.getJournal().getIssnLinking(), pub_merged.getJournal().getIssnLinking()); + assertEquals(pub_top.getJournal().getIssnPrinted(), pub_merged.getJournal().getIssnPrinted()); + assertEquals(pub_top.getJournal().getIss(), pub_merged.getJournal().getIss()); + assertEquals(pub_top.getJournal().getEp(), pub_merged.getJournal().getEp()); + assertEquals(pub_top.getJournal().getSp(), pub_merged.getJournal().getSp()); + assertEquals(pub_top.getJournal().getVol(), pub_merged.getJournal().getVol()); + assertEquals(pub_top.getJournal().getConferencedate(), pub_merged.getJournal().getConferencedate()); + assertEquals(pub_top.getJournal().getConferenceplace(), pub_merged.getJournal().getConferenceplace()); assertEquals("OPEN", pub_merged.getBestaccessright().getClassid()); assertEquals(pub_top.getResulttype(), pub_merged.getResulttype()); assertEquals(pub_top.getLanguage(), pub_merged.getLanguage()); diff --git a/pom.xml b/pom.xml index 86adee902..45265d5ba 100644 --- a/pom.xml +++ b/pom.xml @@ -797,7 +797,7 @@ 3.3.3 3.4.2 [2.12,3.0) - [2.10.29] + [2.10.31] [4.0.3] [6.0.5] [3.1.6]