Marmelator/redaction-service
1
0
Fork 0
Code Issues Pull Requests 14 Actions Packages Projects Releases 622 Wiki Activity

Avoid duplicate redaction if type have same entries, made Applicant and Producer rules more specific

Browse Source
This commit is contained in:
deiflaender 2020-08-07 12:09:24 +02:00
parent d465a4ba5b
commit 7d0b0ed3d0
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/Entity.java
View File

@ -12,6 +12,8 @@ import lombok.EqualsAndHashCode;
public class Entity {
private final String word;
@EqualsAndHashCode.Exclude
private final String type;
@EqualsAndHashCode.Exclude

5
redaction-service-v1/redaction-service-server-v1/src/test/resources/dictionaries/addresses.txt
View File

@ -802,4 +802,7 @@ Syngenta Crop Protection AG European Product Registration B8.4.29 Scharzwaldalll
Adama Agriculture BV Arnhemseweg 87 NL-3832 GK Leusden The Netherlands
Eurofins Regulatory AG Weidenweg 15 CH-4310 Rheinfelden Switzerland
Cheminova A/S Thyborønvej 78, DK-7673 Harboøre, Denmark P.O. Box 9 DK-7620 Lemvig Denmark
Helm AG Nordkanalstrasse 28 20097 Hamburg Germany
Helm AG Nordkanalstrasse 28 20097 Hamburg Germany
ADAMA Agriculture B.V. Arnhemseweg 87 NL-3832 GK Leusden The Netherlands
Adama Agriculture BV
Cheminova A/S Thyborønvej 78, DK-7673 Harboøre, Denmark

7
redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/rules.drl
View File

@ -60,7 +60,7 @@ rule "6: Redact if must redact entry is found"
rule "7: Redact contact information, if applicant is found"
when
eval(section.getText().toLowerCase().contains("applicant") == true);
eval(section.headlineContainsWord("applicant") || section.getText().contains("Applicant"));
then
section.redactLineAfter("Name:", "address", 7, "Applicant information was found");
section.redactBetween("Address:", "Contact", "address", 7, "Applicant information was found");
@ -81,7 +81,7 @@ rule "7: Redact contact information, if applicant is found"
rule "8: Redact contact information, if Producer is found"
when
eval(section.getText().contains("Producer") || section.getText().contains("Manufacturer of the active substance") || section.getText().contains("Manufacturer:"));
eval(section.getText().toLowerCase().contains("producer of the plant protection") || section.getText().toLowerCase().contains("producer of the active substance") || section.getText().contains("Manufacturer of the active substance") || section.getText().contains("Manufacturer:") || section.getText().contains("Producer or producers of the active substance"));
then
section.redactLineAfter("Name:", "address", 8, "Producer was found");
section.redactBetween("Address:", "Contact", "address", 8, "Producer was found");
@ -97,4 +97,5 @@ rule "8: Redact contact information, if Producer is found"
section.redactLineAfter("Telephone number:", "address", 8, "Producer was found");
section.redactLineAfter("Tel:", "address", 8, "Producer was found");
section.redactBetween("No:", "Fax", "address", 8, "Producer was found");
end
end