Made dictionaries Theadsafe

Pull request #79 : RED-824: Add author recommendations based on vertebrate study tables
Merge in RED/redaction-service from RED-824 to master * commit '608ea4bbcc3943dc8f37d3ad2254dd095edd50fd': RED-824: Add author recommendations based on vertebrate study tables
2020-12-09 16:23:27 +01:00 · 2020-12-07 16:41:08 +01:00 · 2020-12-07 15:53:20 +01:00 · 2020-12-03 15:26:53 +01:00 · 2020-12-03 15:17:33 +01:00 · 2020-11-30 10:39:21 +01:00
29 changed files with 783 additions and 234 deletions
@@ -51,7 +51,7 @@ public class PlanSpec {
    private PlanPermissions createPlanPermission(PlanIdentifier planIdentifier) {
        Permissions permission = new Permissions()
                .userPermissions("atlbamboo", PermissionType.EDIT, PermissionType.VIEW, PermissionType.ADMIN, PermissionType.CLONE, PermissionType.BUILD)
-                .groupPermissions("gin4", PermissionType.EDIT, PermissionType.VIEW, PermissionType.CLONE, PermissionType.BUILD)
+                .groupPermissions("red-backend", PermissionType.EDIT, PermissionType.VIEW, PermissionType.CLONE, PermissionType.BUILD)
                .loggedInUserPermissions(PermissionType.VIEW)
                .anonymousUserPermissionView();
        return new PlanPermissions(planIdentifier.getProjectKey(), planIdentifier.getPlanKey()).permissions(permission);
@@ -134,4 +134,4 @@ public class PlanSpec {
                                .whenInactiveInRepositoryAfterDays(14))
                        .notificationForCommitters());
    }
-}
+}
@@ -22,6 +22,7 @@ public class RedactionLogEntry {
    private String legalBasis;
    private boolean redacted;
    private boolean isHint;
+    private boolean isRecommendation;
    private String section;
    private float[] color;

@@ -20,7 +20,7 @@
        <dependency>
            <groupId>com.iqser.red.service</groupId>
            <artifactId>configuration-service-api-v1</artifactId>
-            <version>1.2.0</version>
+            <version>1.3.7</version>
        </dependency>
        <dependency>
            <groupId>org.drools</groupId>
@@ -27,4 +27,6 @@ public class Document {

    private List<RedactionLogEntry> redactionLogEntities = new ArrayList<>();
    private SectionGrid sectionGrid = new SectionGrid();
+    private long dictionaryVersion;
+    private long rulesVersion;
 }
@@ -72,7 +72,7 @@ public class ClassificationService {
                    document.setHeadlines(true);
                }
            }
-        }else if (!textBlock.getText().startsWith("Table ") && !textBlock.getText().startsWith("Figure ") && PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordFontSize() == document.getFontSizeCounter().getMostPopular() && textBlock.getMostPopularWordStyle().equals("bold") && !document.getFontStyleCounter().getMostPopular().equals("bold") && PositionUtils.getApproxLineCount(textBlock) < 2.9) {
+        }else if (!textBlock.getText().startsWith("Table ") && !textBlock.getText().startsWith("Figure ") && PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordStyle().equals("bold") && !document.getFontStyleCounter().getMostPopular().equals("bold") && PositionUtils.getApproxLineCount(textBlock) < 2.9) {
            textBlock.setClassification("H " + (headlineFontSizes.size() + 1));
            document.setHeadlines(true);
        }
@@ -18,7 +18,6 @@ import com.iqser.red.service.redaction.v1.resources.RedactionResource;
 import com.iqser.red.service.redaction.v1.server.classification.model.Document;
 import com.iqser.red.service.redaction.v1.server.classification.model.Page;
 import com.iqser.red.service.redaction.v1.server.exception.RedactionException;
-import com.iqser.red.service.redaction.v1.server.redaction.service.DictionaryService;
 import com.iqser.red.service.redaction.v1.server.redaction.service.DroolsExecutionService;
 import com.iqser.red.service.redaction.v1.server.redaction.service.EntityRedactionService;
 import com.iqser.red.service.redaction.v1.server.segmentation.PdfSegmentationService;
