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
46 changed files with 3513 additions and 2212 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());
    }
-}
+}
@@ -7,3 +7,12 @@ ENV PLATFORM_JAR ${PLATFORM_JAR}
 ENV USES_ELASTICSEARCH false

 COPY ["${PLATFORM_JAR}", "/"]
+
+RUN apt-get update \
+ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+    wget cabextract xfonts-utils fonts-liberation \
+ && rm -rf /var/lib/apt/lists/*
+
+RUN curl http://ftp.br.debian.org/debian/pool/contrib/m/msttcorefonts/ttf-mscorefonts-installer_3.7_all.deb -o /tmp/ttf-mscorefonts-installer_3.7_all.deb \
+ && dpkg -i /tmp/ttf-mscorefonts-installer_3.7_all.deb \
+ && rm /tmp/ttf-mscorefonts-installer_3.7_all.deb \
@@ -0,0 +1,16 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class CellRectangle {
+
+    private Point topLeft;
+    private float width;
+    private float height;
+
+}
@@ -16,4 +16,4 @@ public class IdRemoval {
    private Status status;
    private boolean removeFromDictionary;

-}
+}
@@ -0,0 +1,5 @@
+package com.iqser.red.service.redaction.v1.model;
+
+public enum ManualRedactionType {
+    ADD, REMOVE
+}
@@ -18,9 +18,11 @@ public class RedactionLogEntry {
    private String type;
    private String value;
    private String reason;
+    private int matchedRule;
    private String legalBasis;
    private boolean redacted;
    private boolean isHint;
+    private boolean isRecommendation;
    private String section;
    private float[] color;

@@ -29,5 +31,6 @@ public class RedactionLogEntry {
    private int sectionNumber;
    private boolean manual;
    private Status status;
+    private ManualRedactionType manualRedactionType;

 }
@@ -14,5 +14,6 @@ public class RedactionResult {
    private byte[] document;
    private int numberOfPages;
    private RedactionLog redactionLog;
+    private SectionGrid sectionGrid;

 }
@@ -0,0 +1,18 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class SectionGrid {
+
+    private Map<Integer, List<SectionRectangle>> rectanglesPerPage = new HashMap<>();
+
+}
@@ -0,0 +1,33 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import java.util.List;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@RequiredArgsConstructor
+public class SectionRectangle {
+
+    @NonNull
+    private Point topLeft;
+
+    @NonNull
+    private float width;
+
+    @NonNull
+    private float height;
+
+    @NonNull
+    private int part;
+
+    @NonNull
+    private int numberOfParts;
+
+    private List<CellRectangle> tableCells;
+}
@@ -20,7 +20,7 @@
        <dependency>
            <groupId>com.iqser.red.service</groupId>
            <artifactId>configuration-service-api-v1</artifactId>
-            <version>1.1.7</version>
+            <version>1.3.7</version>
        </dependency>
        <dependency>
            <groupId>org.drools</groupId>
@@ -6,6 +6,7 @@ import java.util.List;
 import java.util.Map;

 import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
+import com.iqser.red.service.redaction.v1.model.SectionGrid;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;

 import lombok.Data;
@@ -25,4 +26,7 @@ public class Document {
    private boolean headlines;

    private List<RedactionLogEntry> redactionLogEntities = new ArrayList<>();
+    private SectionGrid sectionGrid = new SectionGrid();
+    private long dictionaryVersion;
+    private long rulesVersion;
 }
@@ -97,13 +97,7 @@ public class TextBlock extends AbstractTextContainer {
        this.maxY = Math.max(y1, y2);
    }

-    public float getHeight() {
-        return maxY - minY;
-    }

-    public float getWidth() {
-        return maxX - minX;
-    }

    @Override
    public String toString() {
@@ -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);
        }
@@ -13,11 +13,11 @@ import com.iqser.red.service.redaction.v1.model.RedactionLog;
 import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
 import com.iqser.red.service.redaction.v1.model.RedactionRequest;
 import com.iqser.red.service.redaction.v1.model.RedactionResult;
+import com.iqser.red.service.redaction.v1.model.SectionGrid;
 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;
@@ -39,7 +39,7 @@ public class RedactionController implements RedactionResource {
    private final EntityRedactionService entityRedactionService;
    private final PdfFlattenService pdfFlattenService;
    private final DroolsExecutionService droolsExecutionService;
-    private final DictionaryService dictionaryService;
+

    @Override
    public RedactionResult redact(@RequestBody RedactionRequest redactionRequest) {
@@ -49,14 +49,17 @@ public class RedactionController implements RedactionResource {

            Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
            entityRedactionService.processDocument(classifiedDoc, redactionRequest.getManualRedactions());
-            annotationHighlightService.highlight(pdDocument, classifiedDoc, redactionRequest.isFlatRedaction(), redactionRequest.getManualRedactions());
+            annotationHighlightService.highlight(pdDocument, classifiedDoc, redactionRequest.isFlatRedaction(), redactionRequest
+                    .getManualRedactions());

            if (redactionRequest.isFlatRedaction()) {
                PDDocument flatDocument = pdfFlattenService.flattenPDF(pdDocument);
-                return convert(flatDocument, classifiedDoc.getPages().size(), classifiedDoc.getRedactionLogEntities());
+                return convert(flatDocument, classifiedDoc.getPages()
+                        .size(), classifiedDoc.getRedactionLogEntities(), classifiedDoc.getSectionGrid(), classifiedDoc.getDictionaryVersion(), classifiedDoc.getRulesVersion());
            }

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

        } catch (IOException e) {
            throw new RedactionException(e);
@@ -64,6 +67,7 @@ public class RedactionController implements RedactionResource {

    }

+
    @Override
    public RedactionResult classify(@RequestBody RedactionRequest pdfSegmentationRequest) {

@@ -81,6 +85,7 @@ public class RedactionController implements RedactionResource {

    }

+
    @Override
    public RedactionResult sections(@RequestBody RedactionRequest redactionRequest) {

@@ -98,6 +103,7 @@ public class RedactionController implements RedactionResource {

    }

+
    @Override
    public RedactionResult htmlTables(@RequestBody RedactionRequest redactionRequest) {

@@ -124,24 +130,31 @@ public class RedactionController implements RedactionResource {

    }

+
    @Override
    public void updateRules(@RequestBody String rules) {
+
        droolsExecutionService.updateRules(rules);
    }


    private RedactionResult convert(PDDocument document, int numberOfPages) throws IOException {
-        return convert(document, numberOfPages, null);
+
+        return convert(document, numberOfPages, null, null, 0, 0);
    }

-    private RedactionResult convert(PDDocument document, int numberOfPages, List<RedactionLogEntry> redactionLogEntities) throws IOException {
+
+    private RedactionResult convert(PDDocument document, int numberOfPages,
+                                    List<RedactionLogEntry> redactionLogEntities,
+                                    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,14 +113,24 @@ public class Section {
    }


-    public void redactLineAfter(String start, String asType, int ruleNumber, String reason, String legalBasis) {
+    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, boolean redactEverywhere, String reason,
+                                String legalBasis) {

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

        if (values != null) {
            for (String value : values) {
                if (StringUtils.isNotBlank(value)) {
-                    Set<Entity> found = findEntities(value.trim(), asType);
+                    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);
                }
            }
@@ -120,15 +149,21 @@ 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);

        if (values != null) {
            for (String value : values) {
                if (StringUtils.isNotBlank(value)) {
-                    Set<Entity> found = findEntities(value.trim(), asType);
+                    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());
+                    }
                }
            }
        }
@@ -145,25 +180,57 @@ public class Section {
    }


-    private Set<Entity> findEntities(String value, String asType) {
+    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());
+                        }
+                    }
+                }
+            }
+        }
+
+        // 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);
+            }
+        });
+    }
+
+
+    private Set<Entity> findEntities(String value, String asType, boolean caseinsensitive) {

        Set<Entity> found = new HashSet<>();

+        String text = caseinsensitive ? searchText.toLowerCase() : searchText;
+        String searchValue = caseinsensitive ? value.toLowerCase() : value;
+
        int startIndex;
        int stopIndex = 0;
        do {
-            startIndex = searchText.indexOf(value, stopIndex);
-            stopIndex = startIndex + value.length();
+            startIndex = text.indexOf(searchValue, stopIndex);
+            stopIndex = startIndex + searchValue.length();

-            if (startIndex > -1 && (startIndex == 0 || Character.isWhitespace(searchText.charAt(startIndex - 1)) || isSeparator(
-                    searchText.charAt(startIndex - 1))) && (stopIndex == searchText.length() || isSeparator(searchText.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);

@@ -173,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 == '’';
    }


@@ -196,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("-", "");

@@ -221,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.
@@ -239,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;
@@ -18,7 +18,7 @@ public class IdBuilder {

        StringBuilder sb = new StringBuilder();
        crossSequenceParts.forEach(sequencePart -> sequencePart.getTextPositions().forEach(textPosition -> {
-            sb.append(textPosition.getTextMatrix());
+            sb.append(textPosition.getTextMatrix()).append(sequencePart.getPage());
        }));

        return hashFunction.hashString(sb.toString(), StandardCharsets.UTF_8).toString();
@@ -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} )+");
+
+}
@@ -39,7 +39,7 @@ public class SectionsBuilderService {

                current.setPage(page.getPageNumber());

-                if (prev != null && current.getClassification().startsWith("H ") || !document.isHeadlines()) {
+                if (prev != null && current.getClassification().startsWith("H ") && !prev.getClassification().startsWith("H ") || !document.isHeadlines()) {
                    Paragraph chunkBlock = buildTextBlock(chunkWords, lastHeadline);
                    chunkBlock.setHeadline(lastHeadline);
                    if(document.isHeadlines()) {
@@ -28,4 +28,12 @@ public abstract class AbstractTextContainer {
        return page == other.getPage() && this.minX <= other.getTopLeft().getX() && this.maxX >= other.getTopLeft().getX() + other.getWidth() && this.minY <= other.getTopLeft().getY()  && this.maxY >= other.getTopLeft().getY() + other.getHeight();
    }

+    public float getHeight() {
+        return maxY - minY;
+    }
+
+    public float getWidth() {
+        return maxX - minX;
+    }
+
 }
@@ -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);

@@ -23,12 +23,16 @@ import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationTextMarkup;
 import org.apache.pdfbox.text.TextPosition;
 import org.springframework.stereotype.Service;

+import com.iqser.red.service.redaction.v1.model.CellRectangle;
 import com.iqser.red.service.redaction.v1.model.Comment;
 import com.iqser.red.service.redaction.v1.model.IdRemoval;
 import com.iqser.red.service.redaction.v1.model.ManualRedactionEntry;
+import com.iqser.red.service.redaction.v1.model.ManualRedactionType;
 import com.iqser.red.service.redaction.v1.model.ManualRedactions;
+import com.iqser.red.service.redaction.v1.model.Point;
 import com.iqser.red.service.redaction.v1.model.Rectangle;
 import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
+import com.iqser.red.service.redaction.v1.model.SectionRectangle;
 import com.iqser.red.service.redaction.v1.model.Status;
 import com.iqser.red.service.redaction.v1.server.classification.model.Document;
 import com.iqser.red.service.redaction.v1.server.classification.model.Paragraph;
@@ -94,17 +98,30 @@ public class AnnotationHighlightService {

        List<PDAnnotation> annotations = pdPage.getAnnotations();

+        // Duplicates can exist due table extraction colums over multiple rows.
+        Set<String> processedIds = new HashSet<>();
+
+        entityLoop:
        for (Entity entity : classifiedDoc.getEntities().get(page)) {

            if (flatRedaction && !isRedactionType(entity)) {
                continue;
            }

-            RedactionLogEntry redactionLogEntry = createRedactionLogEntry(entity);
            boolean requestedToRemove = false;
            List<Comment> comments = null;
+
            for (EntityPositionSequence entityPositionSequence : entity.getPositionSequences()) {

+                RedactionLogEntry redactionLogEntry = createRedactionLogEntry(entity);
+                if (processedIds.contains(entityPositionSequence.getId())) {
+
+                    // TODO refactor this outer loop jump as soon as we have the time.
+                    continue entityLoop;
+                } else {
+                    processedIds.add(entityPositionSequence.getId());
+                }
+
                if (manualRedactions != null && !manualRedactions.getIdsToRemove().isEmpty()) {
                    for (IdRemoval manualRemoval : manualRedactions.getIdsToRemove()) {
                        if (manualRemoval.getId().equals(entityPositionSequence.getId())) {
@@ -118,11 +135,15 @@ public class AnnotationHighlightService {
                            } else if (manualRemoval.getStatus().equals(Status.REQUESTED)) {
                                requestedToRemove = true;
                                manualOverrideReason = entity.getRedactionReason() + ", requested to remove";
+                                redactionLogEntry.setStatus(Status.REQUESTED);
+                            } else {
+                                redactionLogEntry.setStatus(Status.DECLINED);
                            }

                            entity.setRedactionReason(manualOverrideReason != null ? manualOverrideReason : entity.getRedactionReason());
                            redactionLogEntry.setReason(manualOverrideReason);
                            redactionLogEntry.setManual(true);
+                            redactionLogEntry.setManualRedactionType(ManualRedactionType.REMOVE);
                        }
                    }

@@ -139,12 +160,18 @@ public class AnnotationHighlightService {
                    }

                    redactionLogEntry.getPositions().addAll(rectanglesPerLine);
+
                    annotations.addAll(createAnnotation(rectanglesPerLine, entityPositionSequence.getId(), createAnnotationContent(entity), getColor(entity, requestedToRemove), comments, !isHint(entity)));
                }

                redactionLogEntry.setId(entityPositionSequence.getId());
+
+                // FIXME ids should never be null. Figure out why this happens.
+                if (redactionLogEntry.getId() != null) {
+                    classifiedDoc.getRedactionLogEntities().add(redactionLogEntry);
+                }
            }
-            classifiedDoc.getRedactionLogEntities().add(redactionLogEntry);
+
        }

    }
@@ -228,6 +255,7 @@ public class AnnotationHighlightService {
                .sectionNumber(manualRedactionEntry.getSectionNumber())
                .manual(true)
                .status(manualRedactionEntry.getStatus())
+                .manualRedactionType(ManualRedactionType.ADD)
                .build();
    }

@@ -242,8 +270,10 @@ public class AnnotationHighlightService {
                .type(entity.getType())
                .redacted(entity.isRedaction())
                .isHint(isHint(entity))
+                .isRecommendation(isRecommendation(entity))
                .section(entity.getHeadline())
                .sectionNumber(entity.getSectionNumber())
+                .matchedRule(entity.getMatchedRule())
                .build();
    }

@@ -372,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());
    }


@@ -391,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());
    }


@@ -424,11 +449,27 @@ public class AnnotationHighlightService {
                    continue;
                }
                if (textBlock instanceof TextBlock) {
+
                    textBlock.setClassification((i + 1) + "/" + paragraph.getPageBlocks().size());
                    visualizeTextBlock((TextBlock) textBlock, contentStream);
+
+                    classifiedDoc.getSectionGrid()
+                            .getRectanglesPerPage()
+                            .computeIfAbsent(page, (x) -> new ArrayList<>())
+                            .add(new SectionRectangle(new Point(textBlock.getMinX(), textBlock.getMinY()), textBlock.getWidth(), textBlock
+                                    .getHeight(), i + 1, paragraph.getPageBlocks().size()));
+
                } else if (textBlock instanceof Table) {
+
                    textBlock.setClassification((i + 1) + "/" + paragraph.getPageBlocks().size());
-                    visualizeTable((Table) textBlock, contentStream);
+                    List<CellRectangle> cellRectangles = visualizeTable((Table) textBlock, contentStream);
+
+                    classifiedDoc.getSectionGrid()
+                            .getRectanglesPerPage()
+                            .computeIfAbsent(page, (x) -> new ArrayList<>())
+                            .add(new SectionRectangle(new Point(textBlock.getMinX(), textBlock.getMinY()), textBlock.getWidth(), textBlock
+                                    .getHeight(), i + 1, paragraph.getPageBlocks().size(), cellRectangles));
+
                }
            }
        }
@@ -454,8 +495,9 @@ public class AnnotationHighlightService {
    }


-    private void visualizeTable(Table table, PDPageContentStream contentStream) throws IOException {
+    private List<CellRectangle> visualizeTable(Table table, PDPageContentStream contentStream) throws IOException {

+        List<CellRectangle> cellRectangles = new ArrayList<>();
        for (List<Cell> row : table.getRows()) {
            for (Cell cell : row) {

@@ -465,6 +507,8 @@ public class AnnotationHighlightService {
                    contentStream.addRect((float) cell.getX(), (float) cell.getY(), (float) cell.getWidth(), (float) cell
                            .getHeight());
                    contentStream.stroke();
+                    cellRectangles.add(new CellRectangle(new Point((float) cell.getX(), (float) cell.getY()), (float) cell
+                            .getWidth(), (float) cell.getHeight()));
                }
            }
        }
@@ -477,6 +521,8 @@ public class AnnotationHighlightService {
            contentStream.showText(table.getClassification());
            contentStream.endText();
        }
+
+        return cellRectangles;
    }

 }
@@ -51,6 +51,7 @@ import com.iqser.red.service.redaction.v1.model.ManualRedactionEntry;
 import com.iqser.red.service.redaction.v1.model.ManualRedactions;
 import com.iqser.red.service.redaction.v1.model.Point;
 import com.iqser.red.service.redaction.v1.model.Rectangle;
+import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
 import com.iqser.red.service.redaction.v1.model.RedactionRequest;
 import com.iqser.red.service.redaction.v1.model.RedactionResult;
 import com.iqser.red.service.redaction.v1.model.Status;
@@ -65,14 +66,23 @@ import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizati
 public class RedactionIntegrationTest {

    private static final String RULES = loadFromClassPath("drools/rules.drl");
-    private static final String VERTEBRATES_CODE = "vertebrate";
-    private static final String ADDRESS_CODE = "address";
-    private static final String NAME_CODE = "name";
-    private static final String SPONSOR = "sponsor";
+    private static final String VERTEBRATE = "vertebrate";
+    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";
    private static final String MUST_REDACT = "must_redact";
+    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;
@@ -87,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
@@ -121,37 +132,43 @@ public class RedactionIntegrationTest {
        loadTypeForTest();
        when(dictionaryClient.getVersion()).thenReturn(0L);
        when(dictionaryClient.getAllTypes()).thenReturn(TypeResponse.builder().types(getTypeResponse()).build());
-        when(dictionaryClient.getDictionaryForType(VERTEBRATES_CODE)).thenReturn(getDictionaryResponse(VERTEBRATES_CODE));
-        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE)).thenReturn(getDictionaryResponse(ADDRESS_CODE));
-        when(dictionaryClient.getDictionaryForType(NAME_CODE)).thenReturn(getDictionaryResponse(NAME_CODE));
+        when(dictionaryClient.getDictionaryForType(VERTEBRATE)).thenReturn(getDictionaryResponse(VERTEBRATE));
+        when(dictionaryClient.getDictionaryForType(ADDRESS)).thenReturn(getDictionaryResponse(ADDRESS));
+        when(dictionaryClient.getDictionaryForType(AUTHOR)).thenReturn(getDictionaryResponse(AUTHOR));
        when(dictionaryClient.getDictionaryForType(SPONSOR)).thenReturn(getDictionaryResponse(SPONSOR));
        when(dictionaryClient.getDictionaryForType(NO_REDACTION_INDICATOR)).thenReturn(getDictionaryResponse(NO_REDACTION_INDICATOR));
        when(dictionaryClient.getDictionaryForType(REDACTION_INDICATOR)).thenReturn(getDictionaryResponse(REDACTION_INDICATOR));
        when(dictionaryClient.getDictionaryForType(HINT_ONLY)).thenReturn(getDictionaryResponse(HINT_ONLY));
        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);
    }


    private void loadDictionaryForTest() {

-        dictionary.computeIfAbsent(NAME_CODE, v -> new ArrayList<>())
-                .addAll(ResourceLoader.load("dictionaries/names.txt")
+        dictionary.computeIfAbsent(AUTHOR, v -> new ArrayList<>())
+                .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_companies.txt")
+                .addAll(ResourceLoader.load("dictionaries/CBI_sponsor.txt")
                        .stream()
                        .map(this::cleanDictionaryEntry)
                        .collect(Collectors.toSet()));
-        dictionary.computeIfAbsent(VERTEBRATES_CODE, v -> new ArrayList<>())
-                .addAll(ResourceLoader.load("dictionaries/vertebrates.txt")
+        dictionary.computeIfAbsent(VERTEBRATE, v -> new ArrayList<>())
+                .addAll(ResourceLoader.load("dictionaries/vertebrate.txt")
                        .stream()
                        .map(this::cleanDictionaryEntry)
                        .collect(Collectors.toSet()));
-        dictionary.computeIfAbsent(ADDRESS_CODE, v -> new ArrayList<>())
-                .addAll(ResourceLoader.load("dictionaries/addresses.txt")
+        dictionary.computeIfAbsent(ADDRESS, v -> new ArrayList<>())
+                .addAll(ResourceLoader.load("dictionaries/CBI_address.txt")
                        .stream()
                        .map(this::cleanDictionaryEntry)
                        .collect(Collectors.toSet()));
@@ -175,6 +192,36 @@ public class RedactionIntegrationTest {
                        .stream()
                        .map(this::cleanDictionaryEntry)
                        .collect(Collectors.toSet()));
+        dictionary.computeIfAbsent(PUBLISHED_INFORMATION, v -> new ArrayList<>())
+                .addAll(ResourceLoader.load("dictionaries/published_information.txt")
+                        .stream()
+                        .map(this::cleanDictionaryEntry)
+                        .collect(Collectors.toSet()));
+        dictionary.computeIfAbsent(TEST_METHOD, v -> new ArrayList<>())
+                .addAll(ResourceLoader.load("dictionaries/test_method.txt")
+                        .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()));
    }


@@ -186,32 +233,65 @@ public class RedactionIntegrationTest {

    private void loadTypeForTest() {

-        typeColorMap.put(VERTEBRATES_CODE, "#00ff00");
-        typeColorMap.put(ADDRESS_CODE, "#00ffff");
-        typeColorMap.put(NAME_CODE, "#ffff00");
-        typeColorMap.put(SPONSOR, "#2c21fc");
-        typeColorMap.put(NO_REDACTION_INDICATOR, "#e600ff");
-        typeColorMap.put(REDACTION_INDICATOR, "#ff7700");
-        typeColorMap.put(HINT_ONLY, "#00fcb1");
-        typeColorMap.put(MUST_REDACT, "#ff0000");
+        typeColorMap.put(VERTEBRATE, "#ff85f7");
+        typeColorMap.put(ADDRESS, "#ffe187");
+        typeColorMap.put(AUTHOR, "#ffe187");
+        typeColorMap.put(SPONSOR, "#85ebff");
+        typeColorMap.put(NO_REDACTION_INDICATOR, "#be85ff");
+        typeColorMap.put(REDACTION_INDICATOR, "#caff85");
+        typeColorMap.put(HINT_ONLY, "#abc0c4");
+        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(VERTEBRATES_CODE, true);
-        hintTypeMap.put(ADDRESS_CODE, false);
-        hintTypeMap.put(NAME_CODE, false);
+        hintTypeMap.put(VERTEBRATE, true);
+        hintTypeMap.put(ADDRESS, false);
+        hintTypeMap.put(AUTHOR, false);
        hintTypeMap.put(SPONSOR, false);
        hintTypeMap.put(NO_REDACTION_INDICATOR, true);
        hintTypeMap.put(REDACTION_INDICATOR, true);
        hintTypeMap.put(HINT_ONLY, true);
        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(VERTEBRATES_CODE, true);
-        caseInSensitiveMap.put(ADDRESS_CODE, false);
-        caseInSensitiveMap.put(NAME_CODE, false);
+        caseInSensitiveMap.put(VERTEBRATE, true);
+        caseInSensitiveMap.put(ADDRESS, false);
+        caseInSensitiveMap.put(AUTHOR, false);
        caseInSensitiveMap.put(SPONSOR, false);
        caseInSensitiveMap.put(NO_REDACTION_INDICATOR, true);
        caseInSensitiveMap.put(REDACTION_INDICATOR, true);
        caseInSensitiveMap.put(HINT_ONLY, true);
        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");
@@ -229,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());
@@ -242,6 +323,7 @@ public class RedactionIntegrationTest {
                .entries(dictionary.get(type))
                .isHint(hintTypeMap.get(type))
                .isCaseInsensitive(caseInSensitiveMap.get(type))
+                .isRecommendation(recommendationTypeMap.get(type))
                .build();
    }

@@ -262,7 +344,16 @@ public class RedactionIntegrationTest {
                    .document(IOUtils.toByteArray(new FileInputStream(path)))
                    .build();
            System.out.println("Redacting file : " + path.getName());
-            redactionController.redact(request);
+            RedactionResult result = redactionController.redact(request);
+
+            Map<String, List<RedactionLogEntry>> duplicates = new HashMap<>();
+            result.getRedactionLog().getRedactionLogEntry().forEach(entry -> {
+                duplicates.computeIfAbsent(entry.getId(), v -> new ArrayList<>()).add(entry);
+            });
+
+            duplicates.entrySet().forEach(entry -> {
+                assertThat(entry.getValue().size()).isEqualTo(1);
+            });
        }

    }
@@ -291,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()))
@@ -300,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());
        }
@@ -358,7 +455,6 @@ public class RedactionIntegrationTest {
        manualRedactions.getComments().put("0836727c3508a0b2ea271da69c04cc2f", List.of(comment));
        manualRedactions.getComments().put(manualAddId, List.of(comment));

-
        ManualRedactionEntry manualRedactionEntry = new ManualRedactionEntry();
        manualRedactionEntry.setId(manualAddId);
        manualRedactionEntry.setStatus(Status.REQUESTED);
@@ -390,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()))
@@ -426,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;
@@ -53,11 +56,13 @@ import com.iqser.red.service.redaction.v1.server.segmentation.PdfSegmentationSer
 public class EntityRedactionServiceTest {

    private static final String DEFAULT_RULES = loadFromClassPath("drools/rules.drl");
-    private static final String NAME_CODE = "name";
+    private static final String AUTHOR_CODE = "author";
    private static final String ADDRESS_CODE = "address";
+    private static final String SPONSOR_CODE = "sponsor";

    private static final AtomicLong DICTIONARY_VERSION = new AtomicLong();
    private static final AtomicLong RULES_VERSION = new AtomicLong();
+
    @MockBean
    private DictionaryClient dictionaryClient;

@@ -124,12 +129,17 @@ public class EntityRedactionServiceTest {
                .entries(Arrays.asList("Casey, H.W.", "O’Loughlin,  C.K.", "Salamon, C.M.", "Smith, S.H."))
                .build();
        when(dictionaryClient.getVersion()).thenReturn(DICTIONARY_VERSION.incrementAndGet());
-        when(dictionaryClient.getDictionaryForType(NAME_CODE)).thenReturn(dictionaryResponse);
+        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE)).thenReturn(dictionaryResponse);
        DictionaryResponse addressResponse = DictionaryResponse.builder()
                .entries(Collections.singletonList("Toxigenics, Inc., Decatur, IL 62526, USA"))
                .build();
        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE)).thenReturn(addressResponse);

+        DictionaryResponse sponsorResponse = DictionaryResponse.builder()
+                .entries(Collections.emptyList())
+                .build();
+        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE)).thenReturn(sponsorResponse);
+
        try (PDDocument pdDocument = PDDocument.load(new ByteArrayInputStream(redactionRequest.getDocument()))) {
            Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
            entityRedactionService.processDocument(classifiedDoc, null);
@@ -152,11 +162,15 @@ public class EntityRedactionServiceTest {
                .entries(Arrays.asList("Casey, H.W.", "O’Loughlin,  C.K.", "Salamon, C.M.", "Smith, S.H."))
                .build();
        when(dictionaryClient.getVersion()).thenReturn(DICTIONARY_VERSION.incrementAndGet());
-        when(dictionaryClient.getDictionaryForType(NAME_CODE)).thenReturn(dictionaryResponse);
+        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE)).thenReturn(dictionaryResponse);
        DictionaryResponse addressResponse = DictionaryResponse.builder()
                .entries(Collections.singletonList("Toxigenics, Inc., Decatur, IL 62526, USA"))
                .build();
        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE)).thenReturn(addressResponse);
+        DictionaryResponse sponsorResponse = DictionaryResponse.builder()
+                .entries(Collections.emptyList())
+                .build();
+        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE)).thenReturn(sponsorResponse);

        try (PDDocument pdDocument = PDDocument.load(new ByteArrayInputStream(redactionRequest.getDocument()))) {
            Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
@@ -174,13 +188,17 @@ 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/names.txt")))
+                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_author.txt")))
                .build();
-        when(dictionaryClient.getDictionaryForType(NAME_CODE)).thenReturn(dictionaryResponse);
+        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE)).thenReturn(dictionaryResponse);
        DictionaryResponse addressResponse = DictionaryResponse.builder()
-                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/addresses.txt")))
+                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_address.txt")))
                .build();
        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE)).thenReturn(addressResponse);
+        DictionaryResponse sponsorResponse = DictionaryResponse.builder()
+                .entries(Collections.emptyList())
+                .build();
+        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE)).thenReturn(sponsorResponse);
        try (PDDocument pdDocument = PDDocument.load(pdfFileResource.getInputStream())) {
            Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
            entityRedactionService.processDocument(classifiedDoc, null);
@@ -207,13 +225,17 @@ 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/names.txt")))
+                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_author.txt")))
                .build();
-        when(dictionaryClient.getDictionaryForType(NAME_CODE)).thenReturn(dictionaryResponse);
+        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE)).thenReturn(dictionaryResponse);
        DictionaryResponse addressResponse = DictionaryResponse.builder()
-                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/addresses.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/CBI_sponsor.txt")))
+                .build();
+        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE)).thenReturn(sponsorResponse);
        try (PDDocument pdDocument = PDDocument.load(pdfFileResource.getInputStream())) {
            Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
            entityRedactionService.processDocument(classifiedDoc, null);
@@ -238,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));
@@ -272,13 +294,17 @@ 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/names.txt")))
+                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_author.txt")))
                .build();
-        when(dictionaryClient.getDictionaryForType(NAME_CODE)).thenReturn(dictionaryResponse);
+        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE)).thenReturn(dictionaryResponse);
        DictionaryResponse addressResponse = DictionaryResponse.builder()
-                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/addresses.txt")))
+                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_address.txt")))
                .build();
        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE)).thenReturn(addressResponse);
+        DictionaryResponse sponsorResponse = DictionaryResponse.builder()
+                .entries(Collections.emptyList())
+                .build();
+        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE)).thenReturn(sponsorResponse);
        try (PDDocument pdDocument = PDDocument.load(pdfFileResource.getInputStream())) {
            Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
            entityRedactionService.processDocument(classifiedDoc, null);
@@ -291,6 +317,47 @@ public class EntityRedactionServiceTest {
    }


+    @Test
+    public void testSponsorInCell() throws IOException {
+
+        String tableRules = "package drools\n" +
+                "\n" +
+                "import com.iqser.red.service.redaction.v1.server.redaction.model.Section\n" +
+                "\n" +
+                "global Section section\n" + "rule \"11: Redact sponsor company\"\n" + "    when\n" + "        " +
+                "Section(searchText.toLowerCase().contains(\"batches produced at\"))\n" + "    then\n" + "        section" +
+                ".redactIfPrecededBy(\"batches produced at\", \"sponsor\", 11, \"Redacted because it represents a " +
+                "sponsor company\", \"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" + "    end";
+        when(rulesClient.getVersion()).thenReturn(RULES_VERSION.incrementAndGet());
+        when(rulesClient.getRules()).thenReturn(new RulesResponse(tableRules));
+        droolsExecutionService.updateRules();
+
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/batches_new_line.pdf");
+        when(dictionaryClient.getVersion()).thenReturn(DICTIONARY_VERSION.incrementAndGet());
+        DictionaryResponse addressResponse = DictionaryResponse.builder()
+                .entries(Collections.emptyList())
+                .build();
+        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE)).thenReturn(addressResponse);
+        DictionaryResponse authorResponse = DictionaryResponse.builder()
+                .entries(Collections.emptyList())
+                .build();
+        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE)).thenReturn(authorResponse);
+        DictionaryResponse dictionaryResponse = DictionaryResponse.builder()
+                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_sponsor.txt")))
+                .build();
+        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE)).thenReturn(dictionaryResponse);
+        try (PDDocument pdDocument = PDDocument.load(pdfFileResource.getInputStream())) {
+            Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
+            entityRedactionService.processDocument(classifiedDoc, null);
+            assertThat(classifiedDoc.getEntities()).hasSize(1); // one page
+            assertThat(classifiedDoc.getEntities().get(1).stream()
+                    .filter(entity -> entity.getMatchedRule() == 11)
+                    .count()).isEqualTo(1);
+        }
+
+    }
+
+
    @Test
    public void headerPropagation() throws IOException {

@@ -301,12 +368,16 @@ public class EntityRedactionServiceTest {
                .build();

        when(dictionaryClient.getVersion()).thenReturn(DICTIONARY_VERSION.incrementAndGet());
-        when(dictionaryClient.getDictionaryForType(NAME_CODE)).thenReturn(dictionaryResponse);
+        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE)).thenReturn(dictionaryResponse);
        DictionaryResponse addressResponse = DictionaryResponse.builder()
                .entries(Collections.singletonList("Novartis Crop Protection AG, Basel, Switzerland"))
                .build();
        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE)).thenReturn(addressResponse);

+        DictionaryResponse sponsorResponse = DictionaryResponse.builder()
+                .entries(Collections.emptyList())
+                .build();
+        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE)).thenReturn(sponsorResponse);
        try (PDDocument pdDocument = PDDocument.load(pdfFileResource.getInputStream())) {
            Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
            entityRedactionService.processDocument(classifiedDoc, null);
@@ -322,7 +393,7 @@ public class EntityRedactionServiceTest {
                .build();

        when(dictionaryClient.getVersion()).thenReturn(DICTIONARY_VERSION.incrementAndGet());
-        when(dictionaryClient.getDictionaryForType(NAME_CODE)).thenReturn(dictionaryResponse);
+        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE)).thenReturn(dictionaryResponse);
        addressResponse = DictionaryResponse.builder()
                .entries(Collections.singletonList("Novartis Crop Protection AG, Basel, Switzerland"))
                .build();
@@ -348,12 +419,16 @@ public class EntityRedactionServiceTest {
                .build();

        when(dictionaryClient.getVersion()).thenReturn(DICTIONARY_VERSION.incrementAndGet());
-        when(dictionaryClient.getDictionaryForType(NAME_CODE)).thenReturn(dictionaryResponse);
+        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE)).thenReturn(dictionaryResponse);
        DictionaryResponse addressResponse = DictionaryResponse.builder()
                .entries(Collections.singletonList("Novartis Crop Protection AG, Basel, Switzerland"))
                .build();
        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE)).thenReturn(addressResponse);

+        DictionaryResponse sponsorResponse = DictionaryResponse.builder()
+                .entries(Collections.emptyList())
+                .build();
+        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE)).thenReturn(sponsorResponse);
        try (PDDocument pdDocument = PDDocument.load(pdfFileResource.getInputStream())) {
            Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
            entityRedactionService.processDocument(classifiedDoc, null);
@@ -374,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" +
@@ -383,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" +
@@ -392,12 +467,24 @@ public class EntityRedactionServiceTest {
        when(rulesClient.getRules()).thenReturn(new RulesResponse(tableRules));
        TypeResponse typeResponse = TypeResponse.builder()
                .types(Arrays.asList(
-                        TypeResult.builder().type(NAME_CODE).hexColor("#ffff00").build(),
-                        TypeResult.builder().type(ADDRESS_CODE).hexColor("#00ffff").build()))
+                        TypeResult.builder().type(AUTHOR_CODE).hexColor("#ffff00").build(),
+                        TypeResult.builder().type(ADDRESS_CODE).hexColor("#ff00ff").build(),
+                        TypeResult.builder().type(SPONSOR_CODE).hexColor("#00ffff").build()))
                .build();
        when(dictionaryClient.getVersion()).thenReturn(DICTIONARY_VERSION.incrementAndGet());
        when(dictionaryClient.getAllTypes()).thenReturn(typeResponse);

+        // Default empty return to prevent NPEs
+        DictionaryResponse dictionaryResponse = DictionaryResponse.builder()
+                .build();
+        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE)).thenReturn(dictionaryResponse);
+        DictionaryResponse addressResponse = DictionaryResponse.builder()
+                .build();
+        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE)).thenReturn(addressResponse);
+        DictionaryResponse sponsorResponse = DictionaryResponse.builder()
+                .build();
+        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE)).thenReturn(sponsorResponse);
+
        Colors colors = new Colors();
        colors.setDefaultColor("#acfc00");
        colors.setNotRedacted("#cccccc");
@@ -426,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);
+            }
+        }
+    }
+
 }
@@ -1,7 +1,8 @@
+Crumrine
+Fine Organics Limited, Middlesbrough, United Kingdom
+Hunan Haili Chemical Industry Co., Ltd., Hunan, China
 Monthey Syngenta Crop Protection AG, Basel, Switzerland
 Syngenta Crop Protection, Monthey, Switzerland
-Fine Organics Limited, Middlesbrough, United Kingdom
 Syngenta Monthey Switzerland
-Hunan Haili Chemical Industry Co., Ltd., Hunan, China
+Syngenta Nantong, China
 Syngenta, Switzerland
-Syngenta Nantong, China
@@ -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,2 +0,0 @@
-guideline
-unpublished
@@ -1,2 +0,0 @@
-CTL
-determination of residues
@@ -1,3 +1,4 @@
-published paper
+Fundamentals of Applied Toxicology
 in vitro
-in-vitro
+in-vitro
+published paper
@@ -0,0 +1,87 @@
+7th ed.; The Iowa State University Press: Ames, IA
+Analytical chemistry
+Animal Reproduction
+Animal Reproduction Science
+Apidologie
+Aquatic toxicology
+Archives of Environmental Contamination and Toxicology
+ATLA
+Atmospheric. Environment
+Australasian Journal of Ecotoxicology
+Background lesions of laboratory Animals, A Color Atlas
+Biometrics
+Biometrika
+Birth Defects Res. B. Dev. Reprod. Toxicol.
+Crit Rev Toxicol
+Current approaches in the statistical analysis of ecotoxicity data: guidance to application
+Curr. Med. Chem.
+Dongbei Nongye Daxue Xuebao
+Ecotoxicology and Environmental Safety
+Environ and Molecular Mutagenesis
+Environ. Health Perspec.
+Environ Health Perspect
+Environ Health Perspect.
+Environ Health Perspect. 1
+Environmental Health
+Environmental Health Perspectives
+Environmental & Molecular Mutagenesis
+Environmental Pollution
+Environmental Science
+Environmental Science and Technology.
+Environmental Science & Technology
+Environmental Toxicology and Chemistry
+Environ Mol Muta- gen
+Environ. Sci. Technol.
+Environ Toxicol.
+Env. Mol. Mutagen
+Erna¨hrung
+Essays in Honor of Harold Hotelling
+Fish Sci
+Food Cosmet. Toxicol.
+Fundamentals of Applied Toxicology
+Fundamentals of Applied Toxicology1988
+High-Throughput Screening Methods in Toxicity Testing
+High-Throughput Screening Methods in Toxicity Testing. Hoboken, NJ: John Wiley & Sons
+http://www.iobc-wprs.org
+Irish Journal of Agricultural and Food Research
+J Econom
+J Endocrinol
+J. Invest. Derm
+Journal of agricultural and food chemistry
+Journal of Applied Entomology
+Journal of Environmental Science and Health
+Journal of Experimental Biology and Ecology
+Journal of Hazardous Materials
+Journal of the American College of Toxicology
+Journal of Toxicology and
+J Steroid Biochem Mol Biol
+Marine Pollution Bulletin
+Middle Atlantic Reproduction and Teratology Association
+Mol. Cell. Endocrinol.
+Mol Mutagen
+Mutagenesis
+Mutat Res
+Nonparametric Statistics for the Behavioral Sciences
+Principles and Procedures of Statistics
+Principles and Procedures of Statistics, A Biometrical Approach
+Proc Natl Acad Sci USA
+Progress in
+Psychopharmacologia
+Reproductive Toxicology
+RNA
+Science of the Total Environment
+Stain Technol
+Statistical Methods
+Statistical Methods,
+Steinberg P,
+Teratology
+The American Statistician
+Toxicol Chem
+Toxicol in Vitro
+Toxicological and Environmental Chemistry
+Toxicological Sciences
+Toxicologic Pathology
+Toxicology and Applied Pharmacology
+Toxicol Sci
+Toxicol Sci.
+Toxicol Sci. 1
@@ -1,9 +1,12 @@
-in vivo
-in-vivo
-dermal penetration
-oral toxicity
-oral-toxicity
 acute toxicity
 acute-toxicity
+dermal penetration
 eco toxicity
-eco-toxicity
+eco-toxicity
+Env. Mol. Mutagen,
+in vivo
+in-vivo
+ld
+oral toxicity
+oral-toxicity
+Processes & Impacts
@@ -0,0 +1,48 @@
+Bartlett’s Test
+Bonferroni-Holm Adjustment
+Cochran-Armitage test
+Cochran-Armitage Trend Step-Down Test
+Dunnett's Multiple Comparison test
+Dunnett’s test
+Dunnett's "t" test
+Dunnett test
+Fisher Count-AllTM c
+Fisher Scientific Company
+Fisher’s Exact
+Fisher's exact test
+Fisher’s Exact Test
+Ham's F10
+Heinz body
+Heinz body determinations
+Jonckheere-Terpstra test (step-down)
+Jonckheere Trend Test
+Kay and Calandra system
+Klimisch code
+Kolmogorov-Smirnov's test
+Krebs cycle
+Litchfield and Wilcoxon method
+Magnusson and Kligman
+Magnusson & Kligman
+MAGNUSSON & KLINGMAN METHOD
+Mann-Whitney's test
+Maximisation test, Buehler
+Method of Magnusson and Kligman
+methodology validated at Smithers Viscient.
+n Williams' medium E a
+Patterson-Kelly twinshell blender
+Shapiro-Wilks and Levene’s tests
+Shapiro-Wilks’ Test
+Steel’s test
+Tamhane-Dunnett
+Tamhane-Dunnett test
+the method Davies
+Vogel-Bonner Medium E
+Welch’s test
+Welch t-test
+Whitney test
+Wilcoxon and Ansari-Bradley statistics
+Williams multiple sequential t-test
+Williams' test
+Williams t-test
+William test
+Winkler titration technique,
@@ -1,4 +1,3 @@
-a. sylvaticus
 african clawed frog
 agalychnis callidryas
 albino rat
@@ -15,6 +14,7 @@ apodemus flavicollis
 apodemus syl vaticus
 apodemus sylvaticus
 arvicola terrestris
+a. sylvaticus
 avian
 bank vole
 bird
@@ -23,6 +23,7 @@ bluegill
 bluegill sunfish
 bobwhite
 bobwhite quail
+Bovine
 brachydanio rerio
 brown hare
 bufo americanus
@@ -52,10 +53,12 @@ crocidura russula
 crucian carp
 cyprinodon variegatus
 cyprinus carpio
+(Danio rerio
 dog
 dogs
 duck
 ducks
+Environmental & Molecular Mutagenesis
 european brown hare
 european rabbit
 fathead minnow
@@ -121,14 +124,13 @@ myodes glareolus
 northern bobwhite
 o. cuniculus
 o. mykiss
-o. tshawytscha
 oncorhynchus
 oncorhynchus mykiss
 oncorhynchus tshawytscha
 oryctolagus cuniculus
 oryzias melastigma
 oryzias melastigma larvae
-p. promelas
+o. tshawytscha
 pagrus major
 palumbus
 pig
@@ -139,10 +141,10 @@ pimephales promela
 pimephales promelas
 poecilia reticulata
 poultry
+p. promelas
 pseudacris
 pseudacris triseriata
 quail
-r. catesbeiana
 rabbit
 rabbits
 rainbow trout
@@ -152,6 +154,7 @@ rana limnocharis
 rana pipiens
 rat
 rats
+r. catesbeiana
 reptile
 reptiles
 ricefish
@@ -168,6 +171,7 @@ sorex araneus
 spea multiplicata
 spotted march frog
 tadpoles
+Taeniopygia guttata
 terrestrial vertrebrates
 toad
 treefrog
@@ -187,5 +191,6 @@ wood pigeon
 xenopus laevis
 xenpous leavis
 yellow-necked mouse
+Zebra Finch
 zebra fish
-zebrafish
+zebrafish
@@ -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("name", 1, "Redacted because Section contains Vertebrate", "Reg (EC) No 1107/2009 Art. 63 (2g)");
-		section.redact("address", 1, "Redacted because Section contains Vertebrate", "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("name", 2, "Not Redacted because Section contains no Vertebrate");
-		section.redactNot("address", 2, "Not Redacted because Section contains no Vertebrate");
+		section.redactNot("CBI_author", 2, "No Vertebrate found");
+		section.redactNot("CBI_address", 2, "No Vertebrate found");
 	end


@@ -27,109 +29,225 @@ 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("name", 3, "Vertebrate was found, but also a no redaction indicator");
-		section.redactNot("address", 3, "Vertebrate was found, but also a no redaction indicator");
+		section.redactNot("CBI_author", 3, "Vertebrate and No Redaction Indicator found");
+		section.redactNot("CBI_address", 3, "Vertebrate and No Redaction Indicator found");
 	end


-rule "4: Redact Names and Addresses if no_redaction_indicator and redaction_indicator is contained"
+rule "4: Do not redact Names and Addresses if no redaction Indicator is contained"
+	when
+		Section(matchesType("vertebrate"), matchesType("published_information"))
+	then
+		section.redactNot("CBI_author", 4, "Vertebrate and Published Information found");
+		section.redactNot("CBI_address", 4, "Vertebrate and Published Information found");
+	end
+
+
+rule "5: Redact Names and Addresses if no_redaction_indicator and redaction_indicator is contained"
 	when
 		Section(matchesType("vertebrate"), matchesType("no_redaction_indicator"), matchesType("redaction_indicator"))
 	then
-		section.redact("name", 4, "Vertebrate was found and no_redaction_indicator and redaction_indicator", "Reg (EC) No 1107/2009 Art. 63 (2g)");
-		section.redact("address", 4, "Vertebrate was found and no_redaction_indicator and redaction_indicator", "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 "5: Do not redact in guideline sections"
-	when
-		Section(headlineContainsWord("guideline") || headlineContainsWord("Guidance"))
-	then
-		section.redactNot("name", 5, "Section is a guideline section.");
-		section.redactNot("address", 5, "Section is a guideline section.");
-	end
-
-
-rule "6: Redact contact information if applicant is found"
-	when
-		Section(headlineContainsWord("applicant") || text.contains("Applicant") || headlineContainsWord("Primary contact") || headlineContainsWord("Alternative contact"))
-	then
-		section.redactLineAfter("Name:", "address", 6, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
-		section.redactBetween("Address:", "Contact", "address", 6, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
-		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)");
-	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("Name:", "address", 7, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
-		section.redactBetween("Address:", "Contact", "address", 7, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
-		section.redactBetween("Contact:", "Phone", "address", 7, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
-		section.redactBetween("Contact:", "Telephone number:", "address", 7, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
-		section.redactBetween("Address:", "Manufacturing", "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, "name", "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("name", 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, "name", "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(text.toLowerCase().contains("batches produced at"))
+        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
Dominique Eiflaender	412e13854f	Pull request #73 : RED-743: Updated to latest rules and dictionaries Merge in RED/redaction-service from RED-743 to master * commit '6de87d051ebd4852056e26aa51b6acf97b91cbf8': RED-743: Updated to latest rules and dictionaries	2020-11-23 12:37:29 +01:00
deiflaender	6de87d051e	RED-743: Updated to latest rules and dictionaries	2020-11-23 12:24:22 +01:00
Dominique Eiflaender	5481dfbcff	Pull request #72 : RED-744: Expose section grid Merge in RED/redaction-service from RED-744 to master * commit '9c2926451d77f9568bb1b712134773169134cfed': RED-744: Expose section grid	2020-11-19 11:48:24 +01:00
deiflaender	9c2926451d	RED-744: Expose section grid	2020-11-19 11:37:57 +01:00
Dominique Eiflaender	42fd7b1ee9	Pull request #71 : RED-473 Merge in RED/redaction-service from RED-473 to master * commit 'bdc231f3c25aa9e3c1d4e77e62293bca90824b30': RED-473: Fixed missing batched produced at annotation Adjusted rules	2020-11-18 13:37:37 +01:00
deiflaender	bdc231f3c2	RED-473: Fixed missing batched produced at annotation	2020-11-18 13:29:33 +01:00
deiflaender	efb05d15a1	Adjusted rules	2020-11-18 12:54:09 +01:00
Dominique Eiflaender	462e628cd0	Pull request #70 : Fixed offest problems by installing fonts Merge in RED/redaction-service from fontFix to master * commit '8c680c5babdd8bec07a0da22e640b3cdf14728dc': Fixed offest problems by installing fonts	2020-11-17 14:58:06 +01:00
deiflaender	8c680c5bab	Fixed offest problems by installing fonts	2020-11-17 14:47:03 +01:00
deiflaender	a4f8d2f424	Changed rules and dictionaries	2020-11-17 09:57:04 +01:00
Dominique Eiflaender	4a6631f5b8	Pull request #69 : Fixed paragraph recognition Merge in RED/redaction-service from ParagraphFix to master * commit 'e178393c237d735cf16a358c672e2c0624277afb': Fixed paragraph recognition	2020-11-16 16:13:26 +01:00
deiflaender	e178393c23	Fixed paragraph recognition	2020-11-16 16:00:45 +01:00
Dominique Eiflaender	977ece1892	Pull request #68 : RED-692: Added matchedRule to RedactionLog Merge in RED/redaction-service from RED-692 to master * commit 'f75aff5186536c4e5897bb67342c155aa7a26fd4': RED-692: Added matchedRule to RedactionLog	2020-11-16 13:31:47 +01:00
deiflaender	f75aff5186	RED-692: Added matchedRule to RedactionLog	2020-11-16 11:55:58 +01:00
Dominique Eiflaender	80e80bc295	Pull request #67 : RED-632: Set status DECLINED in RedactionLog for manual removals that are DECLINED Merge in RED/redaction-service from RED-632 to master * commit '85d73dae4764409646ce387a379a9e0fc3c1e70c': RED-632: Set status DECLINED in RedactionLog for manual removals that are DECLINED	2020-11-12 16:25:54 +01:00
deiflaender	85d73dae47	RED-632: Set status DECLINED in RedactionLog for manual removals that are DECLINED	2020-11-12 16:14:45 +01:00
Dominique Eiflaender	1792eb554e	Pull request #66 : RED-629: Each annotation is one entry in the RedactionLog Merge in RED/redaction-service from RED-629 to master * commit '936683f94dd089d47b267cadb606c42b9e8b5515': RED-629: Each annotation is one entry in the RedactionLog	2020-11-11 15:39:08 +01:00
deiflaender	936683f94d	RED-629: Each annotation is one entry in the RedactionLog	2020-11-11 15:29:28 +01:00
Dominique Eiflaender	d2161e1b3f	Pull request #65 : RED-419: Avoid duplicate entries Merge in RED/redaction-service from RED-419 to master * commit 'efe49ac2c1ae8a27feb6e07c1b4614619a0b2ece': RED-419: Avoid duplicate entries	2020-11-05 12:34:20 +01:00
deiflaender	efe49ac2c1	RED-419: Avoid duplicate entries	2020-11-05 12:27:24 +01:00
Dominique Eiflaender	61352b565d	Pull request #64 : RED-515: Added manualRedactionType to redactionLog, to know if it must added or not in pdftron-redaction-service if it is requested Merge in RED/redaction-service from RED-515 to master * commit 'c6d3e3a4cf8f34bd2f129e1ae15ce9b142fc284c': RED-515: Added manualRedactionType to redactionLog, to know if it must added or not in pdftron-redaction-service if it is requested	2020-11-04 15:54:20 +01:00
deiflaender	c6d3e3a4cf	RED-515: Added manualRedactionType to redactionLog, to know if it must added or not in pdftron-redaction-service if it is requested	2020-11-04 15:47:00 +01:00
Thierry Goeckel	c650361ec2	Pull request #63 : Fix sponsor companies rule and add corresponding test Merge in RED/redaction-service from RED-473 to master * commit '122d5a556e35b961ba2199280f6836221c6f768c': Bump conf service version and remove obsolete object init Fix test Fix rule in drools file, too Fix sponsor companies rule and add corresponding test	2020-11-04 11:59:15 +01:00
Thierry Göckel	122d5a556e	Bump conf service version and remove obsolete object init	2020-11-04 11:49:13 +01:00
Thierry Göckel	355cb16679	Fix test	2020-11-03 21:10:17 +01:00
Thierry Göckel	c285c384ce	Fix rule in drools file, too	2020-11-03 20:48:23 +01:00
Thierry Göckel	02052fbb6a	Fix sponsor companies rule and add corresponding test	2020-11-03 20:47:11 +01:00
Dominique Eiflaender	329ad98a21	Pull request #62 : Temprorary exclude WebMvcMetricsAutoConfiguration till UNDERTOW-1743 is fixed Merge in RED/redaction-service from ExcludeMetrics to master * commit '843b32e68feae46f306c5e122ebfd98e6531fc86': Temprorary exclude WebMvcMetricsAutoConfiguration till UNDERTOW-1743 is fixed	2020-11-03 10:18:43 +01:00