From fa8f598763efb334e21624df468d7e1802477076 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominique=20Eifl=C3=A4nder?= Date: Tue, 19 Oct 2021 10:55:51 +0200 Subject: [PATCH] RED-2224: Fixed missing values in engines --- .../v1/server/redaction/service/EntityRedactionService.java | 4 ++-- .../v1/server/redaction/utils/EntitySearchUtils.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/EntityRedactionService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/EntityRedactionService.java index c643acc1..3bed04e5 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/EntityRedactionService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/EntityRedactionService.java @@ -209,10 +209,10 @@ public class EntityRedactionService { for (DictionaryModel model : dictionary.getDictionaryModels()) { if (model.isCaseInsensitive()) { EntitySearchUtils.addOrAddEngine(found, EntitySearchUtils.find(lowercaseInputString, model.getValues(local), model - .getType(), headline, sectionNumber, !local, model.isDossierDictionary(), Engine.DICTIONARY)); + .getType(), headline, sectionNumber, !local, model.isDossierDictionary(), local ? Engine.RULE : Engine.DICTIONARY)); } else { EntitySearchUtils.addOrAddEngine(found, EntitySearchUtils.find(searchableString, model.getValues(local), model - .getType(), headline, sectionNumber, !local, model.isDossierDictionary(), Engine.DICTIONARY)); + .getType(), headline, sectionNumber, !local, model.isDossierDictionary(), local ? Engine.RULE : Engine.DICTIONARY)); } } diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/utils/EntitySearchUtils.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/utils/EntitySearchUtils.java index 84b76a4e..d514df1e 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/utils/EntitySearchUtils.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/utils/EntitySearchUtils.java @@ -146,11 +146,11 @@ public class EntitySearchUtils { } var existing = existingOptional.get(); - if (dictionary.getDictionaryRank(existing.getType()) <= dictionary.getDictionaryRank(found.getType())) { + if(existing.getType().equals(found.getType())){ + existing.getEngines().addAll(found.getEngines()); + } else if (dictionary.getDictionaryRank(existing.getType()) <= dictionary.getDictionaryRank(found.getType())){ entities.remove(found); entities.add(found); - } else { - existing.getEngines().addAll(found.getEngines()); } } else { entities.add(found);