From 6bc5a6a1351f39bd1815b4fa288faf7bce82b1eb Mon Sep 17 00:00:00 2001 From: deiflaender Date: Fri, 12 Aug 2022 11:29:01 +0200 Subject: [PATCH] RED-3974: Do not add header to header row --- .../v1/server/redaction/service/SectionTextBuilderService.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/service/SectionTextBuilderService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/SectionTextBuilderService.java index bc550d43..37711565 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/SectionTextBuilderService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/SectionTextBuilderService.java @@ -163,7 +163,7 @@ public class SectionTextBuilderService { return buildHeaderName(currentCell.getHeaderCells().get(currentCell.getHeaderCells().size() - 1)); } - if (!hasHeader && currentRowSize == firstRow.size()) { + if (!hasHeader && currentRowSize == firstRow.size() && currentCell != firstRow.get(cellNum)) { return buildHeaderName(firstRow.get(cellNum)); } 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 8e7122a6..d9d1622d 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 @@ -389,5 +389,5 @@ rule "101: Redact CAS numbers" when Section(hasTableHeader("Sample #")) then - section.redactByRegEx("\\b[1-9]{1}[0-9]{1,5}-\\d{2}-\\R?\\d{1,2}\\b", true, 0, "PII", 101, "compound/sample identifier", "Article 4(2) first indent of Regulation No. 1049/2001"); + section.redactCell("Sample #", 8, "PII", true, "Redacted because row is a vertebrate study", "Reg (EC) No 1107/2009 Art. 63 (2g)"); end \ No newline at end of file