@@ -40,7 +39,6 @@ public class RedactionController implements RedactionResource {
    private final EntityRedactionService entityRedactionService;
    private final PdfFlattenService pdfFlattenService;
    private final DroolsExecutionService droolsExecutionService;
-    private final DictionaryService dictionaryService;


    @Override
@@ -57,11 +55,11 @@ public class RedactionController implements RedactionResource {
            if (redactionRequest.isFlatRedaction()) {
                PDDocument flatDocument = pdfFlattenService.flattenPDF(pdDocument);
                return convert(flatDocument, classifiedDoc.getPages()
-                        .size(), classifiedDoc.getRedactionLogEntities(), classifiedDoc.getSectionGrid());
+                        .size(), classifiedDoc.getRedactionLogEntities(), classifiedDoc.getSectionGrid(), classifiedDoc.getDictionaryVersion(), classifiedDoc.getRulesVersion());
            }

            return convert(pdDocument, classifiedDoc.getPages()
-                    .size(), classifiedDoc.getRedactionLogEntities(), classifiedDoc.getSectionGrid());
+                    .size(), classifiedDoc.getRedactionLogEntities(), classifiedDoc.getSectionGrid(), classifiedDoc.getDictionaryVersion(), classifiedDoc.getRulesVersion());

        } catch (IOException e) {
            throw new RedactionException(e);
@@ -142,21 +140,20 @@ public class RedactionController implements RedactionResource {

    private RedactionResult convert(PDDocument document, int numberOfPages) throws IOException {

-        return convert(document, numberOfPages, null, null);
+        return convert(document, numberOfPages, null, null, 0, 0);
    }


    private RedactionResult convert(PDDocument document, int numberOfPages,
                                    List<RedactionLogEntry> redactionLogEntities,
-                                    SectionGrid sectionGrid) throws IOException {
+                                    SectionGrid sectionGrid, long dictionaryVersion, long rulesVersion) throws IOException {

        try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
            document.save(byteArrayOutputStream);
            return RedactionResult.builder()
                    .document(byteArrayOutputStream.toByteArray())
                    .numberOfPages(numberOfPages)
-                    .redactionLog(new RedactionLog(redactionLogEntities, dictionaryService.getDictionaryVersion(), droolsExecutionService
-                            .getRulesVersion()))
+                    .redactionLog(new RedactionLog(redactionLogEntities,dictionaryVersion, rulesVersion))
                    .sectionGrid(sectionGrid)
                    .build();
        }
@@ -0,0 +1,82 @@
+package com.iqser.red.service.redaction.v1.server.redaction.model;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.Getter;
+
+@Data
+@AllArgsConstructor
+public class Dictionary {
+
+    public static final String RECOMMENDATION_PREFIX = "recommendation_";
+
+    @Getter
+    private List<DictionaryModel> dictionaryModels;
+    private Map<String, DictionaryModel> localAccessMap;
+
+    @Getter
+    private long version;
+
+
+    public boolean isRecommendation(String type) {
+
+        DictionaryModel model = localAccessMap.get(type);
+        if (model != null) {
+            return model.isRecommendation();
+        }
+        return false;
+    }
+
+
+    public boolean hasLocalEntries() {
+
+        return dictionaryModels.stream().anyMatch(dm -> !dm.getLocalEntries().isEmpty());
+    }
+
+
+    public Set<String> getTypes() {
+
+        return localAccessMap.keySet();
+    }
+
+
+    public boolean containsValue(String type, String value) {
+
+        if (localAccessMap.containsKey(type) && localAccessMap.get(type)
+                .getEntries()
+                .contains(value) || localAccessMap.containsKey(type) && localAccessMap.get(type)
+                .getLocalEntries()
+                .contains(value) || localAccessMap.containsKey(RECOMMENDATION_PREFIX + type) && localAccessMap.get(RECOMMENDATION_PREFIX + type)
+                .getEntries()
+                .contains(value) || localAccessMap.containsKey(RECOMMENDATION_PREFIX + type) && localAccessMap.get(RECOMMENDATION_PREFIX + type)
+                .getLocalEntries()
+                .contains(value)) {
+            return true;
+        }
+        return false;
+    }
+
+
+    public boolean isHint(String type) {
+
+        DictionaryModel model = localAccessMap.get(type);
+        if (model != null) {
+            return model.isHint();
+        }
+        return false;
+    }
+
+    public boolean isCaseInsensitiveDictionary(String type) {
+
+        DictionaryModel dictionaryModel = localAccessMap.get(type);
+        if (dictionaryModel != null) {
+            return dictionaryModel.isCaseInsensitive();
+        }
+        return false;
+    }
+
+}
@@ -0,0 +1,26 @@
+package com.iqser.red.service.redaction.v1.server.redaction.model;
+
+
+import java.util.Set;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class DictionaryModel {
+
+    private String type;
+    private int rank;
+    private float[] color;
+    private boolean caseInsensitive;
+    private boolean hint;
+    private boolean recommendation;
+    private Set<String> entries;
+    private Set<String> localEntries;
+
+    public Set<String> getValues(boolean local){
+        return local ? localEntries : entries;
+    }
+
+}
@@ -1,14 +1,20 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model;

+import static com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary.RECOMMENDATION_PREFIX;
+
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.regex.Matcher;
 import java.util.regex.Pattern;

 import org.apache.commons.lang3.StringUtils;

+import com.iqser.red.service.redaction.v1.server.redaction.utils.Patterns;
+
 import lombok.Builder;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
@@ -18,6 +24,13 @@ import lombok.extern.slf4j.Slf4j;
@Builder
 public class Section {

+    private boolean isLocal;
+
+    private Set<String> dictionaryTypes;
+
+    @Builder.Default
+    private Map<String, Set<String>> localDictionaryAdds = new HashMap<>();
+
    private Set<Entity> entities;

    // This still contains linebreaks etc.
@@ -58,8 +71,11 @@ public class Section {

    public void redact(String type, int ruleNumber, String reason, String legalBasis) {

+        boolean hasRecommendactionDictionary = dictionaryTypes.contains(RECOMMENDATION_PREFIX + type);
+
        entities.forEach(entity -> {
-            if (entity.getType().equals(type)) {
+            if (entity.getType().equals(type) || hasRecommendactionDictionary && entity.getType()
+                    .equals(RECOMMENDATION_PREFIX + type)) {
                entity.setRedaction(true);
                entity.setMatchedRule(ruleNumber);
                entity.setRedactionReason(reason);
@@ -71,8 +87,11 @@ public class Section {

    public void redactNot(String type, int ruleNumber, String reason) {

+        boolean hasRecommendactionDictionary = dictionaryTypes.contains(RECOMMENDATION_PREFIX + type);
+
        entities.forEach(entity -> {
-            if (entity.getType().equals(type)) {
+            if (entity.getType().equals(type) || hasRecommendactionDictionary && entity.getType()
+                    .equals(RECOMMENDATION_PREFIX + type)) {
                entity.setRedaction(false);
                entity.setMatchedRule(ruleNumber);
                entity.setRedactionReason(reason);
@@ -94,13 +113,15 @@ public class Section {
    }


-    public void addHintAnnotation(String value, String asType){
+    public void addHintAnnotation(String value, String asType) {
+
        Set<Entity> found = findEntities(value.trim(), asType, true);
        entities.addAll(found);
    }


-    public void redactLineAfter(String start, String asType, int ruleNumber, String reason, String legalBasis) {
+    public void redactLineAfter(String start, String asType, int ruleNumber, boolean redactEverywhere, String reason,
+                                String legalBasis) {

        String[] values = StringUtils.substringsBetween(text, start, "\n");

@@ -108,6 +129,8 @@ public class Section {
            for (String value : values) {
                if (StringUtils.isNotBlank(value)) {
                    Set<Entity> found = findEntities(value.trim(), asType, false);
+                    // HashSet keeps the older value, but we want the new only.
+                    entities.removeAll(found);
                    entities.addAll(found);
                }
            }
@@ -126,7 +149,8 @@ public class Section {
    }


-    public void redactBetween(String start, String stop, String asType, int ruleNumber, String reason, String legalBasis) {
+    public void redactBetween(String start, String stop, String asType, int ruleNumber, boolean redactEverywhere,
+                              String reason, String legalBasis) {

        String[] values = StringUtils.substringsBetween(searchText, start, stop);

@@ -134,7 +158,47 @@ public class Section {
            for (String value : values) {
                if (StringUtils.isNotBlank(value)) {
                    Set<Entity> found = findEntities(value.trim(), asType, false);
+                    // HashSet keeps the older value, but we want the new only.
+                    entities.removeAll(found);
                    entities.addAll(found);
+                    if (redactEverywhere && !isLocal()) {
+                        localDictionaryAdds.computeIfAbsent(asType, (x) -> new HashSet<>()).add(value.trim());
+                    }
+                }
+            }
+        }
+
+        // TODO No need to iterate
+        entities.forEach(entity -> {
+            if (entity.getType().equals(asType)) {
+                entity.setRedaction(true);
+                entity.setMatchedRule(ruleNumber);
+                entity.setRedactionReason(reason);
+                entity.setLegalBasis(legalBasis);
+            }
+        });
+    }
+
+
+    public void redactLinesBetween(String start, String stop, String asType, int ruleNumber, boolean redactEverywhere,
+                                   String reason, String legalBasis) {
+
+        String[] values = StringUtils.substringsBetween(text, start, stop);
+
+        if (values != null) {
+            for (String value : values) {
+                if (StringUtils.isNotBlank(value)) {
+                    String[] lines = value.split("\n");
+                    for (String line : lines) {
+                        Set<Entity> found = findEntities(line.trim(), asType, false);
+
+                        // HashSet keeps the older value, but we want the new only.
+                        entities.removeAll(found);
+                        entities.addAll(found);
+                        if (redactEverywhere && !isLocal()) {
+                            localDictionaryAdds.computeIfAbsent(asType, (x) -> new HashSet<>()).add(line.trim());
+                        }
+                    }
                }
            }
        }
@@ -158,22 +222,15 @@ public class Section {
        String text = caseinsensitive ? searchText.toLowerCase() : searchText;
        String searchValue = caseinsensitive ? value.toLowerCase() : value;

-
        int startIndex;
        int stopIndex = 0;
        do {
            startIndex = text.indexOf(searchValue, stopIndex);
            stopIndex = startIndex + searchValue.length();

-            if (startIndex > -1 && (startIndex == 0 || Character.isWhitespace(text.charAt(startIndex - 1)) || isSeparator(
-                    text.charAt(startIndex - 1))) && (stopIndex == text.length() || isSeparator(text.charAt(
-                    stopIndex)))) {
-                found.add(new Entity(searchText.substring(startIndex, stopIndex),
-                                     asType,
-                                     startIndex,
-                                     stopIndex,
-                                     headline,
-                                     sectionNumber));
+            if (startIndex > -1 && (startIndex == 0 || Character.isWhitespace(text.charAt(startIndex - 1)) || isSeparator(text
+                    .charAt(startIndex - 1))) && (stopIndex == text.length() || isSeparator(text.charAt(stopIndex)))) {
+                found.add(new Entity(searchText.substring(startIndex, stopIndex), asType, startIndex, stopIndex, headline, sectionNumber));
            }
        } while (startIndex > -1);

@@ -183,8 +240,7 @@ public class Section {

    private boolean isSeparator(char c) {

-        return Character.isWhitespace(c) || Pattern.matches("\\p{Punct}",
-                                                            String.valueOf(c)) || c == '\"' || c == '‘' || c == '’';
+        return Character.isWhitespace(c) || Pattern.matches("\\p{Punct}", String.valueOf(c)) || c == '\"' || c == '‘' || c == '’';
    }


@@ -206,23 +262,26 @@ public class Section {

    public void highlightCell(String cellHeader, int ruleNumber, String type) {

-        annotateCell(cellHeader, ruleNumber, type, false, null, null);
+        annotateCell(cellHeader, ruleNumber, type, false, false, null, null);
    }


-    public void redactCell(String cellHeader, int ruleNumber, String type, String reason, String legalBasis) {
+    public void redactCell(String cellHeader, int ruleNumber, String type, boolean addAsRecommendations, String reason,
+                           String legalBasis) {

-        annotateCell(cellHeader, ruleNumber, type, true, reason, legalBasis);
+        annotateCell(cellHeader, ruleNumber, type, true, addAsRecommendations, reason, legalBasis);
    }


-    public void redactNotCell(String cellHeader, int ruleNumber, String type, String reason) {
+    public void redactNotCell(String cellHeader, int ruleNumber, String type, boolean addAsRecommendations,
+                              String reason) {

-        annotateCell(cellHeader, ruleNumber, type, false, reason, null);
+        annotateCell(cellHeader, ruleNumber, type, false, addAsRecommendations, reason, null);
    }


-    private void annotateCell(String cellHeader, int ruleNumber, String type, boolean redact, String reason, String legalBasis) {
+    private void annotateCell(String cellHeader, int ruleNumber, String type, boolean redact,
+                              boolean addAsRecommendations, String reason, String legalBasis) {

        String cleanHeaderName = cellHeader.replaceAll("\n", "").replaceAll(" ", "").replaceAll("-", "");

@@ -231,17 +290,13 @@ public class Section {
            log.warn("Could not find any data for {}.", cellHeader);
        } else {
            String word = value.toString();
-            Entity entity = new Entity(word,
-                                       type,
-                                       value.getRowSpanStart(),
-                                       value.getRowSpanStart() + word.length(),
-                                       headline,
-                                       sectionNumber);
+
+            Entity entity = new Entity(word, type, value.getRowSpanStart(), value.getRowSpanStart() + word.length(), headline, sectionNumber);
            entity.setRedaction(redact);
            entity.setMatchedRule(ruleNumber);
            entity.setRedactionReason(reason);
            entity.setTargetSequences(value.getTextBlock()
-                                              .getSequences()); // Make sure no other cells with same content are highlighted
+                    .getSequences()); // Make sure no other cells with same content are highlighted
            entity.setLegalBasis(legalBasis);

            // HashSet keeps the older value, but we want the new only.
@@ -249,7 +304,30 @@ public class Section {
            entities.add(entity);

            entities = removeEntitiesContainedInLarger(entities);
+
+            if (addAsRecommendations && !isLocal()) {
+                String cleanedWord = word.replaceAll(",", " ").replaceAll("  ", " ").trim() + " ";
+                Pattern pattern = Patterns.AUTHOR_TABLE_SPITTER;
+                Matcher matcher = pattern.matcher(cleanedWord);
+
+                while (matcher.find()) {
+                    String match = matcher.group().trim();
+                    if (match.length() >= 3) {
+                        localDictionaryAdds.computeIfAbsent(RECOMMENDATION_PREFIX + type, (x) -> new HashSet<>())
+                                .add(match);
+                        String lastname = match.split(" ")[0];
+                        localDictionaryAdds.computeIfAbsent(RECOMMENDATION_PREFIX + type, (x) -> new HashSet<>())
+                                .add(lastname);
+                    }
+                }
+            }
        }
    }

 }
+
+
+
+
+
+
@@ -0,0 +1,13 @@
+package com.iqser.red.service.redaction.v1.server.redaction.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class SectionSearchableTextPair {
+
+    private Section section;
+    private SearchableText searchableText;
+
+}
@@ -2,6 +2,7 @@ package com.iqser.red.service.redaction.v1.server.redaction.service;

 import java.awt.Color;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -16,6 +17,8 @@ import com.iqser.red.service.configuration.v1.api.model.Colors;
 import com.iqser.red.service.configuration.v1.api.model.TypeResponse;
 import com.iqser.red.service.configuration.v1.api.model.TypeResult;
 import com.iqser.red.service.redaction.v1.server.client.DictionaryClient;
+import com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary;
+import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryModel;

 import feign.FeignException;
 import lombok.Getter;
@@ -27,22 +30,14 @@ import lombok.extern.slf4j.Slf4j;
@RequiredArgsConstructor
 public class DictionaryService {

+
    private final DictionaryClient dictionaryClient;

    @Getter
    private long dictionaryVersion = -1;

    @Getter
-    private Map<String, Set<String>> dictionary = new HashMap<>();
-
-    @Getter
-    private Map<String, float[]> entryColors = new HashMap<>();
-
-    @Getter
-    private List<String> hintTypes = new ArrayList<>();
-
-    @Getter
-    private List<String> caseInsensitiveTypes = new ArrayList<>();
+    private List<DictionaryModel> dictionary = new ArrayList<>();

    @Getter
    private float[] defaultColor;
@@ -57,6 +52,10 @@ public class DictionaryService {
    private float[] notRedactedColor;


+    private Map<String, DictionaryModel> localAccessMap = new HashMap<>();
+
+
+
    public void updateDictionary() {

        long version = dictionaryClient.getVersion();
@@ -72,23 +71,16 @@ public class DictionaryService {
        try {
            TypeResponse typeResponse = dictionaryClient.getAllTypes();
            if (typeResponse != null && CollectionUtils.isNotEmpty(typeResponse.getTypes())) {
-                entryColors = typeResponse.getTypes()
-                        .stream()
-                        .collect(Collectors.toMap(TypeResult::getType, t -> convertColor(t.getHexColor())));
-                hintTypes = typeResponse.getTypes()
-                        .stream()
-                        .filter(TypeResult::isHint)
-                        .map(TypeResult::getType)
-                        .collect(Collectors.toList());
-                caseInsensitiveTypes = typeResponse.getTypes()
-                        .stream()
-                        .filter(TypeResult::isCaseInsensitive)
-                        .map(TypeResult::getType)
-                        .collect(Collectors.toList());
-                dictionary = entryColors.keySet()
-                        .stream()
-                        .collect(Collectors.toMap(type -> type, this::convertEntries));

+                dictionary = typeResponse.getTypes()
+                        .stream()
+                        .map(t -> new DictionaryModel(t.getType(), t.getRank(), convertColor(t.getHexColor()), t.isCaseInsensitive(), t
+                                .isHint(), t.isRecommendation(), convertEntries(t), new HashSet<>()))
+                        .sorted(Comparator.comparingInt(DictionaryModel::getRank).reversed())
+                        .collect(Collectors.toList());
+
+                localAccessMap.clear();
+                dictionary.forEach(dm -> localAccessMap.put(dm.getType(), dm));

                Colors colors = dictionaryClient.getColors();
                defaultColor = convertColor(colors.getDefaultColor());
@@ -103,16 +95,30 @@ public class DictionaryService {
    }


-    private Set<String> convertEntries(String s) {
+    public void updateExternalDictionary(Dictionary dictionary){
+        dictionary.getDictionaryModels().forEach(dm -> {
+            if(dm.isRecommendation() && !dm.getLocalEntries().isEmpty()){
+                dictionaryClient.addEntries(dm.getType(), new ArrayList<>(dm.getLocalEntries()), false);
+                long externalVersion = dictionaryClient.getVersion();
+                if(externalVersion == dictionary.getVersion() + 1){
+                    dictionary.setVersion(externalVersion);
+                }
+            }
+        });
+    }

-        if (caseInsensitiveTypes.contains(s)) {
-            return dictionaryClient.getDictionaryForType(s)
+
+    private Set<String> convertEntries(TypeResult t) {
+
+        if (t.isCaseInsensitive()) {
+            return dictionaryClient.getDictionaryForType(t.getType())
                    .getEntries()
                    .stream()
                    .map(String::toLowerCase)
                    .collect(Collectors.toSet());
+        } else {
+            return new HashSet<>(dictionaryClient.getDictionaryForType(t.getType()).getEntries());
        }
-        return new HashSet<>(dictionaryClient.getDictionaryForType(s).getEntries());
    }


@@ -122,4 +128,48 @@ public class DictionaryService {
        return new float[]{color.getRed() / 255f, color.getGreen() / 255f, color.getBlue() / 255f};
    }

+
+    public boolean isCaseInsensitiveDictionary(String type) {
+
+        DictionaryModel dictionaryModel = localAccessMap.get(type);
+        if (dictionaryModel != null) {
+            return dictionaryModel.isCaseInsensitive();
+        }
+        return false;
+    }
+
+
+    public float[] getColor(String type) {
+
+        DictionaryModel model = localAccessMap.get(type);
+        if (model != null) {
+            return model.getColor();
+        }
+        return defaultColor;
+    }
+
+
+    public boolean isHint(String type) {
+
+        DictionaryModel model = localAccessMap.get(type);
+        if (model != null) {
+            return model.isHint();
+        }
+        return false;
+    }
+
+    public boolean isRecommendation(String type) {
+
+        DictionaryModel model = localAccessMap.get(type);
+        if (model != null) {
+            return model.isRecommendation();
+        }
+        return false;
+    }
+
+
+    public Dictionary getThreadSafeDictionary(){
+        return new Dictionary(new ArrayList<>(dictionary), new HashMap<>(localAccessMap), dictionaryVersion);
+    }
+
 }
@@ -7,6 +7,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;

 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -19,10 +21,13 @@ import com.iqser.red.service.redaction.v1.server.classification.model.Document;
 import com.iqser.red.service.redaction.v1.server.classification.model.Paragraph;
 import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
 import com.iqser.red.service.redaction.v1.server.redaction.model.CellValue;
+import com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary;
+import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryModel;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
 import com.iqser.red.service.redaction.v1.server.redaction.model.EntityPositionSequence;
 import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Section;
+import com.iqser.red.service.redaction.v1.server.redaction.model.SectionSearchableTextPair;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Cell;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;

@@ -40,9 +45,60 @@ public class EntityRedactionService {

        dictionaryService.updateDictionary();
        droolsExecutionService.updateRules();
+        long rulesVersion = droolsExecutionService.getRulesVersion();
+
+        Dictionary dictionary = dictionaryService.getThreadSafeDictionary();
+
+        Set<Entity> documentEntities = new HashSet<>(findEntities(classifiedDoc, manualRedactions, dictionary, false, null));
+
+        if (dictionary.hasLocalEntries()) {
+
+            Map<Integer, Set<Entity>> hintsPerSectionNumber = new HashMap<>();
+            documentEntities.stream().forEach(entity -> {
+                if (dictionary.isHint(entity.getType())) {
+                    hintsPerSectionNumber.computeIfAbsent(entity.getSectionNumber(), (x) -> new HashSet<>())
+                            .add(entity);
+                }
+            });
+
+            Set<Entity> foundByLocal = findEntities(classifiedDoc, manualRedactions, dictionary, true, hintsPerSectionNumber);
+            // HashSet keeps the older value, but we want the new only.
+            documentEntities.removeAll(foundByLocal);
+            documentEntities.addAll(foundByLocal);
+
+            removeEntitiesContainedInLarger(documentEntities);
+        }
+
+        for (Entity entity : documentEntities) {
+            Map<Integer, List<EntityPositionSequence>> sequenceOnPage = new HashMap<>();
+            for (EntityPositionSequence entityPositionSequence : entity.getPositionSequences()) {
+                sequenceOnPage.computeIfAbsent(entityPositionSequence.getPageNumber(), (x) -> new ArrayList<>())
+                        .add(entityPositionSequence);
+            }
+
+            for (Map.Entry<Integer, List<EntityPositionSequence>> entry : sequenceOnPage.entrySet()) {
+                classifiedDoc.getEntities()
+                        .computeIfAbsent(entry.getKey(), (x) -> new ArrayList<>())
+                        .add(new Entity(entity.getWord(), entity.getType(), entity.isRedaction(), entity.getRedactionReason(), entry
+                                .getValue(), entity.getHeadline(), entity.getMatchedRule(), entity.getSectionNumber(), entity
+                                .getLegalBasis()));
+            }
+        }
+
+        dictionaryService.updateExternalDictionary(dictionary);
+
+        classifiedDoc.setDictionaryVersion(dictionary.getVersion());
+        classifiedDoc.setRulesVersion(rulesVersion);
+    }
+
+
+    private Set<Entity> findEntities(Document classifiedDoc, ManualRedactions manualRedactions,
+                                     Dictionary dictionary, boolean local,
+                                     Map<Integer, Set<Entity>> hintsPerSectionNumber) {

        Set<Entity> documentEntities = new HashSet<>();
        int sectionNumber = 1;
+        List<SectionSearchableTextPair> sectionSearchableTextPairs = new ArrayList<>();
        for (Paragraph paragraph : classifiedDoc.getParagraphs()) {

            SearchableText searchableText = paragraph.getSearchableText();
@@ -75,64 +131,77 @@ public class EntityRedactionService {
                            searchableRow.addAll(textBlock.getSequences());
                        }
                    }
-                    Set<Entity> rowEntities = findEntities(searchableRow, table.getHeadline(), sectionNumber);
+                    Set<Entity> rowEntities = findEntities(searchableRow, table.getHeadline(), sectionNumber, dictionary.getDictionaryModels(), local);

-                    Section analysedRowSection = droolsExecutionService.executeRules(Section.builder()
-                            .entities(rowEntities)
+                    sectionSearchableTextPairs.add(new SectionSearchableTextPair(Section.builder()
+                            .isLocal(local)
+                            .dictionaryTypes(dictionary.getTypes())
+                            .entities(hintsPerSectionNumber != null && hintsPerSectionNumber.containsKey(sectionNumber) ? Stream
+                                    .concat(rowEntities.stream(), hintsPerSectionNumber.get(sectionNumber).stream())
+                                    .collect(Collectors.toSet()) : rowEntities)
                            .text(searchableRow.getAsStringWithLinebreaks())
                            .searchText(searchableRow.toString())
                            .headline(table.getHeadline())
                            .sectionNumber(sectionNumber)
                            .tabularData(tabularData)
-                            .build());
+                            .build(), searchableRow));

-                    documentEntities.addAll(clearAndFindPositions(analysedRowSection.getEntities(), searchableRow));
                    sectionNumber++;
                }
                sectionNumber++;
            }

            addSectionToManualRedactions(paragraph.getTextBlocks(), manualRedactions, paragraph.getHeadline(), sectionNumber);
-            Set<Entity> entities = findEntities(searchableText, paragraph.getHeadline(), sectionNumber);
-            Section analysedSection = droolsExecutionService.executeRules(Section.builder()
-                    .entities(entities)
+            Set<Entity> entities = findEntities(searchableText, paragraph.getHeadline(), sectionNumber, dictionary.getDictionaryModels(), local);
+
+            sectionSearchableTextPairs.add(new SectionSearchableTextPair(Section.builder()
+                    .isLocal(local)
+                    .dictionaryTypes(dictionary.getTypes())
+                    .entities(hintsPerSectionNumber != null && hintsPerSectionNumber.containsKey(sectionNumber) ? Stream
+                            .concat(entities.stream(), hintsPerSectionNumber.get(sectionNumber).stream())
+                            .collect(Collectors.toSet()) : entities)
                    .text(searchableText.getAsStringWithLinebreaks())
                    .searchText(searchableText.toString())
                    .headline(paragraph.getHeadline())
                    .sectionNumber(sectionNumber)
-                    .build());
+                    .build(), searchableText));

-            documentEntities.addAll(clearAndFindPositions(analysedSection.getEntities(), searchableText));
            sectionNumber++;
        }

-        for (Entity entity : documentEntities) {
-            Map<Integer, List<EntityPositionSequence>> sequenceOnPage = new HashMap<>();
-            for (EntityPositionSequence entityPositionSequence : entity.getPositionSequences()) {
-                sequenceOnPage.computeIfAbsent(entityPositionSequence.getPageNumber(), (x) -> new ArrayList<>())
-                        .add(entityPositionSequence);
-            }
+        sectionSearchableTextPairs.forEach(sectionSearchableTextPair -> {
+            Section analysedRowSection = droolsExecutionService.executeRules(sectionSearchableTextPair.getSection());
+            documentEntities.addAll(clearAndFindPositions(analysedRowSection.getEntities(), sectionSearchableTextPair.getSearchableText(), dictionary));

-            for (Map.Entry<Integer, List<EntityPositionSequence>> entry : sequenceOnPage.entrySet()) {
-                classifiedDoc.getEntities()
-                        .computeIfAbsent(entry.getKey(), (x) -> new ArrayList<>())
-                        .add(new Entity(entity.getWord(), entity.getType(), entity.isRedaction(), entity.getRedactionReason(), entry
-                                .getValue(), entity.getHeadline(), entity.getMatchedRule(), entity.getSectionNumber(), entity.getLegalBasis()));
-            }
-        }
+            analysedRowSection.getLocalDictionaryAdds().keySet().forEach(key -> {
+                if (dictionary.isRecommendation(key)){
+                    analysedRowSection.getLocalDictionaryAdds().get(key).forEach(value -> {
+                        if (!dictionary.containsValue(key, value)){
+                            dictionary.getLocalAccessMap().get(key).getLocalEntries().add(value);
+                        }
+                    });
+                } else {
+                    analysedRowSection.getLocalDictionaryAdds().get(key).forEach( value -> {
+                            dictionary.getLocalAccessMap().get(key).getLocalEntries().add(value);
+                    });
+                }
+            });

+
+        });
+
+        return documentEntities;
    }


-    private Set<Entity> clearAndFindPositions(Set<Entity> entities, SearchableText text) {
+    private Set<Entity> clearAndFindPositions(Set<Entity> entities, SearchableText text, Dictionary dictionary) {

        removeEntitiesContainedInLarger(entities);

        for (Entity entity : entities) {
-            if (dictionaryService.getCaseInsensitiveTypes().contains(entity.getType())) {
-                entity.setPositionSequences(text.getSequences(entity.getWord(), true, entity.getTargetSequences()));
-            } else {
-                entity.setPositionSequences(text.getSequences(entity.getWord(), false, entity.getTargetSequences()));
+            if (entity.getPositionSequences().isEmpty()) {
+                entity.setPositionSequences(text.getSequences(entity.getWord(), dictionary.isCaseInsensitiveDictionary(entity
+                        .getType()), entity.getTargetSequences()));
            }
        }

@@ -140,7 +209,8 @@ public class EntityRedactionService {
    }


-    private Set<Entity> findEntities(SearchableText searchableText, String headline, int sectionNumber) {
+    private Set<Entity> findEntities(SearchableText searchableText, String headline, int sectionNumber,
+                                     List<DictionaryModel> dictionary, boolean local) {

        Set<Entity> found = new HashSet<>();
        String searchableString = searchableText.toString();
@@ -149,16 +219,14 @@ public class EntityRedactionService {
        }

        String lowercaseInputString = searchableString.toLowerCase();
-        for (Map.Entry<String, Set<String>> entry : dictionaryService.getDictionary().entrySet()) {
-            if (dictionaryService.getCaseInsensitiveTypes().contains(entry.getKey())) {
-                found.addAll(find(lowercaseInputString, entry.getValue(), entry.getKey(), headline, sectionNumber));
+        for (DictionaryModel model : dictionary) {
+            if (model.isCaseInsensitive()) {
+                found.addAll(find(lowercaseInputString, model.getValues(local), model.getType(), headline, sectionNumber));
            } else {
-                found.addAll(find(searchableString, entry.getValue(), entry.getKey(), headline, sectionNumber));
+                found.addAll(find(searchableString, model.getValues(local), model.getType(), headline, sectionNumber));
            }
        }
-
        removeEntitiesContainedInLarger(found);
-
        return found;

    }
@@ -196,7 +264,8 @@ public class EntityRedactionService {
        for (Entity word : entities) {
            for (Entity inner : entities) {
                if (inner.getWord().length() < word.getWord()
-                        .length() && inner.getStart() >= word.getStart() && inner.getEnd() <= word.getEnd() && word != inner) {
+                        .length() && inner.getStart() >= word.getStart() && inner.getEnd() <= word.getEnd() && word != inner && word
+                        .getSectionNumber() == inner.getSectionNumber()) {
                    wordsToRemove.add(inner);
                }
            }
@@ -205,7 +274,8 @@ public class EntityRedactionService {
    }


-    private void addSectionToManualRedactions(List<TextBlock> textBlocks, ManualRedactions manualRedactions, String section, int sectionNumber) {
+    private void addSectionToManualRedactions(List<TextBlock> textBlocks, ManualRedactions manualRedactions,
+                                              String section, int sectionNumber) {

        if (manualRedactions == null || manualRedactions.getEntriesToAdd().isEmpty()) {
            return;
@@ -0,0 +1,12 @@
+package com.iqser.red.service.redaction.v1.server.redaction.utils;
+
+import java.util.regex.Pattern;
+
+import lombok.experimental.UtilityClass;
+
+@UtilityClass
+public class Patterns {
+
+    public static Pattern AUTHOR_TABLE_SPITTER = Pattern.compile("((((di)|(van)) )|[A-Z]’)?[A-ZÄÖÜ][\\wäöüéèê]{2,}( ?[A-ZÄÖÜ]{1,2}\\.)+|((((di)|(van)) )|[A-Z]’)?[A-ZÄÖÜ][\\wäöüéèê]{2,}( ?[A-ZÄÖÜ]{1,2} )+");
+
+}
@@ -30,12 +30,14 @@ public class TableExtractionService {

        List<Cell> cells = findCells(cleanRulings.getHorizontal(), cleanRulings.getVertical());

+        List<TextBlock> toBeRemoved = new ArrayList<>();
+
        for (AbstractTextContainer abstractTextContainer : page.getTextBlocks()) {
            TextBlock textBlock = (TextBlock) abstractTextContainer;
            for (Cell cell : cells) {
-                if (cell.intersects(textBlock.getMinX(), textBlock.getMinY(), textBlock.getWidth(),
-                        textBlock.getHeight())) {
+                if (cell.intersects(textBlock.getMinX(), textBlock.getMinY(), textBlock.getWidth(), textBlock.getHeight())) {
                    cell.addTextBlock(textBlock);
+                    toBeRemoved.add(textBlock);
                    break;
                }
            }
@@ -44,7 +46,6 @@ public class TableExtractionService {
        cells = new ArrayList<>(new HashSet<>(cells));
        Utils.sort(cells, Rectangle.ILL_DEFINED_ORDER);

-
        List<Rectangle> spreadsheetAreas = findSpreadsheetsFromCells(cells).stream()
                .filter(r -> r.getWidth() > 0f && r.getHeight() > 0f)
                .collect(Collectors.toList());
@@ -67,25 +68,23 @@ public class TableExtractionService {
            Iterator<AbstractTextContainer> itty = page.getTextBlocks().iterator();
            while (itty.hasNext()) {
                AbstractTextContainer textBlock = itty.next();
-                if (table.contains(textBlock)) {
-                    if (position == -1) {
-                        position = page.getTextBlocks().indexOf(textBlock);
-                    }
-                    itty.remove();
+                if (table.contains(textBlock) && position == -1) {
+                    position = page.getTextBlocks().indexOf(textBlock);
                }
            }
            if (position != -1) {
                page.getTextBlocks().add(position, table);
            }
        }
+
+        page.getTextBlocks().removeAll(toBeRemoved);
    }


    public List<Cell> findCells(List<Ruling> horizontalRulingLines, List<Ruling> verticalRulingLines) {

        List<Cell> cellsFound = new ArrayList<>();
-        Map<Point2D, Ruling[]> intersectionPoints = Ruling.findIntersections(horizontalRulingLines,
-                verticalRulingLines);
+        Map<Point2D, Ruling[]> intersectionPoints = Ruling.findIntersections(horizontalRulingLines, verticalRulingLines);
        List<Point2D> intersectionPointsList = new ArrayList<>(intersectionPoints.keySet());
        intersectionPointsList.sort(POINT_COMPARATOR);

@@ -270,6 +270,7 @@ public class AnnotationHighlightService {
                .type(entity.getType())
                .redacted(entity.isRedaction())
                .isHint(isHint(entity))
+                .isRecommendation(isRecommendation(entity))
                .section(entity.getHeadline())
                .sectionNumber(entity.getSectionNumber())
                .matchedRule(entity.getMatchedRule())
@@ -401,10 +402,7 @@ public class AnnotationHighlightService {
        if (!entity.isRedaction() && !isHint(entity)) {
            return dictionaryService.getNotRedactedColor();
        }
-        if (!dictionaryService.getEntryColors().containsKey(entity.getType())) {
-            return dictionaryService.getDefaultColor();
-        }
-        return dictionaryService.getEntryColors().get(entity.getType());
+        return dictionaryService.getColor(entity.getType());
    }


@@ -420,18 +418,16 @@ public class AnnotationHighlightService {


    private float[] getColor(String type) {
-
-        if (!dictionaryService.getEntryColors().containsKey(type)) {
-            return dictionaryService.getDefaultColor();
-        }
-        return dictionaryService.getEntryColors().get(type);
+        return dictionaryService.getColor(type);
    }


    private boolean isHint(Entity entity) {
+        return dictionaryService.isHint(entity.getType());
+    }

-        List<String> hintTypes = dictionaryService.getHintTypes();
-        return CollectionUtils.isNotEmpty(hintTypes) && hintTypes.contains(entity.getType());
+    private boolean isRecommendation(Entity entity) {
+        return dictionaryService.isRecommendation(entity.getType());
    }


@@ -67,9 +67,9 @@ public class RedactionIntegrationTest {

    private static final String RULES = loadFromClassPath("drools/rules.drl");
    private static final String VERTEBRATE = "vertebrate";
-    private static final String ADDRESS = "address";
-    private static final String AUTHOR = "author";
-    private static final String SPONSOR = "sponsor";
+    private static final String ADDRESS = "CBI_address";
+    private static final String AUTHOR = "CBI_author";
+    private static final String SPONSOR = "CBI_sponsor";
    private static final String NO_REDACTION_INDICATOR = "no_redaction_indicator";
    private static final String REDACTION_INDICATOR = "redaction_indicator";
    private static final String HINT_ONLY = "hint_only";
@@ -77,6 +77,13 @@ public class RedactionIntegrationTest {
    private static final String PUBLISHED_INFORMATION = "published_information";
    private static final String TEST_METHOD = "test_method";

+    private static final String RECOMMENDATION_AUTHOR = "recommendation_CBI_author";
+    private static final String RECOMMENDATION_ADDRESS = "recommendation_CBI_address";
+
+    private static final String FALSE_POSITIVE = "false_positive";
+
+    private static final String PII = "PII";
+
    @Autowired
    private RedactionController redactionController;

@@ -90,6 +97,7 @@ public class RedactionIntegrationTest {
    private final Map<String, String> typeColorMap = new HashMap<>();
    private final Map<String, Boolean> hintTypeMap = new HashMap<>();
    private final Map<String, Boolean> caseInSensitiveMap = new HashMap<>();
+    private final Map<String, Boolean> recommendationTypeMap = new HashMap<>();
    private final Colors colors = new Colors();

    @TestConfiguration
@@ -134,6 +142,10 @@ public class RedactionIntegrationTest {
        when(dictionaryClient.getDictionaryForType(MUST_REDACT)).thenReturn(getDictionaryResponse(MUST_REDACT));
        when(dictionaryClient.getDictionaryForType(PUBLISHED_INFORMATION)).thenReturn(getDictionaryResponse(PUBLISHED_INFORMATION));
        when(dictionaryClient.getDictionaryForType(TEST_METHOD)).thenReturn(getDictionaryResponse(TEST_METHOD));
+        when(dictionaryClient.getDictionaryForType(PII)).thenReturn(getDictionaryResponse(PII));
+        when(dictionaryClient.getDictionaryForType(RECOMMENDATION_AUTHOR)).thenReturn(getDictionaryResponse(RECOMMENDATION_AUTHOR));
+        when(dictionaryClient.getDictionaryForType(RECOMMENDATION_ADDRESS)).thenReturn(getDictionaryResponse(RECOMMENDATION_ADDRESS));
+        when(dictionaryClient.getDictionaryForType(FALSE_POSITIVE)).thenReturn(getDictionaryResponse(FALSE_POSITIVE));
        when(dictionaryClient.getColors()).thenReturn(colors);
    }

@@ -141,12 +153,12 @@ public class RedactionIntegrationTest {
    private void loadDictionaryForTest() {

        dictionary.computeIfAbsent(AUTHOR, v -> new ArrayList<>())
-                .addAll(ResourceLoader.load("dictionaries/author.txt")
+                .addAll(ResourceLoader.load("dictionaries/CBI_author.txt")
                        .stream()
                        .map(this::cleanDictionaryEntry)
                        .collect(Collectors.toSet()));
        dictionary.computeIfAbsent(SPONSOR, v -> new ArrayList<>())
-                .addAll(ResourceLoader.load("dictionaries/sponsor.txt")
+                .addAll(ResourceLoader.load("dictionaries/CBI_sponsor.txt")
                        .stream()
                        .map(this::cleanDictionaryEntry)
                        .collect(Collectors.toSet()));
@@ -156,7 +168,7 @@ public class RedactionIntegrationTest {
                        .map(this::cleanDictionaryEntry)
                        .collect(Collectors.toSet()));
        dictionary.computeIfAbsent(ADDRESS, v -> new ArrayList<>())
-                .addAll(ResourceLoader.load("dictionaries/address.txt")
+                .addAll(ResourceLoader.load("dictionaries/CBI_address.txt")
                        .stream()
                        .map(this::cleanDictionaryEntry)
                        .collect(Collectors.toSet()));
@@ -190,6 +202,26 @@ public class RedactionIntegrationTest {
                        .stream()
                        .map(this::cleanDictionaryEntry)
                        .collect(Collectors.toSet()));
+        dictionary.computeIfAbsent(PII, v -> new ArrayList<>())
+                .addAll(ResourceLoader.load("dictionaries/PII.txt")
+                        .stream()
+                        .map(this::cleanDictionaryEntry)
+                        .collect(Collectors.toSet()));
+        dictionary.computeIfAbsent(RECOMMENDATION_AUTHOR, v -> new ArrayList<>())
+                .addAll(ResourceLoader.load("dictionaries/recommendation_CBI_author.txt")
+                        .stream()
+                        .map(this::cleanDictionaryEntry)
+                        .collect(Collectors.toSet()));
+        dictionary.computeIfAbsent(RECOMMENDATION_ADDRESS, v -> new ArrayList<>())
+                .addAll(ResourceLoader.load("dictionaries/recommendation_CBI_address.txt")
+                        .stream()
+                        .map(this::cleanDictionaryEntry)
+                        .collect(Collectors.toSet()));
+        dictionary.computeIfAbsent(FALSE_POSITIVE, v -> new ArrayList<>())
+                .addAll(ResourceLoader.load("dictionaries/false_positive.txt")
+                        .stream()
+                        .map(this::cleanDictionaryEntry)
+                        .collect(Collectors.toSet()));
    }


@@ -211,7 +243,10 @@ public class RedactionIntegrationTest {
        typeColorMap.put(MUST_REDACT, "#fab4c0");
        typeColorMap.put(PUBLISHED_INFORMATION, "#85ebff");
        typeColorMap.put(TEST_METHOD, "#91fae8");
-
+        typeColorMap.put(PII, "#66ccff");
+        typeColorMap.put(RECOMMENDATION_AUTHOR, "#8df06c");
+        typeColorMap.put(RECOMMENDATION_ADDRESS, "#8df06c");
+        typeColorMap.put(FALSE_POSITIVE, "#ffffff");

        hintTypeMap.put(VERTEBRATE, true);
        hintTypeMap.put(ADDRESS, false);
@@ -223,6 +258,10 @@ public class RedactionIntegrationTest {
        hintTypeMap.put(MUST_REDACT, true);
        hintTypeMap.put(PUBLISHED_INFORMATION, true);
        hintTypeMap.put(TEST_METHOD, true);
+        hintTypeMap.put(PII, false);
+        hintTypeMap.put(RECOMMENDATION_AUTHOR, false);
+        hintTypeMap.put(RECOMMENDATION_ADDRESS, false);
+        hintTypeMap.put(FALSE_POSITIVE, true);

        caseInSensitiveMap.put(VERTEBRATE, true);
        caseInSensitiveMap.put(ADDRESS, false);
@@ -234,6 +273,25 @@ public class RedactionIntegrationTest {
        caseInSensitiveMap.put(MUST_REDACT, true);
        caseInSensitiveMap.put(PUBLISHED_INFORMATION, true);
        caseInSensitiveMap.put(TEST_METHOD, false);
+        caseInSensitiveMap.put(PII, false);
+        caseInSensitiveMap.put(RECOMMENDATION_AUTHOR, false);
+        caseInSensitiveMap.put(RECOMMENDATION_ADDRESS, false);
+        caseInSensitiveMap.put(FALSE_POSITIVE, false);
+
+        recommendationTypeMap.put(VERTEBRATE, false);
+        recommendationTypeMap.put(ADDRESS, false);
+        recommendationTypeMap.put(AUTHOR, false);
+        recommendationTypeMap.put(SPONSOR, false);
+        recommendationTypeMap.put(NO_REDACTION_INDICATOR, false);
+        recommendationTypeMap.put(REDACTION_INDICATOR, false);
+        recommendationTypeMap.put(HINT_ONLY, false);
+        recommendationTypeMap.put(MUST_REDACT, false);
+        recommendationTypeMap.put(PUBLISHED_INFORMATION, false);
+        recommendationTypeMap.put(TEST_METHOD, false);
+        recommendationTypeMap.put(PII, false);
+        recommendationTypeMap.put(RECOMMENDATION_AUTHOR, true);
+        recommendationTypeMap.put(RECOMMENDATION_ADDRESS, true);
+        recommendationTypeMap.put(FALSE_POSITIVE, false);

        colors.setDefaultColor("#acfc00");
        colors.setNotRedacted("#cccccc");
@@ -251,6 +309,7 @@ public class RedactionIntegrationTest {
                        .hexColor(typeColor.getValue())
                        .isHint(hintTypeMap.get(typeColor.getKey()))
                        .isCaseInsensitive(caseInSensitiveMap.get(typeColor.getKey()))
+                        .isRecommendation(recommendationTypeMap.get(typeColor.getKey()))
                        .build())

                .collect(Collectors.toList());
@@ -264,6 +323,7 @@ public class RedactionIntegrationTest {
                .entries(dictionary.get(type))
                .isHint(hintTypeMap.get(type))
                .isCaseInsensitive(caseInSensitiveMap.get(type))
+                .isRecommendation(recommendationTypeMap.get(type))
                .build();
    }

@@ -322,7 +382,7 @@ public class RedactionIntegrationTest {

        System.out.println("redactionTest");
        long start = System.currentTimeMillis();
-        ClassPathResource pdfFileResource = new ClassPathResource("files/Metolachlor/S-Metolachlor_RAR_01_Volume_1_2018-09-06.pdf");
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Fludioxonil/52 Fludioxonil_RAR_07_Volume_3CA_B-5_2018-02-21.pdf");

        RedactionRequest request = RedactionRequest.builder()
                .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))
@@ -331,6 +391,12 @@ public class RedactionIntegrationTest {

        RedactionResult result = redactionController.redact(request);

+        result.getRedactionLog().getRedactionLogEntry().forEach(entry -> {
+            if(entry.isRecommendation()){
+                System.out.println(entry.getValue());
+            }
+        });
+
        try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Redacted.pdf")) {
            fileOutputStream.write(result.getDocument());
        }
@@ -420,7 +486,7 @@ public class RedactionIntegrationTest {
    public void classificationTest() throws IOException {

        System.out.println("classificationTest");
-        ClassPathResource pdfFileResource = new ClassPathResource("files/Fludioxonil/51 Fludioxonil_RAR_02_Volume_2_2018-02-21.pdf");
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Trinexapac/93 Trinexapac-ethyl_RAR_03_Volume_3CA_B-1_2017-03-31.pdf");

        RedactionRequest request = RedactionRequest.builder()
                .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))
@@ -456,7 +522,7 @@ public class RedactionIntegrationTest {
    public void htmlTablesTest() throws IOException {

        System.out.println("htmlTablesTest");
-        ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/line_breaks.pdf");
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Fludioxonil/52 Fludioxonil_RAR_07_Volume_3CA_B-5_2018-02-21.pdf");

        RedactionRequest request = RedactionRequest.builder()
                .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))
@@ -14,8 +14,11 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;

 import org.apache.commons.io.IOUtils;
 import org.apache.pdfbox.pdmodel.PDDocument;
@@ -185,11 +188,11 @@ public class EntityRedactionServiceTest {
                " Supplement - Identity of the active substance - Reference list.pdf");
        when(dictionaryClient.getVersion()).thenReturn(DICTIONARY_VERSION.incrementAndGet());
        DictionaryResponse dictionaryResponse = DictionaryResponse.builder()
-                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/author.txt")))
+                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_author.txt")))
                .build();
        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE)).thenReturn(dictionaryResponse);
        DictionaryResponse addressResponse = DictionaryResponse.builder()
-                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/address.txt")))
+                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_address.txt")))
                .build();
        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE)).thenReturn(addressResponse);
        DictionaryResponse sponsorResponse = DictionaryResponse.builder()
@@ -222,15 +225,15 @@ public class EntityRedactionServiceTest {
        ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/Row With Ambiguous Redaction.pdf");
        when(dictionaryClient.getVersion()).thenReturn(DICTIONARY_VERSION.incrementAndGet());
        DictionaryResponse dictionaryResponse = DictionaryResponse.builder()
-                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/author.txt")))
+                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_author.txt")))
                .build();
        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE)).thenReturn(dictionaryResponse);
        DictionaryResponse addressResponse = DictionaryResponse.builder()
-                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/address.txt")))
+                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_address.txt")))
                .build();
        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE)).thenReturn(addressResponse);
        DictionaryResponse sponsorResponse = DictionaryResponse.builder()
-                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/sponsor.txt")))
+                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_sponsor.txt")))
                .build();
        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE)).thenReturn(sponsorResponse);
        try (PDDocument pdDocument = PDDocument.load(pdfFileResource.getInputStream())) {
@@ -257,32 +260,32 @@ public class EntityRedactionServiceTest {
                "   when\n" +
                "       eval(section.headlineContainsWord(\"applicant\") || section.getText().contains(\"Applicant\"));\n" +
                "   then\n" +
-                "       section.redactLineAfter(\"Name:\", \"address\", 6, \"Applicant information was found\", \"Reg" +
+                "       section.redactLineAfter(\"Name:\", \"address\", 6,true, \"Applicant information was found\", \"Reg" +
                " (EC) No 1107/2009 Art. 63 (2g)\");\n" +
-                "       section.redactBetween(\"Address:\", \"Contact\", \"address\", 6, \"Applicant information was found\", \"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
-                "       section.redactLineAfter(\"Contact point:\",  \"address\", 6, \"Applicant information was found\", \"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
-                "       section.redactLineAfter(\"Phone:\", \"address\", 6, \"Applicant information was found\", " +
+                "       section.redactBetween(\"Address:\", \"Contact\", \"address\", 6,true, \"Applicant information was found\", \"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "       section.redactLineAfter(\"Contact point:\",  \"address\", 6,true, \"Applicant information was found\", \"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "       section.redactLineAfter(\"Phone:\", \"address\", 6,true, \"Applicant information was found\", " +
                "\"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
-                "       section.redactLineAfter(\"Fax:\", \"address\", 6, \"Applicant information was found\", \"Reg " +
+                "       section.redactLineAfter(\"Fax:\", \"address\", 6,true, \"Applicant information was found\", \"Reg " +
                "(EC) No 1107/2009 Art. 63 (2g)\");\n" +
-                "       section.redactLineAfter(\"Tel.:\", \"address\", 6, \"Applicant information was found\", \"Reg" +
+                "       section.redactLineAfter(\"Tel.:\", \"address\", 6,true, \"Applicant information was found\", \"Reg" +
                " (EC) No 1107/2009 Art. 63 (2g)\");\n" +
-                "       section.redactLineAfter(\"Tel:\", \"address\", 6, \"Applicant information was found\", \"Reg " +
+                "       section.redactLineAfter(\"Tel:\", \"address\", 6,true, \"Applicant information was found\", \"Reg " +
                "(EC) No 1107/2009 Art. 63 (2g)\");\n" +
-                "       section.redactLineAfter(\"E-mail:\", \"address\", 6, \"Applicant information was found\", " +
+                "       section.redactLineAfter(\"E-mail:\", \"address\", 6,true, \"Applicant information was found\", " +
                "\"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
-                "       section.redactLineAfter(\"Email:\", \"address\", 6, \"Applicant information was found\", " +
+                "       section.redactLineAfter(\"Email:\", \"address\", 6,true, \"Applicant information was found\", " +
                "\"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
-                "       section.redactLineAfter(\"Contact:\", \"address\", 6, \"Applicant information was found\", " +
+                "       section.redactLineAfter(\"Contact:\", \"address\", 6,true, \"Applicant information was found\", " +
                "\"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
-                "       section.redactLineAfter(\"Telephone number:\", \"address\", 6, \"Applicant information was found\", \"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
-                "       section.redactLineAfter(\"Fax number:\", \"address\", 6, \"Applicant information was found\"," +
+                "       section.redactLineAfter(\"Telephone number:\", \"address\", 6,true, \"Applicant information was found\", \"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "       section.redactLineAfter(\"Fax number:\", \"address\", 6,true, \"Applicant information was found\"," +
                " \"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
-                "       section.redactLineAfter(\"Telephone:\", \"address\", 6, \"Applicant information was found\", " +
+                "       section.redactLineAfter(\"Telephone:\", \"address\", 6,true, \"Applicant information was found\", " +
                "\"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
-                "       section.redactBetween(\"No:\", \"Fax\", \"address\", 6, \"Applicant information was found\", " +
+                "       section.redactBetween(\"No:\", \"Fax\", \"address\", 6,true, \"Applicant information was found\", " +
                "\"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
-                "       section.redactBetween(\"Contact:\", \"Tel.:\", \"address\", 6, \"Applicant information was found\", \"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "       section.redactBetween(\"Contact:\", \"Tel.:\", \"address\", 6,true, \"Applicant information was found\", \"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
                "   end";
        when(rulesClient.getVersion()).thenReturn(RULES_VERSION.incrementAndGet());
        when(rulesClient.getRules()).thenReturn(new RulesResponse(tableRules));
@@ -291,11 +294,11 @@ public class EntityRedactionServiceTest {
        ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/Applicant Producer Table.pdf");
        when(dictionaryClient.getVersion()).thenReturn(DICTIONARY_VERSION.incrementAndGet());
        DictionaryResponse dictionaryResponse = DictionaryResponse.builder()
-                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/author.txt")))
+                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_author.txt")))
                .build();
        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE)).thenReturn(dictionaryResponse);
        DictionaryResponse addressResponse = DictionaryResponse.builder()
-                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/address.txt")))
+                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_address.txt")))
                .build();
        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE)).thenReturn(addressResponse);
        DictionaryResponse sponsorResponse = DictionaryResponse.builder()
@@ -340,7 +343,7 @@ public class EntityRedactionServiceTest {
                .build();
        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE)).thenReturn(authorResponse);
        DictionaryResponse dictionaryResponse = DictionaryResponse.builder()
-                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/sponsor.txt")))
+                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_sponsor.txt")))
                .build();
        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE)).thenReturn(dictionaryResponse);
        try (PDDocument pdDocument = PDDocument.load(pdfFileResource.getInputStream())) {
@@ -446,7 +449,7 @@ public class EntityRedactionServiceTest {
                "    when\n" +
                "        Section(rowEquals(\"Vertebrate study Y/N\", \"N\") || rowEquals(\"Vertebrate study Y/N\", \"No\"))\n" +
                "    then\n" +
-                "        section.redactNotCell(\"Author(s)\", 8,  \"name\", \"Not redacted because row is not a vertebrate study\");\n" +
+                "        section.redactNotCell(\"Author(s)\", 8,  \"name\", false, \"Not redacted because row is not a vertebrate study\");\n" +
                "        section.redactNot(\"address\", 8, \"Not redacted because row is not a vertebrate study\");\n" +
                "        section.highlightCell(\"Vertebrate study Y/N\", 8, \"hint_only\");\n" +
                "    end\n" +
@@ -455,7 +458,7 @@ public class EntityRedactionServiceTest {
                "        Section(rowEquals(\"Vertebrate study Y/N\", \"Y\") || rowEquals(\"Vertebrate study Y/N\", " +
                "\"Yes\"))\n" +
                "    then\n" +
-                "        section.redactCell(\"Author(s)\", 9,  \"name\", \"Redacted because row is a vertebrate study\", \"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "        section.redactCell(\"Author(s)\", 9,  \"name\", false, \"Redacted because row is a vertebrate study\", \"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
                "        section.redact(\"address\", 9, \"Redacted because row is a vertebrate study\", \"Reg (EC) No" +
                " 1107/2009 Art. 63 (2g)\");\n" +
                "        section.highlightCell(\"Vertebrate study Y/N\", 9, \"must_redact\");\n" +
@@ -510,4 +513,28 @@ public class EntityRedactionServiceTest {
        }
    }

+
+    @Test
+    public void testAuthorSplitting(){
+
+        String word = "Porch JR, " + "Kendall TZ, " + "Krueger HO";
+
+        word.replaceAll(",", " ").replaceAll("  ", " ");
+
+        Pattern pattern = Pattern.compile("[A-ZÄÖÜ][\\wäöüéèê]{2,}( [A-ZÄÖÜ]{1,2}\\.)+");
+        Matcher matcher = pattern.matcher(word);
+
+        List<String> allMatches = new ArrayList<>();
+        while (matcher.find()) {
+            allMatches.add(matcher.group());
+        }
+
+        for(String name: allMatches) {
+            if(name.length() >= 3) {
+                System.out.println(name);
+//                dictionaryService.addToLocalDictionary(type, name);
+            }
+        }
+    }
+
 }
@@ -8586,4 +8586,4 @@ Zoriki Hosomi R.
 Zoriki Hosomi Rosana
 Zuberer D
 Zubrod J
-Zwicker R.E.
+Zwicker R.E.
@@ -0,0 +1,10 @@
+Long-term
+Brown liquid
+Brown solid
+Hand-held
+Manual-Hand held
+Manual-Hand held
+Weight:
+Sprague
+Weight and length
+Aeration: Gentle
@@ -1 +0,0 @@
-determination of residues
@@ -167,7 +167,6 @@ sheepshead minnow
 sheepshead minnows
 shrew
 shrews
-Singh
 sorex araneus
 spea multiplicata
 spotted march frog
@@ -5,12 +5,14 @@ import com.iqser.red.service.redaction.v1.server.redaction.model.Section
 global Section section


+// --------------------------------------- CBI rules -------------------------------------------------------------------
+
 rule "1: Redacted because Section contains Vertebrate"
 	when
 		Section(matchesType("vertebrate"))
 	then
-		section.redact("author", 1, "Vertebrate found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
-		section.redact("address", 1, "Vertebrate found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redact("CBI_author", 1, "Vertebrate found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redact("CBI_address", 1, "Vertebrate found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
 	end


@@ -18,8 +20,8 @@ rule "2: Not Redacted because Section contains no Vertebrate"
 	when
 		Section(!matchesType("vertebrate"))
 	then
-		section.redactNot("author", 2, "No Vertebrate found");
-		section.redactNot("address", 2, "No Vertebrate found");
+		section.redactNot("CBI_author", 2, "No Vertebrate found");
+		section.redactNot("CBI_address", 2, "No Vertebrate found");
 	end


@@ -27,8 +29,8 @@ rule "3: Do not redact Names and Addresses if no redaction Indicator is containe
 	when
 		Section(matchesType("vertebrate"), matchesType("no_redaction_indicator"))
 	then
-		section.redactNot("author", 3, "Vertebrate and No Redaction Indicator found");
-		section.redactNot("address", 3, "Vertebrate and No Redaction Indicator found");
+		section.redactNot("CBI_author", 3, "Vertebrate and No Redaction Indicator found");
+		section.redactNot("CBI_address", 3, "Vertebrate and No Redaction Indicator found");
 	end


@@ -36,8 +38,8 @@ rule "4: Do not redact Names and Addresses if no redaction Indicator is containe
 	when
 		Section(matchesType("vertebrate"), matchesType("published_information"))
 	then
-		section.redactNot("author", 4, "Vertebrate and Published Information found");
-		section.redactNot("address", 4, "Vertebrate and Published Information found");
+		section.redactNot("CBI_author", 4, "Vertebrate and Published Information found");
+		section.redactNot("CBI_address", 4, "Vertebrate and Published Information found");
 	end


@@ -45,87 +47,207 @@ rule "5: Redact Names and Addresses if no_redaction_indicator and redaction_indi
 	when
 		Section(matchesType("vertebrate"), matchesType("no_redaction_indicator"), matchesType("redaction_indicator"))
 	then
-		section.redact("author", 5, "Vertebrate and Redaction Indicator found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
-		section.redact("address", 5, "Vertebrate and Redaction Indicator found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redact("CBI_author", 5, "Vertebrate and Redaction Indicator found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redact("CBI_address", 5, "Vertebrate and Redaction Indicator found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
 	end


-rule "6: Redact contact information if applicant is found"
-	when
-		Section(headlineContainsWord("applicant") || text.contains("Applicant") || headlineContainsWord("Primary contact") || headlineContainsWord("Alternative contact") || text.contains("Contact:") || text.contains("Telephone number:"))
-	then
-		section.redactLineAfter("Contact point:",  "address", 6, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
-		section.redactLineAfter("Phone:", "address", 6, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
-		section.redactLineAfter("Fax:", "address", 6, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
-		section.redactLineAfter("Tel.:", "address", 6, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
-		section.redactLineAfter("Tel:", "address", 6, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
-		section.redactLineAfter("E-mail:", "address", 6, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
-		section.redactLineAfter("Email:", "address", 6, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
-		section.redactLineAfter("e-mail:", "address", 6, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
-		section.redactLineAfter("E-mail address:", "address", 6, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
-		section.redactLineAfter("Contact:", "address", 6, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
-		section.redactLineAfter("Alternative contact:", "address", 6, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
-		section.redactLineAfter("Telephone number:", "address", 6, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
-		section.redactLineAfter("Telephone No:", "address", 6, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
-		section.redactLineAfter("Fax number:", "address", 6, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
-		section.redactLineAfter("Telephone:", "address", 6, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
-		section.redactLineAfter("Company:", "address", 6, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
-		section.redactBetween("No:", "Fax", "address", 6, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
-		section.redactBetween("Contact:", "Tel.:", "address", 6, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
-		section.redactLineAfter("European contact:",  "address", 6, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
-	end
-
-
-rule "7: Redact contact information if Producer is found"
-	when
-		Section(text.toLowerCase().contains("producer of the plant protection") || text.toLowerCase().contains("producer of the active substance") || text.contains("Manufacturer of the active substance") || text.contains("Manufacturer:") || text.contains("Producer or producers of the active substance"))
-	then
-		section.redactLineAfter("Contact:", "address", 7, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
-		section.redactLineAfter("Telephone:", "address", 7, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
-		section.redactLineAfter("Phone:", "address", 7, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
-		section.redactLineAfter("Fax:", "address", 7, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
-		section.redactLineAfter("E-mail:", "address", 7, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
-		section.redactLineAfter("Contact:", "address", 7, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
-		section.redactLineAfter("Fax number:", "address", 7, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
-		section.redactLineAfter("Telephone number:", "address", 7, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
-		section.redactLineAfter("Tel:", "address", 7, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
-		section.redactBetween("No:", "Fax", "address", 7, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
-	end
-
-
-rule "8: Not redacted because Vertebrate Study = N"
+rule "6: Not redacted because Vertebrate Study = N"
    when
        Section(rowEquals("Vertebrate study Y/N", "N") || rowEquals("Vertebrate study Y/N", "No"))
    then
-        section.redactNotCell("Author(s)", 8, "author", "Not redacted because row is not a vertebrate study");
-        section.redactNot("address", 8, "Not redacted because row is not a vertebrate study");
-        section.highlightCell("Vertebrate study Y/N", 8, "hint_only");
+        section.redactNotCell("Author(s)", 6, "CBI_author", true, "Not redacted because row is not a vertebrate study");
+        section.redactNot("CBI_author", 6, "Not redacted because row is not a vertebrate study");
+        section.redactNot("CBI_address", 6, "Not redacted because row is not a vertebrate study");
+        section.highlightCell("Vertebrate study Y/N", 6, "hint_only");
    end


-rule "9: Redact if must redact entry is found"
+rule "7: Redact if must redact entry is found"
 	when
 		Section(matchesType("must_redact"))
 	then
-		section.redact("author", 9, "must_redact entry was found.", "Reg (EC) No 1107/2009 Art. 63 (2g)");
-		section.redact("address", 9, "must_redact entry was found.", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redact("CBI_author", 7, "must_redact entry was found.", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redact("CBI_address", 7, "must_redact entry was found.", "Reg (EC) No 1107/2009 Art. 63 (2g)");
 	end


-rule "10: Redact Authors and Addresses in Reference Table if it is a Vertebrate study"
+rule "8: Redact Authors and Addresses in Reference Table if it is a Vertebrate study"
    when
        Section(rowEquals("Vertebrate study Y/N", "Y") || rowEquals("Vertebrate study Y/N", "Yes"))
    then
-        section.redactCell("Author(s)", 10, "author", "Redacted because row is a vertebrate study", "Reg (EC) No 1107/2009 Art. 63 (2g)");
-        section.redact("address", 10, "Redacted because row is a vertebrate study", "Reg (EC) No 1107/2009 Art. 63 (2g)");
-        section.highlightCell("Vertebrate study Y/N", 10, "must_redact");
+        section.redactCell("Author(s)", 8, "CBI_author", true, "Redacted because row is a vertebrate study", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+        section.redact("CBI_address", 8, "Redacted because row is a vertebrate study", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+        section.highlightCell("Vertebrate study Y/N", 8, "must_redact");
    end


-rule "11: Redact sponsor company"
+rule "9: Redact sponsor company"
    when
        Section(searchText.toLowerCase().contains("batches produced at"))
    then
-        section.redactIfPrecededBy("batches produced at", "sponsor", 11, "Redacted because it represents a sponsor company", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+        section.redactIfPrecededBy("batches produced at", "CBI_sponsor", 9, "Redacted because it represents a sponsor company", "Reg (EC) No 1107/2009 Art. 63 (2g)");
        section.addHintAnnotation("batches produced at", "must_redact");
+    end
+
+
+rule "10: Redact determination of residues"
+	when
+		Section(searchText.toLowerCase.contains("determination of residues") && (
+			searchText.toLowerCase.contains("livestock") ||
+			searchText.toLowerCase.contains("live stock") ||
+			searchText.toLowerCase.contains("tissue") ||
+			searchText.toLowerCase.contains("liver") ||
+			searchText.toLowerCase.contains("muscle") ||
+			searchText.toLowerCase.contains("bovine") ||
+			searchText.toLowerCase.contains("ruminant") ||
+			searchText.toLowerCase.contains("ruminants")
+		))
+	then
+		section.redact("CBI_author", 10, "Determination of residues was found.", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redact("CBI_address", 10, "Determination of residues was found.", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.addHintAnnotation("determination of residues", "must_redact");
+		section.addHintAnnotation("livestock", "must_redact");
+		section.addHintAnnotation("live stock", "must_redact");
+		section.addHintAnnotation("tissue", "must_redact");
+		section.addHintAnnotation("liver", "must_redact");
+		section.addHintAnnotation("muscle", "must_redact");
+		section.addHintAnnotation("bovine", "must_redact");
+		section.addHintAnnotation("ruminant", "must_redact");
+		section.addHintAnnotation("ruminants", "must_redact");
+	end
+
+
+rule "11: Redact if CTL/* or BL/*  was found"
+    when
+        Section(searchText.contains("CTL/") || searchText.contains("BL/"))
+    then
+		section.redact("CBI_author", 11, "Laboraty for vertebrate studies found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redact("CBI_address", 11, "Laboraty for vertebrate studies found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.addHintAnnotation("CTL", "must_redact");
+		section.addHintAnnotation("BL", "must_redact");
+    end
+
+
+// --------------------------------------- PII rules -------------------------------------------------------------------
+
+
+rule "12: Redacted PII Personal Identification Information"
+	when
+		Section(matchesType("PII"))
+	then
+		section.redact("PII", 12, "PII (Personal Identification Information) found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+	end
+
+
+rule "13: Redact contact information"
+    when
+       Section(text.contains("Contact point:")
+       || text.contains("Phone:")
+       || text.contains("Fax:")
+       || text.contains("Tel.:")
+       || text.contains("Tel:")
+       || text.contains("E-mail:")
+       || text.contains("Email:")
+       || text.contains("e-mail:")
+       || text.contains("E-mail address:")
+       || text.contains("Alternative contact:")
+       || text.contains("Telephone number:")
+       || text.contains("Telephone No:")
+       || text.contains("Fax number:")
+       || text.contains("Telephone:")
+       || text.contains("European contact:"))
+    then
+      	section.redactLineAfter("Contact point:", "PII", 13, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+      		section.redactLineAfter("Phone:", "PII", 13, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+      		section.redactLineAfter("Fax:", "PII", 13, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+      		section.redactLineAfter("Tel.:", "PII", 13, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+      		section.redactLineAfter("Tel:", "PII", 13, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+      		section.redactLineAfter("E-mail:", "PII", 13, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+      		section.redactLineAfter("Email:", "PII", 13, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+      		section.redactLineAfter("e-mail:", "PII", 13, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+      		section.redactLineAfter("E-mail address:", "PII", 13, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+      		section.redactLineAfter("Contact:", "PII", 13, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+      		section.redactLineAfter("Alternative contact:", "PII", 13, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+      		section.redactLineAfter("Telephone number:", "PII", 13, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+      		section.redactLineAfter("Telephone No:", "PII", 13, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+      		section.redactLineAfter("Fax number:", "PII", 13, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+      		section.redactLineAfter("Telephone:", "PII", 13, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+      		section.redactBetween("No:", "Fax", "PII", 13, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+      		section.redactBetween("Contact:", "Tel.:", "PII", 13, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+      		section.redactLineAfter("European contact:",  "PII", 13, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+     end
+
+
+rule "14: Redact contact information if applicant is found"
+	when
+		Section(headlineContainsWord("applicant") || text.contains("Applicant") || headlineContainsWord("Primary contact") || headlineContainsWord("Alternative contact") || text.contains("Contact:") || text.contains("Telephone number:"))
+	then
+		section.redactLineAfter("Contact point:", "PII", 14, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+		section.redactLineAfter("Phone:", "PII", 14, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+		section.redactLineAfter("Fax:", "PII", 14, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+		section.redactLineAfter("Tel.:", "PII", 14, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+		section.redactLineAfter("Tel:", "PII", 14, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+		section.redactLineAfter("E-mail:", "PII", 14, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+		section.redactLineAfter("Email:", "PII", 14, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+		section.redactLineAfter("e-mail:", "PII", 14, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+		section.redactLineAfter("E-mail address:", "PII", 14, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+		section.redactLineAfter("Contact:", "PII", 14, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+		section.redactLineAfter("Alternative contact:", "PII", 14, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+		section.redactLineAfter("Telephone number:", "PII", 14, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+		section.redactLineAfter("Telephone No:", "PII", 14, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+		section.redactLineAfter("Fax number:", "PII", 14, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+		section.redactLineAfter("Telephone:", "PII", 14, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+		section.redactBetween("No:", "Fax", "PII", 14, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+		section.redactBetween("Contact:", "Tel.:", "PII", 14, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+		section.redactLineAfter("European contact:",  "PII", 14, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+	end
+
+
+rule "15: Redact contact information if Producer is found"
+	when
+		Section(text.toLowerCase().contains("producer of the plant protection") || text.toLowerCase().contains("producer of the active substance") || text.contains("Manufacturer of the active substance") || text.contains("Manufacturer:") || text.contains("Producer or producers of the active substance"))
+	then
+		section.redactLineAfter("Contact:", "PII", 15, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+		section.redactLineAfter("Telephone:", "PII", 15, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+		section.redactLineAfter("Phone:", "PII", 15, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+		section.redactLineAfter("Fax:", "PII", 15, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+		section.redactLineAfter("E-mail:", "PII", 15, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+		section.redactLineAfter("Contact:", "PII", 15, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+		section.redactLineAfter("Fax number:", "PII", 15, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+		section.redactLineAfter("Telephone number:", "PII", 15, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+		section.redactLineAfter("Tel:", "PII", 15, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+		section.redactBetween("No:", "Fax", "PII", 15, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+	end
+
+
+rule "16: Redact AUTHOR(S)"
+    when
+        Section(searchText.contains("AUTHOR(S):"))
+    then
+        section.redactLinesBetween("AUTHOR(S):", "COMPLETION DATE:", "PII", 16, true, "AUTHOR(S) was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+    end
+
+
+rule "17: Redact PERFORMING LABORATORY"
+    when
+        Section(searchText.contains("PERFORMING LABORATORY:"))
+    then
+        section.redactBetween("PERFORMING LABORATORY:", "LABORATORY PROJECT ID:", "PII", 17, true, "PERFORMING LABORATORY was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+    end
+
+
+rule "18: Redact On behalf of Sequani Ltd.:"
+    when
+        Section(searchText.contains("On behalf of Sequani Ltd.: Name Title"))
+    then
+        section.redactBetween("On behalf of Sequani Ltd.: Name Title", "On behalf of", "PII", 18, false , "PII (Personal Identification Information) found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+    end
+
+
+rule "19: Redact On behalf of Syngenta Ltd.:"
+    when
+        Section(searchText.contains("On behalf of Syngenta Ltd.: Name Title"))
+    then
+        section.redactBetween("On behalf of Syngenta Ltd.: Name Title", "Study dates", "PII", 19, false , "PII (Personal Identification Information) found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
    end
Author	SHA1	Message	Date
deiflaender	c9645c3329	Made dictionaries Theadsafe	2020-12-09 16:23:27 +01:00
Dominique Eiflaender	3f69030b03	Pull request #79 : RED-824: Add author recommendations based on vertebrate study tables Merge in RED/redaction-service from RED-824 to master * commit '608ea4bbcc3943dc8f37d3ad2254dd095edd50fd': RED-824: Add author recommendations based on vertebrate study tables	2020-12-07 16:41:08 +01:00
deiflaender	608ea4bbcc	RED-824: Add author recommendations based on vertebrate study tables	2020-12-07 15:53:20 +01:00
Dominique Eiflaender	9b7deca3db	Pull request #78 : Fixed duplicate Textblock in Tables Merge in RED/redaction-service from FixDuplicate to master * commit 'c90eee23c4f9f1fbc319cedb3c2aa8ce63a72101': Fixed duplicate Textblock in Tables	2020-12-03 15:26:53 +01:00
deiflaender	c90eee23c4	Fixed duplicate Textblock in Tables	2020-12-03 15:17:33 +01:00
Dominique Eiflaender	8619e51480	Pull request #77 : RED-740: Improved section recognition Merge in RED/redaction-service from RED-740 to master * commit '4ef6e0e2ef26ccea6d094f7ddcb8bc9c7e122d3a': RED-740: Improved section recognition	2020-11-30 10:39:21 +01:00
deiflaender	4ef6e0e2ef	RED-740: Improved section recognition	2020-11-27 15:39:31 +01:00
Timo Bejan	0f0f6b3a2e	Pull request #76 : Added rank of dictionary to processing entities in redaction service, simplified code Merge in RED/redaction-service from feature/RED-786 to master * commit '3c4d6dd2f24ccbb1330657c2f7e396b8f91bb671': fixed awt auto * fixed Tests & fallback removed import Added rank of dictionary to processing entities in redaction service, simplified code	2020-11-26 19:29:02 +01:00
Timo	3c4d6dd2f2	fixed awt auto *	2020-11-26 20:20:43 +02:00
Timo	0e645ab273	fixed Tests & fallback	2020-11-26 20:12:36 +02:00
Timo	cc1a3c9e49	removed import	2020-11-26 18:56:02 +02:00
Timo	536d4689f3	Added rank of dictionary to processing entities in redaction service, simplified code	2020-11-26 18:52:44 +02:00
Christoph Schabert	f458a1f930	PlanSpec.java edited online with Bitbucket	2020-11-26 13:37:27 +01:00
Dominique Eiflaender	3c942aba15	Pull request #75 : Rename sponsor dictionary to CBI_sponsor Merge in RED/redaction-service from CBI_sponsor to master * commit 'd466d9b0328d04967b9026a45ff57d49b7f89ec6': Rename sponsor dictionary to CBI_sponsor	2020-11-26 12:17:43 +01:00
deiflaender	d466d9b032	Rename sponsor dictionary to CBI_sponsor	2020-11-26 12:09:19 +01:00
Dominique Eiflaender	5510fb9eb4	Pull request #74 : RED-783: Seperate rules for PII and CBI, RED-780: Added PII rules for author(s) and performing laboratory Merge in RED/redaction-service from RED-783 to master * commit '746a25c00d1f30cdc13badaed329eaaa12ea19c8': RED-783: Seperate rules for PII and CBI, RED-780: Added PII rules for author(s) and performing laboratory	2020-11-26 09:50:15 +01:00
deiflaender	746a25c00d	RED-783: Seperate rules for PII and CBI, RED-780: Added PII rules for author(s) and performing laboratory	2020-11-26 09:36:26 +01:00