Fixed table offset bug

Pull request #81 : RED-864, Added isDictionaryEntry to redactionLog.
Merge in RED/redaction-service from RED-864 to master * commit 'e43bd1b71134ce9d34cc521459240c10606de7fc': RED-864, Added isDictionaryEntry to redactionLog. Fixed order of dictionary types
2020-12-10 19:33:58 +01:00 · 2020-12-10 12:45:53 +01:00 · 2020-12-10 12:37:51 +01:00 · 2020-12-09 17:28:12 +01:00 · 2020-12-09 17:09:11 +01:00
16 changed files with 281 additions and 114 deletions
@@ -32,5 +32,6 @@ public class RedactionLogEntry {
    private boolean manual;
    private Status status;
    private ManualRedactionType manualRedactionType;
+    private boolean isDictionaryEntry;

 }
@@ -27,4 +27,6 @@ public class Document {

    private List<RedactionLogEntry> redactionLogEntities = new ArrayList<>();
    private SectionGrid sectionGrid = new SectionGrid();
+    private long dictionaryVersion;
+    private long rulesVersion;
 }
@@ -18,7 +18,6 @@ import com.iqser.red.service.redaction.v1.resources.RedactionResource;
 import com.iqser.red.service.redaction.v1.server.classification.model.Document;
 import com.iqser.red.service.redaction.v1.server.classification.model.Page;
 import com.iqser.red.service.redaction.v1.server.exception.RedactionException;
-import com.iqser.red.service.redaction.v1.server.redaction.service.DictionaryService;
 import com.iqser.red.service.redaction.v1.server.redaction.service.DroolsExecutionService;
 import com.iqser.red.service.redaction.v1.server.redaction.service.EntityRedactionService;
 import com.iqser.red.service.redaction.v1.server.segmentation.PdfSegmentationService;
@@ -40,7 +39,6 @@ public class RedactionController implements RedactionResource {
    private final EntityRedactionService entityRedactionService;
    private final PdfFlattenService pdfFlattenService;
    private final DroolsExecutionService droolsExecutionService;
-    private final DictionaryService dictionaryService;


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

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

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

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

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


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

        try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
            document.save(byteArrayOutputStream);
            return RedactionResult.builder()
                    .document(byteArrayOutputStream.toByteArray())
                    .numberOfPages(numberOfPages)
-                    .redactionLog(new RedactionLog(redactionLogEntities, dictionaryService.getDictionaryVersion(), droolsExecutionService
-                            .getRulesVersion()))
+                    .redactionLog(new RedactionLog(redactionLogEntities,dictionaryVersion, rulesVersion))
                    .sectionGrid(sectionGrid)
                    .build();
        }
@@ -1,5 +1,8 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model;

+import java.util.Iterator;
+import java.util.List;
+
 import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
 import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizationUtilities;
