From 399e4bc80f7c447b487432306351a90742a023fc Mon Sep 17 00:00:00 2001 From: Claudio Atzori Date: Thu, 15 Nov 2018 16:52:56 +0100 Subject: [PATCH] default (empty) configuration should be aligned with the updated model --- .../eu/dnetlib/pace/config/DedupConfig.java | 2 + .../eu/dnetlib/pace/config/dedupConfig.st | 39 ++++++++++--------- 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/config/DedupConfig.java b/dnet-pace-core/src/main/java/eu/dnetlib/pace/config/DedupConfig.java index 9d281d71e..d7396406f 100644 --- a/dnet-pace-core/src/main/java/eu/dnetlib/pace/config/DedupConfig.java +++ b/dnet-pace-core/src/main/java/eu/dnetlib/pace/config/DedupConfig.java @@ -36,6 +36,8 @@ public class DedupConfig implements Config, Serializable { defaults.put("threshold", "0"); defaults.put("dedupRun", "001"); defaults.put("entityType", "result"); + defaults.put("subEntityType", "resulttype"); + defaults.put("subEntityValue", "publication"); defaults.put("orderField", "title"); defaults.put("queueMaxSize", "2000"); defaults.put("groupMaxSize", "10"); diff --git a/dnet-pace-core/src/main/resources/eu/dnetlib/pace/config/dedupConfig.st b/dnet-pace-core/src/main/resources/eu/dnetlib/pace/config/dedupConfig.st index fdf569377..5cda4d928 100644 --- a/dnet-pace-core/src/main/resources/eu/dnetlib/pace/config/dedupConfig.st +++ b/dnet-pace-core/src/main/resources/eu/dnetlib/pace/config/dedupConfig.st @@ -1,23 +1,26 @@ -{ - "wf" : { - "configurationId" : "$configurationId$", - "threshold" : "$threshold$", - "run" : "$run$", - "entityType" : "$entityType$", - "orderField" : "$orderField$", - "queueMaxSize" : "$queueMaxSize$", - "groupMaxSize" : "$groupMaxSize$", - "slidingWindowSize" : "$slidingWindowSize$", - "rootBuilder" : [ $rootBuilder:{"$it$"};separator=", "$ ], - "includeChildren" : "$includeChildren$" - }, - "pace" : { +{ + "wf" : { + "threshold" : "$threshold$", + "dedupRun" : "$run$", + "entityType" : "$entityType$", + "subEntityType" : "$subEntityType$", + "subEntityValue" : "$subEntityValue$", + "orderField" : "$orderField$", + "queueMaxSize" : "$queueMaxSize$", + "groupMaxSize" : "$groupMaxSize$", + "slidingWindowSize" : "$slidingWindowSize$", + "rootBuilder" : [ $rootBuilder:{"$it$"};separator=", "$ ], + "includeChildren" : "$includeChildren$" + }, + "pace" : { "clustering" : [ - ], - "conditions" : [ - ], + ], + "strictConditions" : [ + ], + "conditions" : [ + ], "model" : [ ], - "blacklists" : { } + "blacklists" : { } } } \ No newline at end of file