From 633fb403e0ac82a88fd8a0d334685fec986c016f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominique=20Eifl=C3=A4nder?= Date: Thu, 7 Jan 2021 13:07:21 +0100 Subject: [PATCH] Fixed RegEx for et al. recommendations --- .../service/redaction/v1/server/redaction/model/Section.java | 2 +- .../src/test/resources/drools/rules.drl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/Section.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/Section.java index b8f0e152..1d339dea 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/Section.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/Section.java @@ -144,7 +144,7 @@ public class Section { public void redactByRegEx(String pattern, boolean patternCaseInsensitive, int group, String asType, int ruleNumber, String reason, String legalBasis) { Pattern compiledPattern = Patterns.getCompiledPattern(pattern, patternCaseInsensitive); - Matcher matcher = compiledPattern.matcher(text); + Matcher matcher = compiledPattern.matcher(searchText); while (matcher.find()) { String match = matcher.group(group); diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/rules.drl b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/rules.drl index 8f6cfbdd..0d455e36 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/rules.drl +++ b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/rules.drl @@ -138,7 +138,7 @@ rule "12: Add recommendation for et al. author" when Section(searchText.contains("et al.")) then - section.addRecommendationByRegEx("([^\\s(]*?( \\w\\.?)?) et al\\.?", false, 1, "CBI_author"); + section.addRecommendationByRegEx("\\b([A-ZÄÖÜ][^\\s\\.,]+( [A-ZÄÖÜ]\\.?)?( [A-ZÄÖÜ]\\.?)?) et al\\.?", false, 1, "CBI_author"); end // --------------------------------------- PII rules -------------------------------------------------------------------