@@ -9,9 +12,9 @@ import lombok.Value;
@Value
 public class CellValue {

-    TextBlock textBlock;
+    private List<TextBlock> textBlocks;

-    int rowSpanStart;
+    private int rowSpanStart;


    @Override
@@ -19,17 +22,24 @@ public class CellValue {

        StringBuilder sb = new StringBuilder();

-        TextPositionSequence previous = null;
-        for (TextPositionSequence word : textBlock.getSequences()) {
-            if (previous != null) {
-                if (Math.abs(previous.getRotationAdjustedY() - word.getRotationAdjustedY()) > word.getTextHeight()) {
-                    sb.append('\n');
-                } else {
-                    sb.append(' ');
+        Iterator<TextBlock> itty = textBlocks.iterator();
+        while (itty.hasNext()) {
+            TextBlock textBlock = itty.next();
+            TextPositionSequence previous = null;
+            for (TextPositionSequence word : textBlock.getSequences()) {
+                if (previous != null) {
+                    if (Math.abs(previous.getRotationAdjustedY() - word.getRotationAdjustedY()) > word.getTextHeight()) {
+                        sb.append('\n');
+                    } else {
+                        sb.append(' ');
+                    }
                }
+                sb.append(word.toString());
+                previous = word;
+            }
+            if (itty.hasNext()) {
+                sb.append(' ');
            }
-            sb.append(word.toString());
-            previous = word;
        }

        return TextNormalizationUtilities.removeHyphenLineBreaks(sb.toString())
@@ -0,0 +1,88 @@
+package com.iqser.red.service.redaction.v1.server.redaction.model;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import lombok.Data;
+import lombok.Getter;
+
+@Data
+public class Dictionary {
+
+    public static final String RECOMMENDATION_PREFIX = "recommendation_";
+
+    @Getter
+    private List<DictionaryModel> dictionaryModels;
+    private Map<String, DictionaryModel> localAccessMap = new HashMap<>();
+
+    @Getter
+    private long version;
+
+
+    public Dictionary(List<DictionaryModel> dictionaryModels, long dictionaryVersion){
+        this.dictionaryModels = dictionaryModels;
+        this.dictionaryModels.forEach(dm -> localAccessMap.put(dm.getType(), dm));
+        this.version = dictionaryVersion;
+    }
+
+
+    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;
+    }
+
+}
@@ -1,6 +1,7 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model;


+import java.io.Serializable;
 import java.util.Set;

 import lombok.AllArgsConstructor;
@@ -8,7 +9,7 @@ import lombok.Data;

@Data
@AllArgsConstructor
-public class DictionaryModel {
+public class DictionaryModel implements Serializable {

    private String type;
    private int rank;
@@ -12,7 +12,7 @@ import lombok.EqualsAndHashCode;
@EqualsAndHashCode(onlyExplicitlyIncluded = true)
 public class Entity {

-    @EqualsAndHashCode.Include
+
    private final String word;
    private final String type;
    private boolean redaction;
@@ -20,7 +20,10 @@ public class Entity {
    private String legalBasis;
    private List<EntityPositionSequence> positionSequences = new ArrayList<>();
    private List<TextPositionSequence> targetSequences;
+
+    @EqualsAndHashCode.Include
    private Integer start;
+    @EqualsAndHashCode.Include
    private Integer end;

    @EqualsAndHashCode.Include
@@ -30,8 +33,10 @@ public class Entity {
    @EqualsAndHashCode.Include
    private int sectionNumber;

+    private boolean isDictionaryEntry;

-    public Entity(String word, String type, boolean redaction, String redactionReason, List<EntityPositionSequence> positionSequences, String headline, int matchedRule, int sectionNumber, String legalBasis) {
+
+    public Entity(String word, String type, boolean redaction, String redactionReason, List<EntityPositionSequence> positionSequences, String headline, int matchedRule, int sectionNumber, String legalBasis, boolean isDictionaryEntry) {

        this.word = word;
        this.type = type;
@@ -42,10 +47,11 @@ public class Entity {
        this.matchedRule = matchedRule;
        this.sectionNumber = sectionNumber;
        this.legalBasis = legalBasis;
+        this.isDictionaryEntry = isDictionaryEntry;
    }


-    public Entity(String word, String type, Integer start, Integer end, String headline, int sectionNumber) {
+    public Entity(String word, String type, Integer start, Integer end, String headline, int sectionNumber, boolean isDictionaryEntry) {

        this.word = word;
        this.type = type;
@@ -53,6 +59,7 @@ public class Entity {
        this.end = end;
        this.headline = headline;
        this.sectionNumber = sectionNumber;
+        this.isDictionaryEntry = isDictionaryEntry;
    }

 }
@@ -1,8 +1,9 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model;

-import static com.iqser.red.service.redaction.v1.server.redaction.service.DictionaryService.RECOMMENDATION_PREFIX;
+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;
@@ -12,7 +13,6 @@ import java.util.regex.Pattern;

 import org.apache.commons.lang3.StringUtils;

-import com.iqser.red.service.redaction.v1.server.redaction.service.DictionaryService;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.Patterns;

 import lombok.Builder;
@@ -24,7 +24,12 @@ import lombok.extern.slf4j.Slf4j;
@Builder
 public class Section {

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

    private Set<Entity> entities;

@@ -46,8 +51,7 @@ public class Section {
        String cleanHeaderName = headerName.replaceAll("\n", "").replaceAll(" ", "").replaceAll("-", "");

        return tabularData != null && tabularData.containsKey(cleanHeaderName) && tabularData.get(cleanHeaderName)
-                .getTextBlock()
-                .getText()
+                .toString()
                .equals(value);
    }

@@ -66,7 +70,7 @@ public class Section {

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

-        boolean hasRecommendactionDictionary = dictionaryService.hasRecommendationDictionary(type);
+        boolean hasRecommendactionDictionary = dictionaryTypes.contains(RECOMMENDATION_PREFIX + type);

        entities.forEach(entity -> {
            if (entity.getType().equals(type) || hasRecommendactionDictionary && entity.getType()
@@ -82,7 +86,7 @@ public class Section {

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

-        boolean hasRecommendactionDictionary = dictionaryService.hasRecommendationDictionary(type);
+        boolean hasRecommendactionDictionary = dictionaryTypes.contains(RECOMMENDATION_PREFIX + type);

        entities.forEach(entity -> {
            if (entity.getType().equals(type) || hasRecommendactionDictionary && entity.getType()
@@ -156,8 +160,8 @@ public class Section {
                    // HashSet keeps the older value, but we want the new only.
                    entities.removeAll(found);
                    entities.addAll(found);
-                    if (redactEverywhere) {
-                        dictionaryService.addToLocalDictionary(asType, value.trim());
+                    if (redactEverywhere && !isLocal()) {
+                        localDictionaryAdds.computeIfAbsent(asType, (x) -> new HashSet<>()).add(value.trim());
                    }
                }
            }
@@ -190,8 +194,8 @@ public class Section {
                        // HashSet keeps the older value, but we want the new only.
                        entities.removeAll(found);
                        entities.addAll(found);
-                        if (redactEverywhere) {
-                            dictionaryService.addToLocalDictionary(asType, line.trim());
+                        if (redactEverywhere && !isLocal()) {
+                            localDictionaryAdds.computeIfAbsent(asType, (x) -> new HashSet<>()).add(line.trim());
                        }
                    }
                }
@@ -225,7 +229,7 @@ public class Section {

            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));
+                found.add(new Entity(searchText.substring(startIndex, stopIndex), asType, startIndex, stopIndex, headline, sectionNumber, false));
            }
        } while (startIndex > -1);

@@ -286,11 +290,11 @@ public class Section {
        } 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, false);
            entity.setRedaction(redact);
            entity.setMatchedRule(ruleNumber);
            entity.setRedactionReason(reason);
-            entity.setTargetSequences(value.getTextBlock()
+            entity.setTargetSequences(value.getTextBlocks().get(0)
                    .getSequences()); // Make sure no other cells with same content are highlighted
            entity.setLegalBasis(legalBasis);

@@ -300,7 +304,7 @@ public class Section {

            entities = removeEntitiesContainedInLarger(entities);

-            if (addAsRecommendations) {
+            if (addAsRecommendations && !isLocal()) {
                String cleanedWord = word.replaceAll(",", " ").replaceAll("  ", " ").trim() + " ";
                Pattern pattern = Patterns.AUTHOR_TABLE_SPITTER;
                Matcher matcher = pattern.matcher(cleanedWord);
@@ -308,13 +312,11 @@ public class Section {
                while (matcher.find()) {
                    String match = matcher.group().trim();
                    if (match.length() >= 3) {
-                        if(!dictionaryService.getDictionary(type).getEntries().contains(match) && !dictionaryService.getDictionary(RECOMMENDATION_PREFIX + type).getEntries().contains(match)) {
-                            dictionaryService.addToLocalDictionary(RECOMMENDATION_PREFIX + type, match);
-                        }
+                        localDictionaryAdds.computeIfAbsent(RECOMMENDATION_PREFIX + type, (x) -> new HashSet<>())
+                                .add(match);
                        String lastname = match.split(" ")[0];
-                        if(!dictionaryService.getDictionary(type).getEntries().contains(lastname) && !dictionaryService.getDictionary(RECOMMENDATION_PREFIX + type).getEntries().contains(lastname)) {
-                            dictionaryService.addToLocalDictionary(RECOMMENDATION_PREFIX + type, lastname);
-                        }
+                        localDictionaryAdds.computeIfAbsent(RECOMMENDATION_PREFIX + type, (x) -> new HashSet<>())
+                                .add(lastname);
                    }
                }
            }
@@ -322,3 +324,9 @@ public class Section {
    }

 }
+
+
+
+
+
+
@@ -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;
+
+}
@@ -11,12 +11,14 @@ import java.util.Set;
 import java.util.stream.Collectors;

 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.SerializationUtils;
 import org.springframework.stereotype.Service;

 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;
@@ -29,7 +31,6 @@ import lombok.extern.slf4j.Slf4j;
@RequiredArgsConstructor
 public class DictionaryService {

-    public static final String RECOMMENDATION_PREFIX = "recommendation_";

    private final DictionaryClient dictionaryClient;

@@ -55,23 +56,6 @@ public class DictionaryService {
    private Map<String, DictionaryModel> localAccessMap = new HashMap<>();


-    public boolean hasLocalEntries() {
-
-        return this.dictionary.stream().anyMatch(dm -> !dm.getLocalEntries().isEmpty());
-    }
-
-
-    public void addToLocalDictionary(String type, String value) {
-
-        localAccessMap.get(type).getLocalEntries().add(value);
-    }
-
-
-    public void clearLocalEntries() {
-
-        this.dictionary.forEach(dm -> dm.getLocalEntries().clear());
-    }
-

    public void updateDictionary() {

@@ -112,13 +96,13 @@ public class DictionaryService {
    }


-    public void updateExternalDictionary(){
-        dictionary.forEach(dm -> {
+    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 == dictionaryVersion + 1){
-                    dictionaryVersion = externalVersion;
+                if(externalVersion == dictionary.getVersion() + 1){
+                    dictionary.setVersion(externalVersion);
                }
            }
        });
@@ -185,19 +169,14 @@ public class DictionaryService {
    }


-    public boolean hasRecommendationDictionary(String type) {
+    public Dictionary getDeepCopyDictionary(){
+        List<DictionaryModel> copy = new ArrayList<>();

-        DictionaryModel model = localAccessMap.get(RECOMMENDATION_PREFIX + type);
-        if (model != null) {
-            return true;
-        }
-        return false;
-    }
+        dictionary.forEach(dm -> {
+            copy.add(SerializationUtils.clone(dm));
+        });

-
-    public DictionaryModel getDictionary(String type) {
-
-        return localAccessMap.get(type);
+        return new Dictionary(copy, dictionaryVersion);
    }

 }
@@ -21,16 +21,20 @@ 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;

 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;

+@Slf4j
@Service
@RequiredArgsConstructor
 public class EntityRedactionService {
@@ -43,21 +47,23 @@ public class EntityRedactionService {

        dictionaryService.updateDictionary();
        droolsExecutionService.updateRules();
-        dictionaryService.clearLocalEntries();
+        long rulesVersion = droolsExecutionService.getRulesVersion();

-        Set<Entity> documentEntities = new HashSet<>(findEntities(classifiedDoc, manualRedactions, false, null));
+        Dictionary dictionary = dictionaryService.getDeepCopyDictionary();

-        if (dictionaryService.hasLocalEntries()) {
+        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 (dictionaryService.isHint(entity.getType())) {
+                if (dictionary.isHint(entity.getType())) {
                    hintsPerSectionNumber.computeIfAbsent(entity.getSectionNumber(), (x) -> new HashSet<>())
                            .add(entity);
                }
            });

-            Set<Entity> foundByLocal = findEntities(classifiedDoc, manualRedactions, true, hintsPerSectionNumber);
+            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);
@@ -77,19 +83,24 @@ public class EntityRedactionService {
                        .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()));
+                                .getLegalBasis(), entity.isDictionaryEntry()));
            }
        }

-        dictionaryService.updateExternalDictionary();
+        dictionaryService.updateExternalDictionary(dictionary);
+
+        classifiedDoc.setDictionaryVersion(dictionary.getVersion());
+        classifiedDoc.setRulesVersion(rulesVersion);
    }


-    private Set<Entity> findEntities(Document classifiedDoc, ManualRedactions manualRedactions, boolean localEntries,
+    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();
@@ -115,17 +126,18 @@ public class EntityRedactionService {
                                    .replaceAll("\n", "")
                                    .replaceAll(" ", "")
                                    .replaceAll("-", "");
-                            tabularData.put(headerName, new CellValue(cell.getTextBlocks().get(0), cellStart));
+                            tabularData.put(headerName, new CellValue(cell.getTextBlocks(), cellStart));
                        });
-                        start = start + cell.toString().length() + 1; // include automatically appended white space
+                        start = start + cell.toString().length() + 1;
                        for (TextBlock textBlock : cell.getTextBlocks()) {
                            searchableRow.addAll(textBlock.getSequences());
                        }
                    }
-                    Set<Entity> rowEntities = findEntities(searchableRow, table.getHeadline(), sectionNumber, localEntries);
+                    Set<Entity> rowEntities = findEntities(searchableRow, table.getHeadline(), sectionNumber, dictionary.getDictionaryModels(), local);

-                    Section analysedRowSection = droolsExecutionService.executeRules(Section.builder()
-                            .dictionaryService(dictionaryService)
+                    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)
@@ -134,18 +146,19 @@ public class EntityRedactionService {
                            .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, localEntries);
-            Section analysedSection = droolsExecutionService.executeRules(Section.builder()
-                    .dictionaryService(dictionaryService)
+            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)
@@ -153,22 +166,52 @@ public class EntityRedactionService {
                    .searchText(searchableText.toString())
                    .headline(paragraph.getHeadline())
                    .sectionNumber(sectionNumber)
-                    .build());
+                    .build(), searchableText));

-            documentEntities.addAll(clearAndFindPositions(analysedSection.getEntities(), searchableText));
            sectionNumber++;
        }
+
+        sectionSearchableTextPairs.forEach(sectionSearchableTextPair -> {
+            Section analysedRowSection = droolsExecutionService.executeRules(sectionSearchableTextPair.getSection());
+            documentEntities.addAll(clearAndFindPositions(analysedRowSection.getEntities(), sectionSearchableTextPair.getSearchableText(), dictionary));
+
+            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 -> {
+
+                        if(dictionary.getLocalAccessMap().get(key) == null){
+                            log.warn("Dictionary {} is null", key);
+                        }
+
+                        if(dictionary.getLocalAccessMap().get(key).getLocalEntries() == null){
+                            log.warn("Dictionary {} localEntries is null", key);
+                        }
+
+                        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(entity.getPositionSequences().isEmpty()) {
-                entity.setPositionSequences(text.getSequences(entity.getWord(), dictionaryService.isCaseInsensitiveDictionary(entity
+            if (entity.getPositionSequences().isEmpty()) {
+                entity.setPositionSequences(text.getSequences(entity.getWord(), dictionary.isCaseInsensitiveDictionary(entity
                        .getType()), entity.getTargetSequences()));
            }
        }
@@ -177,7 +220,8 @@ public class EntityRedactionService {
    }


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

        Set<Entity> found = new HashSet<>();
        String searchableString = searchableText.toString();
@@ -186,11 +230,11 @@ public class EntityRedactionService {
        }

        String lowercaseInputString = searchableString.toLowerCase();
-        for (DictionaryModel model : dictionaryService.getDictionary()) {
+        for (DictionaryModel model : dictionary) {
            if (model.isCaseInsensitive()) {
-                found.addAll(find(lowercaseInputString, model.getValues(local), model.getType(), headline, sectionNumber));
+                found.addAll(find(lowercaseInputString, model.getValues(local), model.getType(), headline, sectionNumber, local));
            } else {
-                found.addAll(find(searchableString, model.getValues(local), model.getType(), headline, sectionNumber));
+                found.addAll(find(searchableString, model.getValues(local), model.getType(), headline, sectionNumber, local));
            }
        }
        removeEntitiesContainedInLarger(found);
@@ -199,7 +243,7 @@ public class EntityRedactionService {
    }


-    private Set<Entity> find(String inputString, Set<String> values, String type, String headline, int sectionNumber) {
+    private Set<Entity> find(String inputString, Set<String> values, String type, String headline, int sectionNumber, boolean local) {

        Set<Entity> found = new HashSet<>();
        for (String value : values) {
@@ -211,7 +255,7 @@ public class EntityRedactionService {

                if (startIndex > -1 && (startIndex == 0 || Character.isWhitespace(inputString.charAt(startIndex - 1)) || isSeparator(inputString
                        .charAt(startIndex - 1))) && (stopIndex == inputString.length() || isSeparator(inputString.charAt(stopIndex)))) {
-                    found.add(new Entity(inputString.substring(startIndex, stopIndex), type, startIndex, stopIndex, headline, sectionNumber));
+                    found.add(new Entity(inputString.substring(startIndex, stopIndex), type, startIndex, stopIndex, headline, sectionNumber, !local));
                }
            } while (startIndex > -1);
        }
@@ -231,7 +275,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 && word.getSectionNumber() == inner.getSectionNumber()) {
+                        .length() && inner.getStart() >= word.getStart() && inner.getEnd() <= word.getEnd() && word != inner && word
+                        .getSectionNumber() == inner.getSectionNumber()) {
                    wordsToRemove.add(inner);
                }
            }
@@ -2,6 +2,7 @@ package com.iqser.red.service.redaction.v1.server.tableextraction.model;

 import java.awt.geom.Point2D;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;

 import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
@@ -41,7 +42,9 @@ public class Cell extends Rectangle {

        StringBuilder sb = new StringBuilder();

-        for (TextBlock textBlock : textBlocks) {
+        Iterator<TextBlock> itty = textBlocks.iterator();
+        while (itty.hasNext()) {
+            TextBlock textBlock = itty.next();
            TextPositionSequence previous = null;
            for (TextPositionSequence word : textBlock.getSequences()) {
                if (previous != null) {
@@ -54,6 +57,9 @@ public class Cell extends Rectangle {
                sb.append(word.toString());
                previous = word;
            }
+            if (itty.hasNext()) {
+                sb.append(' ');
+            }
        }

        return TextNormalizationUtilities.removeHyphenLineBreaks(sb.toString())
@@ -256,6 +256,7 @@ public class AnnotationHighlightService {
                .manual(true)
                .status(manualRedactionEntry.getStatus())
                .manualRedactionType(ManualRedactionType.ADD)
+                .isDictionaryEntry(false)
                .build();
    }

@@ -274,6 +275,7 @@ public class AnnotationHighlightService {
                .section(entity.getHeadline())
                .sectionNumber(entity.getSectionNumber())
                .matchedRule(entity.getMatchedRule())
+                .isDictionaryEntry(entity.isDictionaryEntry())
                .build();
    }

@@ -382,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/51 Fludioxonil_RAR_02_Volume_2_2018-02-21.pdf");

        RedactionRequest request = RedactionRequest.builder()
                .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))
@@ -392,7 +392,7 @@ public class RedactionIntegrationTest {
        RedactionResult result = redactionController.redact(request);

        result.getRedactionLog().getRedactionLogEntry().forEach(entry -> {
-            if(entry.isRecommendation()){
+            if(entry.isDictionaryEntry()){
                System.out.println(entry.getValue());
            }
        });
@@ -104,8 +104,8 @@ public class EntityRedactionServiceTest {
    public void testNestedEntitiesRemoval() {

        Set<Entity> entities = new HashSet<>();
-        Entity nested = new Entity("nested", "fake type", 10, 16, "fake headline", 0);
-        Entity nesting = new Entity("nesting nested", "fake type", 2, 16, "fake headline", 0);
+        Entity nested = new Entity("nested", "fake type", 10, 16, "fake headline", 0, false);
+        Entity nesting = new Entity("nesting nested", "fake type", 2, 16, "fake headline", 0, false);
        entities.add(nested);
        entities.add(nesting);
        entityRedactionService.removeEntitiesContainedInLarger(entities);
@@ -404,7 +404,7 @@ public class EntityRedactionServiceTest {
            entityRedactionService.processDocument(classifiedDoc, null);
            assertThat(classifiedDoc.getEntities()).hasSize(1); // one page
            assertThat(classifiedDoc.getEntities().get(1).stream().filter(entity -> entity.getMatchedRule() == 9).count()).isEqualTo(3);
-            assertThat(classifiedDoc.getEntities().get(1).stream().filter(entity -> entity.getMatchedRule() == 8).count()).isEqualTo(8);
+            assertThat(classifiedDoc.getEntities().get(1).stream().filter(entity -> entity.getMatchedRule() == 8).count()).isEqualTo(9);
        }
    }

@@ -1,2 +1,10 @@
 Long-term
-Brown liquid
+Brown liquid
+Brown solid
+Hand-held
+Manual-Hand held
+Manual-Hand held
+Weight:
+Sprague
+Weight and length
+Aeration: Gentle
Author	SHA1	Message	Date
deiflaender	50ec16601c	Fixed table offset bug	2020-12-10 19:33:58 +01:00
Dominique Eiflaender	03a09860f4	Pull request #81 : RED-864, Added isDictionaryEntry to redactionLog. Merge in RED/redaction-service from RED-864 to master * commit 'e43bd1b71134ce9d34cc521459240c10606de7fc': RED-864, Added isDictionaryEntry to redactionLog. Fixed order of dictionary types	2020-12-10 12:45:53 +01:00
deiflaender	e43bd1b711	RED-864, Added isDictionaryEntry to redactionLog. Fixed order of dictionary types	2020-12-10 12:37:51 +01:00
Dominique Eiflaender	000054d8ab	Pull request #80 : Made dictionaries Theadsafe Merge in RED/redaction-service from ThreadSafe to master * commit '44613ee1174da877ee87414903c126bd7c25c311': Made dictionaries Theadsafe	2020-12-09 17:28:12 +01:00
deiflaender	44613ee117	Made dictionaries Theadsafe	2020-12-09 17:09:11 +01:00