Pull request #280 : RED-2756 Bugfix with redactions are not continuous and added some entries to dictionary

Merge in RED/redaction-service from bugfix/RED-2756 to master * commit '35a4d004fda0404e9b19e7112d25627cbde2a932': RED-2756 Bugfix with redactions are not continuous and added some entries to dictionary
RED-2756 Bugfix with redactions are not continuous and added some entries to dictionary
2021-11-30 11:15:32 +01:00 · 2021-11-30 11:05:06 +01:00 · 2021-11-29 15:40:51 +01:00 · 2021-11-29 12:38:53 +01:00 · 2021-11-29 10:36:05 +01:00 · 2021-11-29 10:31:32 +01:00
39 changed files with 959 additions and 240 deletions
@@ -5,7 +5,7 @@
  <parent>
    <groupId>com.atlassian.bamboo</groupId>
    <artifactId>bamboo-specs-parent</artifactId>
-    <version>7.2.2</version>
+    <version>8.0.3</version>
    <relativePath/>
  </parent>

@@ -1,5 +1,8 @@
 package buildjob;

+import java.time.DayOfWeek;
+import java.time.LocalTime;
+
 import com.atlassian.bamboo.specs.api.BambooSpec;
 import com.atlassian.bamboo.specs.api.builders.BambooKey;
 import com.atlassian.bamboo.specs.api.builders.docker.DockerConfiguration;
@@ -19,6 +22,8 @@ import com.atlassian.bamboo.specs.builders.task.ScriptTask;
 import com.atlassian.bamboo.specs.builders.task.VcsCheckoutTask;
 import com.atlassian.bamboo.specs.builders.task.VcsTagTask;
 import com.atlassian.bamboo.specs.builders.trigger.BitbucketServerTrigger;
+import com.atlassian.bamboo.specs.builders.trigger.RepositoryPollingTrigger;
+import com.atlassian.bamboo.specs.builders.trigger.ScheduledTrigger;
 import com.atlassian.bamboo.specs.model.task.InjectVariablesScope;
 import com.atlassian.bamboo.specs.util.BambooServer;
 import com.atlassian.bamboo.specs.builders.task.ScriptTask;
@@ -50,6 +55,11 @@ public class PlanSpec {
        bambooServer.publish(plan);
        PlanPermissions planPermission = new PlanSpec().createPlanPermission(plan.getIdentifier());
        bambooServer.publish(planPermission);
+
+        Plan secPlan = new PlanSpec().createSecBuild();
+        bambooServer.publish(secPlan);
+        PlanPermissions secPlanPermission = new PlanSpec().createPlanPermission(secPlan.getIdentifier());
+        bambooServer.publish(secPlanPermission);
    }

    private PlanPermissions createPlanPermission(PlanIdentifier planIdentifier) {
@@ -94,11 +104,6 @@ public class PlanSpec {
                                                .description("Resultparser")
                                                .resultDirectories("**/test-reports/*.xml, **/target/surefire-reports/*.xml, **/target/failsafe-reports/*.xml")
                                                .enabled(true),
-                                        new ScriptTask()
-                                                .description("Sonar")
-                                                .location(Location.FILE)
-                                                .fileFromPath("bamboo-specs/src/main/resources/scripts/sonar-java.sh")
-                                                .argument(SERVICE_NAME),
                                        new InjectVariablesTask()
                                                .description("Inject git Tag")
                                                .path("git.tag")
@@ -125,4 +130,45 @@ public class PlanSpec {
                                .whenInactiveInRepositoryAfterDays(14))
                        .notificationForCommitters());
    }
+
+    public Plan createSecBuild() {
+        return new Plan(
+                project(),
+                SERVICE_NAME + "-Sec", new BambooKey(SERVICE_KEY + "SEC"))
+                .description("Security Analysis Plan")
+                .stages(new Stage("Default Stage")
+                        .jobs(new Job("Default Job",
+                                new BambooKey("JOB1"))
+                                .tasks(
+                                        new ScriptTask()
+                                                .description("Clean")
+                                                .inlineBody("#!/bin/bash\n" +
+                                                        "set -e\n" +
+                                                        "rm -rf ./*"),
+                                        new VcsCheckoutTask()
+                                                .description("Checkout Default Repository")
+                                                .checkoutItems(new CheckoutItem().defaultRepository()),
+                                        new ScriptTask()
+                                                .description("Sonar")
+                                                .location(Location.FILE)
+                                                .fileFromPath("bamboo-specs/src/main/resources/scripts/sonar-java.sh")
+                                                .argument(SERVICE_NAME))
+                                .dockerConfiguration(
+                                        new DockerConfiguration()
+                                                .image("nexus.iqser.com:5001/infra/maven:3.6.2-jdk-13-3.0.0")
+                                                .dockerRunArguments("--net=host")
+                                                .volume("/etc/maven/settings.xml", "/usr/share/maven/ref/settings.xml")
+                                                .volume("/var/run/docker.sock", "/var/run/docker.sock")
+                                )
+                        )
+                )
+                .linkedRepositories("RED / " + SERVICE_NAME)
+                .triggers(
+                        new ScheduledTrigger()
+                                .scheduleOnceDaily(LocalTime.of(12, 00)),
+                        new BitbucketServerTrigger())
+                .planBranchManagement(new PlanBranchManagement()
+                        .createForVcsBranchMatching("release.*")
+                        .notificationForCommitters());
+    }
 }
@@ -11,7 +11,9 @@ public class PlanSpecTest {
    @Test
    public void checkYourPlanOffline() throws PropertiesValidationException {
        Plan plan = new PlanSpec().createPlan();
-
        EntityPropertiesBuilders.build(plan);
+
+        Plan secPlan = new PlanSpec().createSecBuild();
+        EntityPropertiesBuilders.build(secPlan);
    }
 }
@@ -13,7 +13,6 @@
    <groupId>com.iqser.red.service</groupId>
    <version>1.0-SNAPSHOT</version>

-
    <packaging>pom</packaging>

    <modules>
@@ -11,6 +11,10 @@

    <artifactId>redaction-service-api-v1</artifactId>

+    <properties>
+        <persistence-service.version>0.103.0</persistence-service.version>
+    </properties>
+
    <dependencies>
        <dependency>
            <groupId>org.springframework</groupId>
@@ -20,7 +24,7 @@
        <dependency>
            <groupId>com.iqser.red.service</groupId>
            <artifactId>persistence-service-api-v1</artifactId>
-            <version>0.44.0</version>
+            <version>${persistence-service.version}</version>
        </dependency>
    </dependencies>
 </project>
@@ -1,5 +1,7 @@
 package com.iqser.red.service.redaction.v1.model;

+import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -14,4 +16,5 @@ public class AnnotateRequest {
    private String dossierId;
    private String dossierTemplateId;
    private String fileId;
+    private ManualRedactions manualRedactions;
 }
@@ -1,5 +1,5 @@
 package com.iqser.red.service.redaction.v1.model;

 public enum ManualRedactionType {
-    ADD, REMOVE, FORCE_REDACT, RECATEGORIZE, LEGAL_BASIS_CHANGE
+    ADD, REMOVE, FORCE_REDACT, RECATEGORIZE, LEGAL_BASIS_CHANGE, RESIZE
 }
@@ -30,6 +30,13 @@ public class RedactionLogEntry {
    private boolean redacted;
    private boolean isHint;
    private boolean isRecommendation;
+
+    private boolean hasBeenResized;
+    private boolean hasBeenRecategorized;
+    private boolean hasLegalBasisChanged;
+    private boolean hasBeenForced;
+    private boolean hasBeenRemovedByManualOverride;
+
    private String section;
    private float[] color;

@@ -3,10 +3,9 @@ package com.iqser.red.service.redaction.v1.model;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import lombok.RequiredArgsConstructor;

-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;

@Data
@AllArgsConstructor
@@ -15,4 +14,16 @@ public class SectionGrid {

    private Map<Integer, List<SectionRectangle>> rectanglesPerPage = new HashMap<>();

+    private List<SectionGridSection> sections = new ArrayList<>();
+
+    @Data
+    @RequiredArgsConstructor
+    public static class SectionGridSection {
+
+        private final int sectionNumber;
+        private final String headline;
+        private final Set<Integer> pages;
+        private final List<SectionArea> sectionAreas;
+
+    }
 }
@@ -11,6 +11,14 @@

    <artifactId>redaction-service-server-v1</artifactId>

+    <properties>
+        <drools.version>7.59.0.Final</drools.version>
+        <kie.version>7.59.0.Final</kie.version>
+        <locationtech.version>1.16.1</locationtech.version>
+        <pdfbox.jbig2-imageio.version>3.0.3</pdfbox.jbig2-imageio.version>
+        <jai-imageio.version>1.4.0</jai-imageio.version>
+    </properties>
+
    <dependencies>
        <dependency>
            <groupId>com.iqser.red.commons</groupId>
@@ -24,17 +32,17 @@
        <dependency>
            <groupId>org.drools</groupId>
            <artifactId>drools-core</artifactId>
-            <version>7.59.0.Final</version>
+            <version>${drools.version}</version>
        </dependency>
        <dependency>
            <groupId>org.kie</groupId>
            <artifactId>kie-spring</artifactId>
-            <version>7.59.0.Final</version>
+            <version>${kie.version}</version>
        </dependency>
        <dependency>
            <groupId>org.locationtech.jts</groupId>
            <artifactId>jts-core</artifactId>
-            <version>1.16.1</version>
+            <version>${locationtech.version}</version>
        </dependency>
        <dependency>
            <groupId>com.google.guava</groupId>
@@ -44,17 +52,17 @@
        <dependency>
            <groupId>org.apache.pdfbox</groupId>
            <artifactId>jbig2-imageio</artifactId>
-            <version>3.0.3</version>
+            <version>${pdfbox.jbig2-imageio.version}</version>
        </dependency>
        <dependency>
            <groupId>com.github.jai-imageio</groupId>
            <artifactId>jai-imageio-core</artifactId>
-            <version>1.4.0</version>
+            <version>${jai-imageio.version}</version>
        </dependency>
        <dependency>
            <groupId>com.github.jai-imageio</groupId>
            <artifactId>jai-imageio-jpeg2000</artifactId>
-            <version>1.4.0</version>
+            <version>${jai-imageio.version}</version>
        </dependency>

        <!-- commons -->
@@ -1,5 +1,7 @@
 package com.iqser.red.service.redaction.v1.server.classification.service;

+import static java.util.stream.Collectors.toSet;
+
 import com.iqser.red.service.redaction.v1.server.classification.model.FloatFrequencyCounter;
 import com.iqser.red.service.redaction.v1.server.classification.model.Orientation;
 import com.iqser.red.service.redaction.v1.server.classification.model.Page;
@@ -16,6 +18,7 @@ import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
 import org.springframework.stereotype.Service;

 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.Iterator;
 import java.util.List;

@@ -25,9 +28,12 @@ public class BlockificationService {

    static final float THRESHOLD = 1f;

+
    public Page blockify(List<TextPositionSequence> textPositions, List<Ruling> horizontalRulingLines,
                         List<Ruling> verticalRulingLines) {

+        sortRotatedSequences(textPositions);
+
        List<TextPositionSequence> chunkWords = new ArrayList<>();
        List<AbstractTextContainer> chunkBlockList1 = new ArrayList<>();

@@ -50,7 +56,7 @@ public class BlockificationService {
            if (prev != null && (lineSeparation || startFromTop || splitByX || newLineAfterSplit || splittedByRuling)) {

                Orientation prevOrientation = null;
-                if(!chunkBlockList1.isEmpty()) {
+                if (!chunkBlockList1.isEmpty()) {
                    prevOrientation = chunkBlockList1.get(chunkBlockList1.size() - 1).getOrientation();
                }

@@ -62,15 +68,11 @@ public class BlockificationService {
                    wasSplitted = true;
                    cb1.setOrientation(Orientation.LEFT);
                    splitX1 = word.getX1();
-                } else
-
-                if (newLineAfterSplit && !splittedByRuling) {
+                } else if (newLineAfterSplit && !splittedByRuling) {
                    wasSplitted = false;
                    cb1.setOrientation(Orientation.RIGHT);
                    splitX1 = null;
-                } else
-
-                if(prevOrientation != null && prevOrientation.equals(Orientation.RIGHT) && (lineSeparation || !startFromTop || !splitByX || !newLineAfterSplit || !splittedByRuling)){
+                } else if (prevOrientation != null && prevOrientation.equals(Orientation.RIGHT) && (lineSeparation || !startFromTop || !splitByX || !newLineAfterSplit || !splittedByRuling)) {
                    cb1.setOrientation(Orientation.LEFT);
                }

@@ -110,16 +112,18 @@ public class BlockificationService {
        while (itty.hasNext()) {
            TextBlock block = (TextBlock) itty.next();

-            if(previousLeft != null && block.getOrientation().equals(Orientation.LEFT)){
-                if (previousLeft.getMinY() > block.getMinY() && block.getMaxY() + block.getMostPopularWordHeight() > previousLeft.getMinY()){
+            if (previousLeft != null && block.getOrientation().equals(Orientation.LEFT)) {
+                if (previousLeft.getMinY() > block.getMinY() && block.getMaxY() + block.getMostPopularWordHeight() > previousLeft
+                        .getMinY()) {
                    previousLeft.add(block);
                    itty.remove();
                    continue;
                }
            }

-            if(previousRight != null && block.getOrientation().equals(Orientation.RIGHT)){
-                if (previousRight.getMinY() > block.getMinY() && block.getMaxY() + block.getMostPopularWordHeight() > previousRight.getMinY()){
+            if (previousRight != null && block.getOrientation().equals(Orientation.RIGHT)) {
+                if (previousRight.getMinY() > block.getMinY() && block.getMaxY() + block.getMostPopularWordHeight() > previousRight
+                        .getMinY()) {
                    previousRight.add(block);
                    itty.remove();
                    continue;
@@ -133,16 +137,16 @@ public class BlockificationService {
            }
        }

-
        itty = chunkBlockList1.iterator();
        TextBlock previous = null;
        while (itty.hasNext()) {
            TextBlock block = (TextBlock) itty.next();

-            if(previous != null && previous.getOrientation().equals(Orientation.LEFT) && block.getOrientation().equals(Orientation.LEFT) && equalsWithThreshold(block.getMaxY(), previous
-                    .getMaxY())||
-                    previous != null && previous.getOrientation().equals(Orientation.LEFT) && block.getOrientation().equals(Orientation.RIGHT) && equalsWithThreshold(block.getMaxY(), previous
-                    .getMaxY())){
+            if (previous != null && previous.getOrientation().equals(Orientation.LEFT) && block.getOrientation()
+                    .equals(Orientation.LEFT) && equalsWithThreshold(block.getMaxY(), previous.getMaxY()) || previous != null && previous
+                    .getOrientation()
+                    .equals(Orientation.LEFT) && block.getOrientation()
+                    .equals(Orientation.RIGHT) && equalsWithThreshold(block.getMaxY(), previous.getMaxY())) {
                previous.add(block);
                itty.remove();
                continue;
@@ -151,11 +155,12 @@ public class BlockificationService {
            previous = block;
        }

-
        return new Page(chunkBlockList1);
    }

-    private boolean equalsWithThreshold(float f1, float f2){
+
+    private boolean equalsWithThreshold(float f1, float f2) {
+
        return Math.abs(f1 - f2) < THRESHOLD;
    }

@@ -197,6 +202,13 @@ public class BlockificationService {
            textBlock.setHighestFontSize(fontSizeFrequencyCounter.getHighest());
        }

+        if (textBlock != null && textBlock.getSequences() != null && textBlock.getSequences()
+                .stream()
+                .map(t -> round(t.getY1(), 3))
+                .collect(toSet())
+                .size() == 1) {
+            textBlock.getSequences().sort(Comparator.comparing(TextPositionSequence::getX1));
+        }
        return textBlock;
    }

@@ -291,4 +303,30 @@ public class BlockificationService {
        return new Rectangle(minY, minX, maxX - minX, maxY - minY);
    }

+
+    private void sortRotatedSequences(List<TextPositionSequence> sequences) {
+
+        List<TextPositionSequence> rotatedWords = new ArrayList<>();
+        Iterator<TextPositionSequence> itty = sequences.iterator();
+        while (itty.hasNext()) {
+            var pos = itty.next();
+            if (pos.getTextPositions().get(0).getDir() == 270) {
+                rotatedWords.add(pos);
+                itty.remove();
+            }
+        }
+
+        if (!rotatedWords.isEmpty() && !sequences.isEmpty()) {
+            rotatedWords.sort(Comparator.comparing(TextPositionSequence::getX1));
+        }
+        sequences.addAll(rotatedWords);
+    }
+
+
+    private double round(float value, int decimalPoints) {
+
+        var d = Math.pow(10, decimalPoints);
+        return Math.round(value * d) / d;
+    }
+
 }
@@ -73,8 +73,10 @@ public class ClassificationService {
            }
        } else if (PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordFontSize() > document
                .getFontSizeCounter()
-                .getMostPopular() && PositionUtils.getApproxLineCount(textBlock) < 4.9 && textBlock.getMostPopularWordStyle()
-                .equals("bold")) {
+                .getMostPopular() && PositionUtils.getApproxLineCount(textBlock) < 4.9 && (textBlock.getMostPopularWordStyle()
+                .equals("bold") || !document.getFontStyleCounter().getCountPerValue().containsKey("bold") && textBlock.getMostPopularWordFontSize() > document
+                .getFontSizeCounter()
+                .getMostPopular() + 1) && textBlock.getSequences().get(0).getTextPositions().get(0).getFontSizeInPt() >= textBlock.getMostPopularWordFontSize()) {

            for (int i = 1; i <= headlineFontSizes.size(); i++) {
                if (textBlock.getMostPopularWordFontSize() == headlineFontSizes.get(i - 1)) {
@@ -86,7 +88,7 @@ public class ClassificationService {
                .startsWith("Figure ") && PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordStyle()
                .equals("bold") && !document.getFontStyleCounter()
                .getMostPopular()
-                .equals("bold") && PositionUtils.getApproxLineCount(textBlock) < 2.9) {
+                .equals("bold") && PositionUtils.getApproxLineCount(textBlock) < 2.9 && textBlock.getSequences().get(0).getTextPositions().get(0).getFontSizeInPt() >= textBlock.getMostPopularWordFontSize()) {
            textBlock.setClassification("H " + (headlineFontSizes.size() + 1));
            document.setHeadlines(true);
        } else if (PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordFontSize() == document
@@ -1,6 +1,7 @@
 package com.iqser.red.service.redaction.v1.server.controller;

 import com.iqser.red.commons.spring.ErrorMessage;
+import com.iqser.red.service.redaction.v1.server.exception.NotFoundException;
 import com.iqser.red.service.redaction.v1.server.exception.RulesValidationException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
@@ -36,4 +37,11 @@ public class ControllerAdvice {
        return new ErrorMessage(OffsetDateTime.now(), e.getMessage());
    }

+    @ResponseBody
+    @ResponseStatus(value = HttpStatus.NOT_FOUND)
+    @ExceptionHandler(value = NotFoundException.class)
+    public ErrorMessage handleFileNotFoundException(NotFoundException e) {
+        return new ErrorMessage(OffsetDateTime.now(), e.getMessage());
+    }
+
 }
@@ -1,11 +1,11 @@
 package com.iqser.red.service.redaction.v1.server.controller;

-import com.amazonaws.services.kms.model.NotFoundException;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType;
 import com.iqser.red.service.redaction.v1.model.*;
 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.NotFoundException;
 import com.iqser.red.service.redaction.v1.server.exception.RedactionException;
 import com.iqser.red.service.redaction.v1.server.redaction.service.AnnotationService;
 import com.iqser.red.service.redaction.v1.server.redaction.service.DictionaryService;
@@ -25,6 +25,7 @@ import org.springframework.web.bind.annotation.RestController;

 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.util.stream.Collectors;

@Slf4j
@RestController
@@ -42,14 +43,14 @@ public class RedactionController implements RedactionResource {
    public AnnotateResponse annotate(@RequestBody AnnotateRequest annotateRequest) {

        var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(annotateRequest.getDossierId(), annotateRequest.getFileId(), FileType.ORIGIN));
-        var redactionLog = redactionStorageService.getRedactionLog(annotateRequest.getDossierId(), annotateRequest.getFileId());
+        var mergedRedactionLog = getRedactionLog(RedactionRequest.builder().fileId(annotateRequest.getFileId()).manualRedactions(annotateRequest.getManualRedactions()).dossierId(annotateRequest.getDossierId()).dossierTemplateId(annotateRequest.getDossierTemplateId()).build());
        var sectionsGrid = redactionStorageService.getSectionGrid(annotateRequest.getDossierId(), annotateRequest.getFileId());

        try (PDDocument pdDocument = PDDocument.load(storedObjectStream, MemoryUsageSetting.setupTempFileOnly())) {
            pdDocument.setAllSecurityToBeRemoved(true);

            dictionaryService.updateDictionary(annotateRequest.getDossierTemplateId(), annotateRequest.getDossierId());
-            annotationService.annotate(pdDocument, redactionLog, sectionsGrid);
+            annotationService.annotate(pdDocument, mergedRedactionLog, sectionsGrid);

            try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
                pdDocument.save(byteArrayOutputStream);
@@ -157,12 +158,31 @@ public class RedactionController implements RedactionResource {
            throw new NotFoundException("RedactionLog not present");
        }

+        log.info("Loaded redaction log with computationalVersion: {}", redactionLog.getAnalysisVersion());
+
+        SectionGrid sectionGrid = redactionStorageService.getSectionGrid(redactionRequest.getDossierId(), redactionRequest.getFileId());
+        if (sectionGrid.getSections().isEmpty()) {
+
+            log.info("SectionGrid does not have headlines set. Computing headlines now!");
+            var text = redactionStorageService.getText(redactionRequest.getDossierId(), redactionRequest.getFileId());
+
+            // enhance section grid with headline data
+            for (var sectionText : text.getSectionTexts()) {
+                sectionGrid.getSections().add(new SectionGrid.SectionGridSection(sectionText.getSectionNumber(),
+                        sectionText.getHeadline(),
+                        sectionText.getSectionAreas().stream().map(SectionArea::getPage).collect(Collectors.toSet()),
+                        sectionText.getSectionAreas()));
+            }
+            redactionStorageService.storeObject(redactionRequest.getDossierId(), redactionRequest.getFileId(), FileType.SECTION_GRID, sectionGrid);
+        }
+
+
        log.info("Loaded redaction log with computationalVersion: {}", redactionLog.getAnalysisVersion());
        if (redactionLog.getAnalysisVersion() == 0) {
            // old redaction logs are returned directly
            return redactionLog;
        } else {
-            return redactionLogMergeService.mergeRedactionLogData(redactionLog, redactionRequest.getDossierTemplateId(), redactionRequest.getManualRedactions(), redactionRequest.getExcludedPages());
+            return redactionLogMergeService.mergeRedactionLogData(redactionLog, sectionGrid, redactionRequest.getDossierTemplateId(), redactionRequest.getManualRedactions(), redactionRequest.getExcludedPages());
        }
    }

@@ -0,0 +1,9 @@
+package com.iqser.red.service.redaction.v1.server.exception;
+
+public class NotFoundException extends RuntimeException {
+
+    public NotFoundException(String message) {
+        super(message);
+    }
+
+}
@@ -1,16 +1,33 @@
 package com.iqser.red.service.redaction.v1.server.parsing;

-import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
-import com.iqser.red.service.redaction.v1.server.redaction.model.PdfImage;
-import com.iqser.red.service.redaction.v1.server.tableextraction.model.Ruling;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.extern.slf4j.Slf4j;
+import java.awt.geom.Point2D;
+import java.awt.geom.Rectangle2D;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
 import org.apache.commons.lang3.reflect.FieldUtils;
 import org.apache.pdfbox.contentstream.operator.Operator;
 import org.apache.pdfbox.contentstream.operator.OperatorName;
-import org.apache.pdfbox.contentstream.operator.color.*;
-import org.apache.pdfbox.contentstream.operator.state.*;
+import org.apache.pdfbox.contentstream.operator.color.SetNonStrokingColor;
+import org.apache.pdfbox.contentstream.operator.color.SetNonStrokingColorN;
+import org.apache.pdfbox.contentstream.operator.color.SetNonStrokingColorSpace;
+import org.apache.pdfbox.contentstream.operator.color.SetNonStrokingDeviceCMYKColor;
+import org.apache.pdfbox.contentstream.operator.color.SetNonStrokingDeviceGrayColor;
+import org.apache.pdfbox.contentstream.operator.color.SetNonStrokingDeviceRGBColor;
+import org.apache.pdfbox.contentstream.operator.color.SetStrokingColor;
+import org.apache.pdfbox.contentstream.operator.color.SetStrokingColorN;
+import org.apache.pdfbox.contentstream.operator.color.SetStrokingColorSpace;
+import org.apache.pdfbox.contentstream.operator.color.SetStrokingDeviceCMYKColor;
+import org.apache.pdfbox.contentstream.operator.color.SetStrokingDeviceGrayColor;
+import org.apache.pdfbox.contentstream.operator.color.SetStrokingDeviceRGBColor;
+import org.apache.pdfbox.contentstream.operator.state.SetFlatness;
+import org.apache.pdfbox.contentstream.operator.state.SetLineCapStyle;
+import org.apache.pdfbox.contentstream.operator.state.SetLineDashPattern;
+import org.apache.pdfbox.contentstream.operator.state.SetLineJoinStyle;
+import org.apache.pdfbox.contentstream.operator.state.SetLineMiterLimit;
+import org.apache.pdfbox.contentstream.operator.state.SetLineWidth;
+import org.apache.pdfbox.contentstream.operator.state.SetRenderingIntent;
 import org.apache.pdfbox.contentstream.operator.text.SetFontAndSize;
 import org.apache.pdfbox.cos.COSBase;
 import org.apache.pdfbox.cos.COSName;
@@ -23,12 +40,14 @@ import org.apache.pdfbox.text.PDFTextStripper;
 import org.apache.pdfbox.text.TextPosition;
 import org.apache.pdfbox.util.Matrix;

-import java.awt.geom.AffineTransform;
-import java.awt.geom.Point2D;
-import java.awt.geom.Rectangle2D;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
+import com.iqser.red.service.redaction.v1.server.parsing.model.RedTextPosition;
+import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
+import com.iqser.red.service.redaction.v1.server.redaction.model.PdfImage;
+import com.iqser.red.service.redaction.v1.server.tableextraction.model.Ruling;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;

@Slf4j
 public class PDFLinesTextStripper extends PDFTextStripper {
@@ -189,16 +208,19 @@ public class PDFLinesTextStripper extends PDFTextStripper {
            COSName objectName = (COSName) arguments.get(0);
            PDXObject xobject = getResources().getXObject(objectName);
            if (xobject instanceof PDImageXObject) {
-                PDImageXObject image = (PDImageXObject)xobject;
+                PDImageXObject image = (PDImageXObject) xobject;
                Matrix ctmNew = getGraphicsState().getCurrentTransformationMatrix();

-                Rectangle2D rect = new Rectangle2D.Float(ctmNew.getTranslateX(), ctmNew.getTranslateY(), ctmNew.getScaleX(), ctmNew.getScaleY());
+                Rectangle2D rect = new Rectangle2D.Float(ctmNew.getTranslateX(), ctmNew.getTranslateY(), ctmNew.getScaleX(), ctmNew
+                        .getScaleY());

                // Memory Hack - sofReference kills me
                FieldUtils.writeField(image, "cachedImageSubsampling", -1, true);

                if (rect.getHeight() > 2 && rect.getWidth() > 2) {
-                    this.images.add(new PdfImage(image.getImage(), rect, pageNumber, image.getImage().getColorModel().hasAlpha()));
+                    this.images.add(new PdfImage(image.getImage(), rect, pageNumber, image.getImage()
+                            .getColorModel()
+                            .hasAlpha()));
                }
            }
        } catch (Exception e) {
@@ -207,8 +229,6 @@ public class PDFLinesTextStripper extends PDFTextStripper {
    }


-
-
    private float floatValue(COSBase value) {

        if (value instanceof COSNumber) {
@@ -247,8 +267,16 @@ public class PDFLinesTextStripper extends PDFTextStripper {
    public void writeString(String text, List<TextPosition> textPositions) throws IOException {

        int startIndex = 0;
+        RedTextPosition previous = null;
+
        for (int i = 0; i <= textPositions.size() - 1; i++) {

+            if (!textPositionSequences.isEmpty()) {
+                previous = textPositionSequences.get(textPositionSequences.size() - 1)
+                        .getTextPositions()
+                        .get(textPositionSequences.get(textPositionSequences.size() - 1).getTextPositions().size() - 1);
+            }
+
            int charWidth = (int) textPositions.get(i).getWidthDirAdj();
            if (charWidth < minCharWidth) {
                minCharWidth = charWidth;
@@ -267,42 +295,54 @@ public class PDFLinesTextStripper extends PDFTextStripper {

            if (i == 0 && (textPositions.get(i).getUnicode().equals(" ") || textPositions.get(i)
                    .getUnicode()
-                    .equals("\u00A0"))) {
+                    .equals("\u00A0") || textPositions.get(i)
+                    .getUnicode()
+                    .equals("\t"))) {
                startIndex++;
                continue;
            }

            // Strange but sometimes this is happening, for example: Metolachlor2.pdf
-            if (i > 0 && textPositions.get(i).getX() < textPositions.get(i - 1).getX()) {
+            if (i > 0 && textPositions.get(i).getXDirAdj() < textPositions.get(i - 1).getXDirAdj()) {
                List<TextPosition> sublist = textPositions.subList(startIndex, i);
                if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0)
                        .getUnicode()
-                        .equals(" ") || sublist.get(0).getUnicode().equals("\u00A0")))) {
+                        .equals(" ") || sublist.get(0).getUnicode().equals("\u00A0") || sublist.get(0).getUnicode().equals("\t")))) {
                    textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
                }
                startIndex = i;
            }

-
-            if (textPositions.get(i).getRotation() == 0 && i > 0 && textPositions.get(i).getX() > textPositions.get(i - 1).getEndX() + 1) {
+            if (textPositions.get(i).getRotation() == 0 && i > 0 && textPositions.get(i)
+                    .getX() > textPositions.get(i - 1).getEndX() + 1) {
                List<TextPosition> sublist = textPositions.subList(startIndex, i);
                if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0)
                        .getUnicode()
-                        .equals(" ") || sublist.get(0).getUnicode().equals("\u00A0")))) {
+                        .equals(" ") || sublist.get(0).getUnicode().equals("\u00A0") || sublist.get(0).getUnicode().equals("\t")))) {
                    textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
                }
                startIndex = i;
            }

-
            if (i > 0 && (textPositions.get(i).getUnicode().equals(" ") || textPositions.get(i)
                    .getUnicode()
-                    .equals("\u00A0")) && i <= textPositions.size() - 2) {
+                    .equals("\u00A0") || textPositions.get(i)
+                    .getUnicode()
+                    .equals("\t")) && i <= textPositions.size() - 2) {
                List<TextPosition> sublist = textPositions.subList(startIndex, i);
                if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0)
                        .getUnicode()
-                        .equals(" ") || sublist.get(0).getUnicode().equals("\u00A0")))) {
-                    textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
+                        .equals(" ") || sublist.get(0).getUnicode().equals("\u00A0") || sublist.get(0).getUnicode().equals("\t")))) {
+
+                    // Remove false sequence ends (whitespaces)
+                    if (previous != null && sublist.get(0).getYDirAdj() == previous.getYDirAdj() && sublist.get(0)
+                            .getXDirAdj() - (previous.getXDirAdj() + previous.getWidthDirAdj()) < 0.01) {
+                        for (TextPosition t : sublist) {
+                            textPositionSequences.get(textPositionSequences.size() - 1).add(t);
+                        }
+                    } else {
+                        textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
+                    }
                }
                startIndex = i + 1;
            }
@@ -311,13 +351,23 @@ public class PDFLinesTextStripper extends PDFTextStripper {
        List<TextPosition> sublist = textPositions.subList(startIndex, textPositions.size());
        if (!sublist.isEmpty() && (sublist.get(sublist.size() - 1)
                .getUnicode()
-                .equals(" ") || sublist.get(sublist.size() - 1).getUnicode().equals("\u00A0"))) {
+                .equals(" ") || sublist.get(sublist.size() - 1).getUnicode().equals("\u00A0") || sublist.get(sublist.size() - 1).getUnicode().equals("\t"))) {
            sublist = sublist.subList(0, sublist.size() - 1);
        }
+
        if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0).getUnicode().equals(" ") || sublist.get(0)
                .getUnicode()
-                .equals("\u00A0")))) {
-            textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
+                .equals("\u00A0") || sublist.get(0)
+                .getUnicode()
+                .equals("\t")))) {
+            if (previous != null && sublist.get(0).getYDirAdj() == previous.getYDirAdj() && sublist.get(0)
+                    .getXDirAdj() - (previous.getXDirAdj() + previous.getWidthDirAdj()) < 0.01) {
+                for (TextPosition t : sublist) {
+                    textPositionSequences.get(textPositionSequences.size() - 1).add(t);
+                }
+            } else {
+                textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
+            }
        }
        super.writeString(text);
    }
@@ -22,6 +22,7 @@ public class RedTextPosition {
    private float width;
    private float heightDir;
    private float widthDirAdj;
+    private float dir;

    // not used in reanalysis
    @JsonIgnore
@@ -138,6 +138,13 @@ public class TextPositionSequence implements CharSequence {
    }


+    @JsonIgnore
+    public float getRotationAdjustedX() {
+
+        return textPositions.get(0).getXDirAdj();
+    }
+
+
    @JsonIgnore
    public float getY1() {

@@ -235,7 +242,7 @@ public class TextPositionSequence implements CharSequence {
        float posYInit;
        float posYEnd;

-        if (textPositions.get(0).getRotation() == 90) {
+        if (textPositions.get(0).getRotation() == 90 && textPositions.get(0).getDir() != 0.0f) {
            posXEnd = textPositions.get(0).getYDirAdj() + 2;
            posYInit = getY1();
            posYEnd = textPositions.get(textPositions.size() - 1).getXDirAdj() - height + 4;
@@ -246,17 +253,31 @@ public class TextPositionSequence implements CharSequence {
            posXInit = textPositions.get(0).getPageWidth() - textPositions.get(0).getYDirAdj() - 2;
            posXEnd = textPositions.get(0).getPageWidth() - textPositions.get(textPositions.size() - 1)
                    .getYDirAdj() + height;
-        } else if(textPositions.get(0).getRotation() == 0 && textPositions.stream().map(t -> t.getY()).collect(toSet()).size() > 1) {
+        } else if(textPositions.get(0).getRotation() == 0 && textPositions.get(0).getDir() == 270f) {
            posYInit = textPositions.get(0).getPageHeight() - getX1();
            posYEnd = textPositions.get(0).getPageHeight() - getX2() - textPositions.get(0)
                    .getWidthDirAdj() - textPositions.get(textPositions.size() - 1).getWidthDirAdj() - 3;
            posXInit = textPositions.get(0).getPageWidth() - textPositions.get(0).getYDirAdj() - 2;
            posXEnd = textPositions.get(0).getPageWidth() - textPositions.get(textPositions.size() - 1)
                    .getYDirAdj() + height;
+        } else if(textPositions.get(0).getRotation() == 90 && textPositions.get(0).getDir() == 0.0f){
+            posXInit =  textPositions.get(textPositions.size() - 1)
+                    .getXDirAdj() + textPositions.get(textPositions.size() - 1).getHeightDir();
+            posXEnd = textPositions.get(0).getXDirAdj();
+            posYInit = textPositions.get(0).getPageHeight() - textPositions.get(0).getYDirAdj() - 2;
+            posYEnd = textPositions.get(0).getPageHeight() - textPositions.get(textPositions.size() - 1)
+                    .getYDirAdj() + 2;
+        } else if(textPositions.get(0).getRotation() == 0 && textPositions.get(0).getDir() == 90f){
+            posYInit =  getX1();
+            posYEnd =   getX2() + textPositions.get(0)
+                    .getWidthDirAdj() - textPositions.get(textPositions.size() - 1).getWidthDirAdj() - 3;
+            posXInit =  textPositions.get(0).getYDirAdj() + 2;
+            posXEnd =  textPositions.get(textPositions.size() - 1)
+                    .getYDirAdj() - height;
        }
        else {
            posXEnd = textPositions.get(textPositions.size() - 1)
-                    .getXDirAdj() + textPositions.get(textPositions.size() - 1).getWidth() + 1;
+                    .getXDirAdj() + textPositions.get(textPositions.size() - 1).getWidthDirAdj() + 1;
            posYInit = textPositions.get(0).getPageHeight() - textPositions.get(0).getYDirAdj() - 2;
            posYEnd = textPositions.get(0).getPageHeight() - textPositions.get(textPositions.size() - 1)
                    .getYDirAdj() + 2;
@@ -131,11 +131,27 @@ public class Section {
        return StringUtils.containsIgnoreCase(headline, word);
    }

+
    @ThenAction
    public void expandByRegEx(@Argument(ArgumentType.TYPE) String type,
                              @Argument(ArgumentType.REGEX) String pattern,
                              @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
                              @Argument(ArgumentType.INTEGER) int group) {
+        expandByRegEx(type, pattern, patternCaseInsensitive, group, null);
+    }
+
+    @ThenAction
+    public void expandByRegEx(@Argument(ArgumentType.TYPE) String type,
+                              @Argument(ArgumentType.REGEX) String pattern,
+                              @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
+                              @Argument(ArgumentType.INTEGER) int group,
+                              @Argument(ArgumentType.REGEX) String withoutPattern) {
+
+        Pattern compiledWithoutPattern = null;
+
+        if (withoutPattern != null) {
+            compiledWithoutPattern = Patterns.getCompiledPattern(withoutPattern, patternCaseInsensitive);
+        }

        Pattern compiledPattern = Patterns.getCompiledPattern(pattern, patternCaseInsensitive);

@@ -146,6 +162,13 @@ public class Section {
                continue;
            }

+            if(withoutPattern != null) {
+                Matcher matcherWithout = compiledWithoutPattern.matcher(entity.getWord());
+                if (matcherWithout.find()) {
+                    continue;
+                }
+            }
+
            Matcher matcher = compiledPattern.matcher(entity.getTextAfter());

            while (matcher.find()) {
@@ -10,16 +10,12 @@ import java.util.stream.Stream;

 import com.iqser.red.service.persistence.service.v1.api.model.annotations.*;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType;
+import com.iqser.red.service.redaction.v1.model.*;
+import com.iqser.red.service.redaction.v1.model.Rectangle;
 import org.kie.api.runtime.KieContainer;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.RequestBody;

-import com.iqser.red.service.redaction.v1.model.AnalyzeRequest;
-import com.iqser.red.service.redaction.v1.model.AnalyzeResult;
-import com.iqser.red.service.redaction.v1.model.Rectangle;
-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.StructureAnalyzeRequest;
 import com.iqser.red.service.redaction.v1.server.classification.model.Document;
 import com.iqser.red.service.redaction.v1.server.classification.model.SectionText;
 import com.iqser.red.service.redaction.v1.server.classification.model.Text;
@@ -78,7 +74,15 @@ public class AnalyzeService {
        List<SectionText> sectionTexts = sectionTextBuilderService.buildSectionText(classifiedDoc);
        sectionGridCreatorService.createSectionGrid(classifiedDoc, pageCount);

-        Text text = new Text(pageCount, sectionTexts);
+        Text text = new Text(pageCount,sectionTexts);
+
+        // enhance section grid with headline data
+        sectionTexts.forEach(sectionText -> classifiedDoc
+                .getSectionGrid().getSections().add(new SectionGrid.SectionGridSection(sectionText.getSectionNumber(),
+                        sectionText.getHeadline(),
+                        sectionText.getSectionAreas().stream().map(SectionArea::getPage).collect(Collectors.toSet()),
+                        sectionText.getSectionAreas())));
+
        redactionStorageService.storeObject(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), FileType.TEXT, text);
        redactionStorageService.storeObject(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), FileType.SECTION_GRID, classifiedDoc
                .getSectionGrid());
@@ -169,12 +169,12 @@ public class AnnotationService {

    private float[] toQuadPoint(Rectangle rectangle, PDRectangle mediaBox, PDRectangle cropBox) {

-        var x1 = rectangle.getTopLeft().getX() + cropBox.getLowerLeftX() - mediaBox.getLowerLeftY();
-        var y1 = rectangle.getTopLeft().getY() + (mediaBox.getLowerLeftY() - cropBox.getLowerLeftY());
+        var x1 = rectangle.getTopLeft().getX() + cropBox.getLowerLeftX() - mediaBox.getLowerLeftX() + (cropBox.toString().equals(mediaBox.toString()) ? cropBox.getLowerLeftX() : 0f);
+        var y1 = rectangle.getTopLeft().getY() + (mediaBox.getLowerLeftY() - cropBox.getLowerLeftY()) + (cropBox.toString().equals(mediaBox.toString()) ? cropBox.getLowerLeftY() : 0f);
        var x2 = rectangle.getTopLeft()
-                .getX() + rectangle.getWidth() + cropBox.getLowerLeftX() - mediaBox.getLowerLeftY();
+                .getX() + rectangle.getWidth() + cropBox.getLowerLeftX() - mediaBox.getLowerLeftX() + (cropBox.toString().equals(mediaBox.toString()) ? cropBox.getLowerLeftX() : 0f);
        var y2 = rectangle.getTopLeft()
-                .getY() + rectangle.getHeight() - (mediaBox.getLowerLeftY() - cropBox.getLowerLeftY());
+                .getY() + rectangle.getHeight() - (mediaBox.getLowerLeftY() - cropBox.getLowerLeftY()) + (cropBox.toString().equals(mediaBox.toString()) ? cropBox.getLowerLeftY() : 0f);

        // quadPoints is array of x,y coordinates in Z-like order (top-left, top-right, bottom-left,bottom-right)
        // of the area to be highlighted
@@ -219,8 +219,8 @@ public class EntityRedactionService {
        if (!local) {
            Map<String, Set<String>> nerValuesPerType = getNerValues(sectionNumber, nerEntities, cellstarts);
            nerValuesPerType.entrySet().forEach(entry -> {
-                EntitySearchUtils.addOrAddEngine(found, EntitySearchUtils.find(searchableString, entry.getValue(), entry
-                        .getKey(), headline, sectionNumber, false, false, Engine.NER));
+                EntitySearchUtils.addEntitiesWithHigherRank(found, EntitySearchUtils.find(searchableString, entry.getValue(), entry
+                        .getKey(), headline, sectionNumber, false, false, Engine.NER), dictionary);
            });
        }

@@ -1,5 +1,15 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;

+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.stereotype.Service;
+
 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;
@@ -10,21 +20,20 @@ import com.iqser.red.service.redaction.v1.server.redaction.model.EntityPositionS
 import com.iqser.red.service.redaction.v1.server.redaction.model.Image;
 import com.iqser.red.service.redaction.v1.server.redaction.model.PageEntities;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.IdBuilder;
-import lombok.RequiredArgsConstructor;
-import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.stereotype.Service;

-import java.util.*;
-import java.util.stream.Collectors;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;

@Service
+@Slf4j
@RequiredArgsConstructor
 public class RedactionLogCreatorService {

    private final DictionaryService dictionaryService;


-    public List<RedactionLogEntry> createRedactionLog(PageEntities pageEntities, int numberOfPages, String dossierTemplateId) {
+    public List<RedactionLogEntry> createRedactionLog(PageEntities pageEntities, int numberOfPages,
+                                                      String dossierTemplateId) {

        List<RedactionLogEntry> entries = new ArrayList<>();

@@ -129,16 +138,27 @@ public class RedactionLogCreatorService {
        if (textPositions.size() == 1) {
            rectangles.add(TextPositionSequence.fromData(textPositions, page).getRectangle());
        } else {
+            float x = textPositions.get(0).getXDirAdj();
            float y = textPositions.get(0).getYDirAdj();
+            float width = textPositions.get(0).getWidth();
+            float height = textPositions.get(0).getHeightDir();
            int startIndex = 0;
+
            for (int i = 1; i < textPositions.size(); i++) {
+                float xDirAdj = textPositions.get(i).getXDirAdj();
                float yDirAdj = textPositions.get(i).getYDirAdj();
-                if (yDirAdj != y) {
+                float widthDir = textPositions.get(i).getWidth();
+                float heightDir = textPositions.get(i).getHeightDir();
+
+                if (!(isCharInSameLine(y, yDirAdj, height, heightDir) && isCharClose(x, xDirAdj, width))) {
                    rectangles.add(TextPositionSequence.fromData(textPositions.subList(startIndex, i), page)
                            .getRectangle());
                    y = yDirAdj;
+                    width = widthDir;
+                    height = heightDir;
                    startIndex = i;
                }
+                x = xDirAdj;
            }
            if (startIndex != textPositions.size()) {
                rectangles.add(TextPositionSequence.fromData(textPositions.subList(startIndex, textPositions.size()), page)
@@ -150,6 +170,34 @@ public class RedactionLogCreatorService {
    }


+    private boolean isCharClose(float x, float xDirAdj, float width) {
+
+        float max = x + (5 * width);
+        if (xDirAdj < max) {
+            return true;
+        }
+        return false;
+    }
+
+
+    private boolean isCharInSameLine(float y, float yCompare, float height, float heightCompare) {
+
+        float offsetHeight = height / 2;
+        float minHeight = height - offsetHeight;
+        float maxHeight = height + offsetHeight;
+
+        float offsetY = height / 10;
+        float minY = y - offsetY;
+        float maxY = y + offsetY;
+
+        if (yCompare > minY && yCompare < maxY && heightCompare > minHeight && heightCompare < maxHeight) {
+            return true;
+        }
+
+        return false;
+    }
+
+
    private RedactionLogEntry createRedactionLogEntry(Entity entity, String dossierTemplateId) {

        Set<String> referenceIds = new HashSet<>();
@@ -199,5 +247,4 @@ public class RedactionLogCreatorService {
        return dictionaryService.isRecommendation(type, dossierTemplateId);
    }

-
 }
@@ -1,27 +1,17 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;

-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.*;
-import org.springframework.stereotype.Service;
-
-import com.iqser.red.service.redaction.v1.model.ManualRedactionType;
-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.RedactionLog;
-import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.IdBuilder;
-
+import com.iqser.red.service.redaction.v1.model.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.time.OffsetDateTime;
+import java.util.*;
+import java.util.stream.Collectors;

@Slf4j
@Service
@@ -30,14 +20,16 @@ public class RedactionLogMergeService {

    private final DictionaryService dictionaryService;

+    private final SectionTextService sectionTextService;

-    public RedactionLog mergeRedactionLogData(RedactionLog redactionLog, String dossierTemplateId,
+
+    public RedactionLog mergeRedactionLogData(RedactionLog redactionLog, SectionGrid sectionGrid, String dossierTemplateId,
                                              ManualRedactions manualRedactions, Set<Integer> excludedPages) {

        log.info("Merging Redaction log with manual redactions");
        if (manualRedactions != null) {

-            var manualRedactionLogEntries = addManualAddEntries(manualRedactions.getEntriesToAdd(), manualRedactions.getComments(), dossierTemplateId);
+            var manualRedactionLogEntries = addManualAddEntries(sectionGrid, manualRedactions.getEntriesToAdd(), manualRedactions.getComments(), dossierTemplateId);

            redactionLog.getRedactionLogEntry().addAll(manualRedactionLogEntries);

@@ -53,7 +45,7 @@ public class RedactionLogMergeService {

                if (excludedPages != null && !excludedPages.isEmpty()) {
                    entry.getPositions().forEach(pos -> {
-                        if (excludedPages.contains(pos.getPage())) {
+                        if (!entry.isManual() && excludedPages.contains(pos.getPage())) {
                            entry.setExcluded(true);
                        }
                    });
@@ -94,6 +86,12 @@ public class RedactionLogMergeService {
            }
        });

+        manualRedactions.getResizeRedactions().forEach(item -> {
+            if (item.getSoftDeletedTime() == null) {
+                manualRedactionWrappers.add(new ManualRedactionWrapper(item.getAnnotationId(), item.getRequestDate(), item));
+            }
+        });
+
        Collections.sort(manualRedactionWrappers);

        return manualRedactionWrappers;
@@ -111,6 +109,8 @@ public class RedactionLogMergeService {
                if (imageRecategorization.getStatus().equals(AnnotationStatus.APPROVED)) {
                    redactionLogEntry.setStatus(AnnotationStatus.APPROVED);
                    redactionLogEntry.setType(imageRecategorization.getType());
+                    redactionLogEntry.setHasBeenRecategorized(true);
+                    redactionLogEntry.setSection("Image:" + redactionLogEntry.getType());
                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", recategorized by manual override");
                } else if (imageRecategorization.getStatus().equals(AnnotationStatus.REQUESTED)) {
                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", requested to recategorize");
@@ -137,6 +137,7 @@ public class RedactionLogMergeService {
                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", removed by manual override");
                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry
                            .isRedacted(), true));
+                    redactionLogEntry.setHasBeenRemovedByManualOverride(true);
                } else if (manualRemoval.getStatus().equals(AnnotationStatus.REQUESTED)) {
                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", requested to remove");
                    redactionLogEntry.setStatus(AnnotationStatus.REQUESTED);
@@ -163,6 +164,7 @@ public class RedactionLogMergeService {
                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry
                            .isRedacted(), false));
                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", forced by manual override");
+                    redactionLogEntry.setHasBeenForced(true);
                    redactionLogEntry.setLegalBasis(manualForceRedact.getLegalBasis());
                } else if (manualForceRedact.getStatus().equals(AnnotationStatus.REQUESTED)) {
                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", requested to force redact");
@@ -188,6 +190,11 @@ public class RedactionLogMergeService {
                    redactionLogEntry.setStatus(AnnotationStatus.APPROVED);
                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", legal basis was manually changed");
                    redactionLogEntry.setLegalBasis(manualLegalBasisChange.getLegalBasis());
+                    redactionLogEntry.setRedacted(true);
+                    redactionLogEntry.setHasLegalBasisChanged(true);
+                    if (manualLegalBasisChange.getSection() != null) {
+                        redactionLogEntry.setSection(manualLegalBasisChange.getSection());
+                    }
                } else if (manualLegalBasisChange.getStatus().equals(AnnotationStatus.REQUESTED)) {
                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", legal basis change requested");
                    redactionLogEntry.setStatus(AnnotationStatus.REQUESTED);
@@ -204,6 +211,34 @@ public class RedactionLogMergeService {
                redactionLogEntry.setManualRedactionType(ManualRedactionType.LEGAL_BASIS_CHANGE);
            }

+            if (mrw.getItem() instanceof ManualResizeRedaction) {
+                var manualResizeRedact = (ManualResizeRedaction) mrw.getItem();
+                String manualOverrideReason = null;
+                if (manualResizeRedact.getStatus().equals(AnnotationStatus.APPROVED)) {
+                    redactionLogEntry.setStatus(AnnotationStatus.APPROVED);
+                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry
+                            .isRedacted(), false));
+                    redactionLogEntry.setPositions(convertPositions(manualResizeRedact.getPositions()));
+                    redactionLogEntry.setValue(manualResizeRedact.getValue());
+                    redactionLogEntry.setHasBeenResized(true);
+                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", resized by manual override");
+                } else if (manualResizeRedact.getStatus().equals(AnnotationStatus.REQUESTED)) {
+                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", requested to resize redact");
+                    redactionLogEntry.setStatus(AnnotationStatus.REQUESTED);
+                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, true, redactionLogEntry
+                            .isRedacted(), false));
+                    redactionLogEntry.setPositions(convertPositions(manualResizeRedact.getPositions()));
+                } else {
+                    redactionLogEntry.setStatus(AnnotationStatus.DECLINED);
+                }
+
+                redactionLogEntry.setManualRedactionUserId(manualResizeRedact.getUser());
+                redactionLogEntry.setReason(manualOverrideReason);
+                redactionLogEntry.setManual(true);
+                redactionLogEntry.setManualRedactionType(ManualRedactionType.RESIZE);
+
+            }
+
        });

    }
@@ -222,7 +257,7 @@ public class RedactionLogMergeService {
    }


-    public List<RedactionLogEntry> addManualAddEntries(Set<ManualRedactionEntry> manualAdds,
+    public List<RedactionLogEntry> addManualAddEntries(SectionGrid sectionGrid, Set<ManualRedactionEntry> manualAdds,
                                                       Map<String, List<Comment>> comments, String dossierTemplateId) {

        List<RedactionLogEntry> redactionLogEntries = new ArrayList<>();
@@ -233,6 +268,9 @@ public class RedactionLogMergeService {
                RedactionLogEntry redactionLogEntry = createRedactionLogEntry(manualRedactionEntry, manualRedactionEntry.getAnnotationId(), dossierTemplateId);
                redactionLogEntry.setPositions(convertPositions(manualRedactionEntry.getPositions()));
                redactionLogEntry.setComments(comments.get(manualRedactionEntry.getAnnotationId()));
+
+                sectionTextService.handleSectionText(sectionGrid, redactionLogEntry);
+
                redactionLogEntries.add(redactionLogEntry);
            }
        }
@@ -240,8 +278,8 @@ public class RedactionLogMergeService {
        return redactionLogEntries;
    }

-    private List<Rectangle> convertPositions(List<com.iqser.red.service.persistence.service.v1.api.model.annotations.Rectangle> positions){
-       return positions.stream().map(pos -> new Rectangle(new Point(pos.getTopLeftX(), pos.getTopLeftY()), pos.getWidth(), pos
+    private List<Rectangle> convertPositions(List<com.iqser.red.service.persistence.service.v1.api.model.annotations.Rectangle> positions) {
+        return positions.stream().map(pos -> new Rectangle(new Point(pos.getTopLeftX(), pos.getTopLeftY()), pos.getWidth(), pos
                .getHeight(), pos.getPage())).collect(Collectors.toList());
    }

@@ -264,10 +302,10 @@ public class RedactionLogMergeService {
                .isDossierDictionaryEntry(manualRedactionEntry.isAddToDossierDictionary())
                .legalBasis(manualRedactionEntry.getLegalBasis())
                .value(manualRedactionEntry.getValue())
+                .section(manualRedactionEntry.getSection())
                .type(manualRedactionEntry.getType())
                .redacted(true)
                .isHint(false)
-                .section(null)
                .sectionNumber(-1)
                .manual(true)
                .status(manualRedactionEntry.getStatus())
@@ -0,0 +1,39 @@
+package com.iqser.red.service.redaction.v1.server.redaction.service;
+
+import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
+import com.iqser.red.service.redaction.v1.model.SectionGrid;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+public class SectionTextService {
+
+
+    public void handleSectionText(SectionGrid sectionGrid, RedactionLogEntry redactionLogEntry) {
+
+        if (redactionLogEntry.getSection() != null) {
+            // set by UI
+            return;
+        }
+
+        if (sectionGrid != null) {
+            var firstPosition = !redactionLogEntry.getPositions().isEmpty() ? redactionLogEntry.getPositions().iterator().next() : null;
+
+            if (firstPosition != null) {
+
+                for (var section : sectionGrid.getSections()) {
+                    if (section.getPages().contains(firstPosition.getPage())) {
+                        for (var sectionArea : section.getSectionAreas()) {
+                            if (sectionArea.contains(firstPosition)) {
+                                redactionLogEntry.setSection(section.getHeadline());
+                                redactionLogEntry.setSectionNumber(section.getSectionNumber());
+                                return;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
@@ -1,29 +1,28 @@
 package com.iqser.red.service.redaction.v1.server;

-import com.amazonaws.services.s3.AmazonS3;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.Rectangle;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.*;
-import com.iqser.red.service.persistence.service.v1.api.model.common.JSONPrimitive;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.configuration.Colors;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type.DictionaryEntry;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type.Type;
-import com.iqser.red.service.redaction.v1.model.*;
-import com.iqser.red.service.redaction.v1.server.classification.model.SectionText;
-import com.iqser.red.service.redaction.v1.server.client.DictionaryClient;
-import com.iqser.red.service.redaction.v1.server.client.ImageClassificationClient;
-import com.iqser.red.service.redaction.v1.server.client.LegalBasisClient;
-import com.iqser.red.service.redaction.v1.server.client.RulesClient;
-import com.iqser.red.service.redaction.v1.server.controller.RedactionController;
-import com.iqser.red.service.redaction.v1.server.memory.MemoryStats;
-import com.iqser.red.service.redaction.v1.server.redaction.service.AnalyzeService;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.ResourceLoader;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizationUtilities;
-import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
-import com.iqser.red.storage.commons.StorageAutoConfiguration;
-import com.iqser.red.storage.commons.service.StorageService;
-import lombok.SneakyThrows;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.when;
+
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.time.OffsetDateTime;
+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.UUID;
+import java.util.stream.Collectors;
+
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.junit.After;
@@ -49,15 +48,47 @@ import org.springframework.context.annotation.Primary;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.test.context.junit4.SpringRunner;

-import java.io.*;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.time.OffsetDateTime;
-import java.util.*;
-import java.util.stream.Collectors;
+import com.amazonaws.services.s3.AmazonS3;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.Comment;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.IdRemoval;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualForceRedaction;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualImageRecategorization;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualLegalBasisChange;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactionEntry;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualResizeRedaction;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.Rectangle;
+import com.iqser.red.service.persistence.service.v1.api.model.common.JSONPrimitive;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.configuration.Colors;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type.DictionaryEntry;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type.Type;
+import com.iqser.red.service.redaction.v1.model.AnalyzeRequest;
+import com.iqser.red.service.redaction.v1.model.AnalyzeResult;
+import com.iqser.red.service.redaction.v1.model.AnnotateRequest;
+import com.iqser.red.service.redaction.v1.model.AnnotateResponse;
+import com.iqser.red.service.redaction.v1.model.FileAttribute;
+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.StructureAnalyzeRequest;
+import com.iqser.red.service.redaction.v1.server.classification.model.SectionText;
+import com.iqser.red.service.redaction.v1.server.client.DictionaryClient;
+import com.iqser.red.service.redaction.v1.server.client.ImageClassificationClient;
+import com.iqser.red.service.redaction.v1.server.client.LegalBasisClient;
+import com.iqser.red.service.redaction.v1.server.client.RulesClient;
+import com.iqser.red.service.redaction.v1.server.controller.RedactionController;
+import com.iqser.red.service.redaction.v1.server.memory.MemoryStats;
+import com.iqser.red.service.redaction.v1.server.redaction.service.AnalyzeService;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.ResourceLoader;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizationUtilities;
+import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
+import com.iqser.red.storage.commons.StorageAutoConfiguration;
+import com.iqser.red.storage.commons.service.StorageService;

-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.when;
+import lombok.SneakyThrows;

@RunWith(SpringRunner.class)
@SpringBootTest(classes = Application.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@@ -201,42 +232,26 @@ public class RedactionIntegrationTest {
                .rank(rankTypeMap.get(DOSSIER_REDACTIONS))
                .build()));

-        when(dictionaryClient.getDictionaryForType(VERTEBRATE + ":" + TEST_DOSSIER_TEMPLATE_ID))
-                .thenReturn(getDictionaryResponse(VERTEBRATE, false));
-        when(dictionaryClient.getDictionaryForType(ADDRESS + ":" + TEST_DOSSIER_TEMPLATE_ID))
-                .thenReturn(getDictionaryResponse(ADDRESS, false));
-        when(dictionaryClient.getDictionaryForType(AUTHOR + ":" + TEST_DOSSIER_TEMPLATE_ID))
-                .thenReturn(getDictionaryResponse(AUTHOR, false));
-        when(dictionaryClient.getDictionaryForType(SPONSOR + ":" + TEST_DOSSIER_TEMPLATE_ID))
-                .thenReturn(getDictionaryResponse(SPONSOR, false));
-        when(dictionaryClient.getDictionaryForType(NO_REDACTION_INDICATOR + ":" + TEST_DOSSIER_TEMPLATE_ID))
-                .thenReturn(getDictionaryResponse(NO_REDACTION_INDICATOR, false));
-        when(dictionaryClient.getDictionaryForType(REDACTION_INDICATOR + ":" + TEST_DOSSIER_TEMPLATE_ID))
-                .thenReturn(getDictionaryResponse(REDACTION_INDICATOR, false));
-        when(dictionaryClient.getDictionaryForType(HINT_ONLY + ":" + TEST_DOSSIER_TEMPLATE_ID))
-                .thenReturn(getDictionaryResponse(HINT_ONLY, false));
-        when(dictionaryClient.getDictionaryForType(MUST_REDACT + ":" + TEST_DOSSIER_TEMPLATE_ID))
-                .thenReturn(getDictionaryResponse(MUST_REDACT, false));
-        when(dictionaryClient.getDictionaryForType(PUBLISHED_INFORMATION + ":" + TEST_DOSSIER_TEMPLATE_ID))
-                .thenReturn(getDictionaryResponse(PUBLISHED_INFORMATION, false));
-        when(dictionaryClient.getDictionaryForType(TEST_METHOD + ":" + TEST_DOSSIER_TEMPLATE_ID))
-                .thenReturn(getDictionaryResponse(TEST_METHOD, false));
+        when(dictionaryClient.getDictionaryForType(VERTEBRATE + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(VERTEBRATE, false));
+        when(dictionaryClient.getDictionaryForType(ADDRESS + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(ADDRESS, false));
+        when(dictionaryClient.getDictionaryForType(AUTHOR + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(AUTHOR, false));
+        when(dictionaryClient.getDictionaryForType(SPONSOR + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(SPONSOR, false));
+        when(dictionaryClient.getDictionaryForType(NO_REDACTION_INDICATOR + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(NO_REDACTION_INDICATOR, false));
+        when(dictionaryClient.getDictionaryForType(REDACTION_INDICATOR + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(REDACTION_INDICATOR, false));
+        when(dictionaryClient.getDictionaryForType(HINT_ONLY + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(HINT_ONLY, false));
+        when(dictionaryClient.getDictionaryForType(MUST_REDACT + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(MUST_REDACT, false));
+        when(dictionaryClient.getDictionaryForType(PUBLISHED_INFORMATION + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(PUBLISHED_INFORMATION, false));
+        when(dictionaryClient.getDictionaryForType(TEST_METHOD + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(TEST_METHOD, false));
        when(dictionaryClient.getDictionaryForType(PII + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(PII, false));
-        when(dictionaryClient.getDictionaryForType(RECOMMENDATION_AUTHOR + ":" + TEST_DOSSIER_TEMPLATE_ID))
-                .thenReturn(getDictionaryResponse(RECOMMENDATION_AUTHOR, false));
-        when(dictionaryClient.getDictionaryForType(RECOMMENDATION_ADDRESS + ":" + TEST_DOSSIER_TEMPLATE_ID))
-                .thenReturn(getDictionaryResponse(RECOMMENDATION_ADDRESS, false));
-        when(dictionaryClient.getDictionaryForType(FALSE_POSITIVE + ":" + TEST_DOSSIER_TEMPLATE_ID))
-                .thenReturn(getDictionaryResponse(FALSE_POSITIVE, false));
-        when(dictionaryClient.getDictionaryForType(PURITY + ":" + TEST_DOSSIER_TEMPLATE_ID))
-                .thenReturn(getDictionaryResponse(PURITY, false));
+        when(dictionaryClient.getDictionaryForType(RECOMMENDATION_AUTHOR + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(RECOMMENDATION_AUTHOR, false));
+        when(dictionaryClient.getDictionaryForType(RECOMMENDATION_ADDRESS + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(RECOMMENDATION_ADDRESS, false));
+        when(dictionaryClient.getDictionaryForType(FALSE_POSITIVE + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(FALSE_POSITIVE, false));
+        when(dictionaryClient.getDictionaryForType(PURITY + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(PURITY, false));
        when(dictionaryClient.getDictionaryForType(IMAGE + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(IMAGE, false));
        when(dictionaryClient.getDictionaryForType(OCR + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(OCR, false));
        when(dictionaryClient.getDictionaryForType(LOGO + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(LOGO, false));
-        when(dictionaryClient.getDictionaryForType(SIGNATURE + ":" + TEST_DOSSIER_TEMPLATE_ID))
-                .thenReturn(getDictionaryResponse(SIGNATURE, false));
-        when(dictionaryClient.getDictionaryForType(FORMULA + ":" + TEST_DOSSIER_TEMPLATE_ID))
-                .thenReturn(getDictionaryResponse(FORMULA, false));
+        when(dictionaryClient.getDictionaryForType(SIGNATURE + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(SIGNATURE, false));
+        when(dictionaryClient.getDictionaryForType(FORMULA + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(FORMULA, false));
        when(dictionaryClient.getDictionaryForType(DOSSIER_REDACTIONS + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(DOSSIER_REDACTIONS, true));
        when(dictionaryClient.getColors(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(colors);
    }
@@ -500,8 +515,7 @@ public class RedactionIntegrationTest {
        return Type.builder()
                .id(type + ":" + TEST_DOSSIER_TEMPLATE_ID)
                .hexColor(typeColorMap.get(type))
-                .entries(isDossierDictionary ? toDictionaryEntry(dossierDictionary.get(type)) : toDictionaryEntry(dictionary
-                        .get(type)))
+                .entries(isDossierDictionary ? toDictionaryEntry(dossierDictionary.get(type)) : toDictionaryEntry(dictionary.get(type)))
                .isHint(hintTypeMap.get(type))
                .isCaseInsensitive(caseInSensitiveMap.get(type))
                .isRecommendation(recommendationTypeMap.get(type))
@@ -517,7 +531,8 @@ public class RedactionIntegrationTest {
            dictionaryEntries.add(DictionaryEntry.builder()
                    .value(entry)
                    .version(reanlysisVersions.getOrDefault(entry, 0L))
-                    .deleted(deleted.contains(entry)).build());
+                    .deleted(deleted.contains(entry))
+                    .build());
        });
        return dictionaryEntries;
    }
@@ -645,29 +660,14 @@ public class RedactionIntegrationTest {
    }


-    private List<File> getPathsRecursively(File path) {
-
-        List<File> result = new ArrayList<>();
-        if (path == null || path.listFiles() == null) {
-            return result;
-        }
-        for (File f : path.listFiles()) {
-            if (f.isFile()) {
-                result.add(f);
-            } else {
-                result.addAll(getPathsRecursively(f));
-            }
-        }
-        return result;
-
-    }
-
-
    @Test
-    public void redactionTest() throws IOException {
+    public void redactionTestSeparatedRedaction() throws IOException {
+
+        String fileName = "scanned/VV-380943_page38.pdf";
+        String outputFileName = getTemporaryDirectory() + "/AnnotatedRedactionTestSeparatedRedaction.pdf";

        long start = System.currentTimeMillis();
-        ClassPathResource pdfFileResource = new ClassPathResource("files/S11.pdf");
+        ClassPathResource pdfFileResource = new ClassPathResource(fileName);
        AnalyzeRequest request = prepareStorage(pdfFileResource.getInputStream());
        request.setExcludedPages(Set.of(1));

@@ -729,11 +729,9 @@ public class RedactionIntegrationTest {

        when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(3L);

-        when(dictionaryClient.getDictionaryForType(VERTEBRATE))
-                .thenReturn(getDictionaryResponse(VERTEBRATE, false));
+        when(dictionaryClient.getDictionaryForType(VERTEBRATE)).thenReturn(getDictionaryResponse(VERTEBRATE, false));

-        when(dictionaryClient.getDictionaryForType(FALSE_POSITIVE))
-                .thenReturn(getDictionaryResponse(FALSE_POSITIVE, false));
+        when(dictionaryClient.getDictionaryForType(FALSE_POSITIVE)).thenReturn(getDictionaryResponse(FALSE_POSITIVE, false));

        start = System.currentTimeMillis();

@@ -760,18 +758,133 @@ public class RedactionIntegrationTest {
                .fileId(TEST_FILE_ID)
                .build());

-        try (FileOutputStream fileOutputStream = new FileOutputStream(getTemporaryDirectory() + "/Annotated.pdf")) {
+        try (FileOutputStream fileOutputStream = new FileOutputStream(outputFileName)) {
            fileOutputStream.write(annotateResponse.getDocument());
        }

-
        deleted.remove("mouse");
        reanlysisVersions.put("mouse", 4L);

        when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(4L);

-        when(dictionaryClient.getDictionaryForType(VERTEBRATE))
-                .thenReturn(getDictionaryResponse(VERTEBRATE, false));
+        when(dictionaryClient.getDictionaryForType(VERTEBRATE)).thenReturn(getDictionaryResponse(VERTEBRATE, false));
+
+        analyzeService.reanalyze(request);
+
+        redactionLog = redactionStorageService.getRedactionLog(TEST_DOSSIER_ID, TEST_FILE_ID);
+
+        System.out.println("hi");
+    }
+
+
+    @Test
+    public void redactionTest() throws IOException {
+
+        String fileName = "files/new/VV-919901.pdf";
+        String outputFileName = getTemporaryDirectory() + "/Annotated.pdf";
+
+        long start = System.currentTimeMillis();
+        ClassPathResource pdfFileResource = new ClassPathResource(fileName);
+        AnalyzeRequest request = prepareStorage(pdfFileResource.getInputStream());
+        request.setExcludedPages(Set.of(1));
+
+        request.setFileAttributes(List.of(FileAttribute.builder()
+                .id("fileAttributeId")
+                .label("Vertebrate Study")
+                .placeholder("{fileattributes.vertebrateStudy}")
+                .value("true")
+                .build()));
+
+        analyzeService.analyzeDocumentStructure(new StructureAnalyzeRequest(request.getDossierId(), request.getFileId()));
+        AnalyzeResult result = analyzeService.analyze(request);
+
+        var redactionLog = redactionStorageService.getRedactionLog(TEST_DOSSIER_ID, TEST_FILE_ID);
+        var text = redactionStorageService.getText(TEST_DOSSIER_ID, TEST_FILE_ID);
+
+        long end = System.currentTimeMillis();
+
+        System.out.println("first analysis duration: " + (end - start));
+
+        try (FileOutputStream fileOutputStream = new FileOutputStream(getTemporaryDirectory() + "/Test.json")) {
+            fileOutputStream.write(objectMapper.writeValueAsBytes(redactionStorageService.getText(TEST_DOSSIER_ID, TEST_FILE_ID)));
+        }
+
+        int correctFound = 0;
+        loop:
+        for (RedactionLogEntry redactionLogEntry : redactionLog.getRedactionLogEntry()) {
+            for (SectionText sectionText : text.getSectionTexts()) {
+                if (redactionLogEntry.isImage()) {
+                    correctFound++;
+                    continue loop;
+                }
+                if (redactionLogEntry.getSectionNumber() == sectionText.getSectionNumber()) {
+                    String value = sectionText.getText()
+                            .substring(redactionLogEntry.getStartOffset(), redactionLogEntry.getEndOffset());
+                    if (redactionLogEntry.getValue().equalsIgnoreCase(value)) {
+                        correctFound++;
+                    } else {
+                        throw new RuntimeException("WTF");
+                    }
+                }
+            }
+        }
+        assertThat(correctFound).isEqualTo(redactionLog.getRedactionLogEntry().size());
+
+        dictionary.get(AUTHOR).add("properties");
+        reanlysisVersions.put("properties", 1L);
+
+        dictionary.get(AUTHOR).add("physical");
+        reanlysisVersions.put("physical", 2L);
+
+        deleted.add("David Chubb");
+        deleted.add("mouse");
+
+        dictionary.get(FALSE_POSITIVE).add("David Chubb");
+        reanlysisVersions.put("David Chubb", 3L);
+
+        reanlysisVersions.put("mouse", 3L);
+
+        when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(3L);
+
+        when(dictionaryClient.getDictionaryForType(VERTEBRATE)).thenReturn(getDictionaryResponse(VERTEBRATE, false));
+
+        when(dictionaryClient.getDictionaryForType(FALSE_POSITIVE)).thenReturn(getDictionaryResponse(FALSE_POSITIVE, false));
+
+        start = System.currentTimeMillis();
+
+        ManualRedactions manualRedactions = new ManualRedactions();
+
+        manualRedactions.setImageRecategorization(Set.of(ManualImageRecategorization.builder()
+                .annotationId("37eee3e9d589a5cc529bfec38c3ba479")
+                .fileId("fileId")
+                .status(AnnotationStatus.APPROVED)
+                .type("signature")
+                .build()));
+
+        request.setManualRedactions(manualRedactions);
+
+        AnalyzeResult reanalyzeResult = analyzeService.reanalyze(request);
+
+        redactionLog = redactionStorageService.getRedactionLog(TEST_DOSSIER_ID, TEST_FILE_ID);
+
+        end = System.currentTimeMillis();
+        System.out.println("reanalysis analysis duration: " + (end - start));
+
+        AnnotateResponse annotateResponse = redactionController.annotate(AnnotateRequest.builder()
+                .dossierId(TEST_DOSSIER_ID)
+                .fileId(TEST_FILE_ID)
+                .build());
+
+        try (FileOutputStream fileOutputStream = new FileOutputStream(outputFileName)) {
+            fileOutputStream.write(annotateResponse.getDocument());
+        }
+
+        deleted.remove("mouse");
+        reanlysisVersions.put("mouse", 4L);
+
+        when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(4L);
+
+        when(dictionaryClient.getDictionaryForType(VERTEBRATE)).thenReturn(getDictionaryResponse(VERTEBRATE, false));

        analyzeService.reanalyze(request);

@@ -847,21 +960,19 @@ public class RedactionIntegrationTest {
        manualRedactionEntry.setType("name");
        manualRedactionEntry.setValue("O'Loughlin C.K.");
        manualRedactionEntry.setReason("Manual Redaction");
-        manualRedactionEntry.setPositions(List.of(Rectangle
-                        .builder()
-                        .topLeftX(375.61096f)
-                        .topLeftY(241.282f)
-                        .width(7.648041f)
-                        .height(43.72262f)
-                        .page(1).build()
-                , Rectangle
-                        .builder()
-                        .topLeftX(384.83517f)
-                        .topLeftY(241.282f)
-                        .width(7.648041f)
-                        .height(17.043358f)
-                        .page(1).build())
-        );
+        manualRedactionEntry.setPositions(List.of(Rectangle.builder()
+                .topLeftX(375.61096f)
+                .topLeftY(241.282f)
+                .width(7.648041f)
+                .height(43.72262f)
+                .page(1)
+                .build(), Rectangle.builder()
+                .topLeftX(384.83517f)
+                .topLeftY(241.282f)
+                .width(7.648041f)
+                .height(17.043358f)
+                .page(1)
+                .build()));

 //        manualRedactions.getEntriesToAdd().add(manualRedactionEntry);

@@ -906,7 +1017,7 @@ public class RedactionIntegrationTest {
    public void classificationTest() throws IOException {

        System.out.println("classificationTest");
-        ClassPathResource pdfFileResource = new ClassPathResource("files/S11.pdf");
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/Single Table.pdf");

        AnalyzeRequest request = prepareStorage(pdfFileResource.getInputStream());

@@ -928,7 +1039,7 @@ public class RedactionIntegrationTest {
    public void sectionsTest() throws IOException {

        System.out.println("sectionsTest");
-        ClassPathResource pdfFileResource = new ClassPathResource("files/S11.pdf");
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/Single Table.pdf");

        AnalyzeRequest request = prepareStorage(pdfFileResource.getInputStream());

@@ -950,7 +1061,7 @@ public class RedactionIntegrationTest {
    public void htmlTablesTest() throws IOException {

        System.out.println("htmlTablesTest");
-        ClassPathResource pdfFileResource = new ClassPathResource("files/S11.pdf");
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/Single Table.pdf");

        AnalyzeRequest request = prepareStorage(pdfFileResource.getInputStream());

@@ -1064,6 +1175,160 @@ public class RedactionIntegrationTest {
    }


+    @Test
+    public void resizeRedactionTest() throws IOException {
+
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/Single Table.pdf");
+
+        ManualRedactions manualRedactions = new ManualRedactions();
+
+        String manualAddId = UUID.randomUUID().toString();
+
+        Comment comment = Comment.builder()
+                .date(OffsetDateTime.now())
+                .user("TEST_USER")
+                .text("This is a comment test")
+                .build();
+        manualRedactions.setIdsToRemove(Set.of(IdRemoval.builder()
+                .annotationId("5b940b2cb401ed9f5be6fc24f6e77bcf")
+                .fileId("fileId")
+                .status(AnnotationStatus.DECLINED)
+                .processedDate(OffsetDateTime.now())
+                .requestDate(OffsetDateTime.now())
+                .build()));
+        manualRedactions.setForceRedactions(Set.of(ManualForceRedaction.builder()
+                .annotationId("675eba69b0c2917de55462c817adaa05")
+                .fileId("fileId")
+                .legalBasis("Something")
+                .status(AnnotationStatus.APPROVED)
+                .requestDate(OffsetDateTime.now())
+                .processedDate(OffsetDateTime.now())
+                .build()));
+
+        manualRedactions.getComments().put("e5be0f1d941bbb92a068e198648d06c4", List.of(comment));
+        manualRedactions.getComments().put("0836727c3508a0b2ea271da69c04cc2f", List.of(comment));
+        manualRedactions.getComments().put(manualAddId, List.of(comment));
+
+        ManualRedactionEntry manualRedactionEntry = new ManualRedactionEntry();
+        manualRedactionEntry.setAnnotationId(manualAddId);
+        manualRedactionEntry.setFileId("fileId");
+        manualRedactionEntry.setStatus(AnnotationStatus.APPROVED);
+        manualRedactionEntry.setType("CBI_author");
+        manualRedactionEntry.setValue("O'Loughlin C.K.");
+        manualRedactionEntry.setReason("Manual Redaction");
+        manualRedactionEntry.setProcessedDate(OffsetDateTime.now());
+        manualRedactionEntry.setRequestDate(OffsetDateTime.now());
+        manualRedactionEntry.setPositions(List.of(Rectangle.builder()
+                .topLeftX(375.61096f)
+                .topLeftY(241.282f)
+                .width(7.648041f)
+                .height(43.72262f)
+                .page(1)
+                .build(), Rectangle.builder()
+                .topLeftX(384.83517f)
+                .topLeftY(241.282f)
+                .width(7.648041f)
+                .height(17.043358f)
+                .page(1)
+                .build()));
+
+//        manualRedactions.getEntriesToAdd().add(manualRedactionEntry);
+
+        AnalyzeRequest request = prepareStorage(pdfFileResource.getInputStream());
+        request.setManualRedactions(manualRedactions);
+        analyzeService.analyzeDocumentStructure(new StructureAnalyzeRequest(request.getDossierId(), request.getFileId()));
+        AnalyzeResult result = analyzeService.analyze(request);
+
+        manualRedactions.getEntriesToAdd().add(manualRedactionEntry);
+        manualRedactions.setIdsToRemove(Set.of(IdRemoval.builder()
+                .annotationId("5b940b2cb401ed9f5be6fc24f6e77bcf")
+                .fileId("fileId")
+                .status(AnnotationStatus.APPROVED)
+                .requestDate(OffsetDateTime.now())
+                .processedDate(OffsetDateTime.now())
+                .build()));
+        manualRedactions.setLegalBasisChanges((Set.of(ManualLegalBasisChange.builder()
+                .annotationId("675eba69b0c2917de55462c817adaa05")
+                .fileId("fileId")
+                .legalBasis("Manual Legal Basis Change")
+                .status(AnnotationStatus.APPROVED)
+                .processedDate(OffsetDateTime.now())
+                .requestDate(OffsetDateTime.now())
+                .build())));
+        manualRedactions.setResizeRedactions(Set.of(ManualResizeRedaction.builder()
+                .annotationId("fc287b74be2421156ab2895c7474ccdd")
+                .fileId("fileId")
+                .processedDate(OffsetDateTime.now())
+                .requestDate(OffsetDateTime.now())
+                .value("Syngenta Crop Protection AG, Basel, Switzerland RCC Ltd., Itingen, Switzerland")
+                .positions(List.of(Rectangle.builder()
+                        .topLeftX(289.44595f)
+                        .topLeftY(327.567f)
+                        .width(7.648041f)
+                        .height(82.51475f)
+                        .page(1)
+                        .build(), Rectangle.builder()
+                        .topLeftX(298.67056f)
+                        .topLeftY(327.567f)
+                        .width(7.648041f)
+                        .height(75.32377f)
+                        .page(1)
+                        .build(), Rectangle.builder()
+                        .topLeftX(307.89517f)
+                        .topLeftY(327.567f)
+                        .width(7.648041f)
+                        .height(61.670967f)
+                        .page(1)
+                        .build(), Rectangle.builder()
+                        .topLeftX(316.99985f)
+                        .topLeftY(327.567f)
+                        .width(7.648041f)
+                        .height(38.104286f)
+                        .page(1)
+                        .build()))
+                .status(AnnotationStatus.APPROVED)
+                .build()));
+
+        analyzeService.reanalyze(request);
+
+        AnnotateResponse annotateResponse = redactionController.annotate(AnnotateRequest.builder()
+                .dossierId(TEST_DOSSIER_ID)
+                .fileId(TEST_FILE_ID)
+                .dossierTemplateId(TEST_DOSSIER_TEMPLATE_ID)
+                .manualRedactions(manualRedactions)
+                .build());
+
+        try (FileOutputStream fileOutputStream = new FileOutputStream(getTemporaryDirectory() + "/Annotated.pdf")) {
+            fileOutputStream.write(annotateResponse.getDocument());
+        }
+
+    }
+
+    @Test
+    public void testExpandByRegEx() throws IOException {
+
+        System.out.println("expandByRegex");
+        long start = System.currentTimeMillis();
+
+        AnalyzeRequest request = prepareStorage("files/Metolachlor/S-Metolachlor_RAR_02_Volume_2_2018-09-06.pdf");
+        analyzeService.analyzeDocumentStructure(new StructureAnalyzeRequest(request.getDossierId(), request.getFileId()));
+        AnalyzeResult result = analyzeService.analyze(request);
+
+        AnnotateResponse annotateResponse = redactionController.annotate(AnnotateRequest.builder()
+                .dossierId(TEST_DOSSIER_ID)
+                .fileId(TEST_FILE_ID)
+                .build());
+
+        try (FileOutputStream fileOutputStream = new FileOutputStream(getTemporaryDirectory() + "/Annotated.pdf")) {
+            fileOutputStream.write(annotateResponse.getDocument());
+        }
+        long end = System.currentTimeMillis();
+
+        System.out.println("duration: " + (end - start));
+        System.out.println("numberOfPages: " + result.getNumberOfPages());
+    }
+
+
    private static String loadFromClassPath(String path) {

        URL resource = ResourceLoader.class.getClassLoader().getResource(path);
@@ -1082,7 +1347,27 @@ public class RedactionIntegrationTest {
        }
    }

+
+    private List<File> getPathsRecursively(File path) {
+
+        List<File> result = new ArrayList<>();
+        if (path == null || path.listFiles() == null) {
+            return result;
+        }
+        for (File f : path.listFiles()) {
+            if (f.isFile()) {
+                result.add(f);
+            } else {
+                result.addAll(getPathsRecursively(f));
+            }
+        }
+        return result;
+
+    }
+
+
    private static String getTemporaryDirectory() {
+
        String tmpdir = System.getProperty("java.io.tmpdir");
        if (StringUtils.isNotBlank(tmpdir)) {
            return tmpdir;
@@ -1,3 +1,8 @@
+A & L Laboratories, 3505 Conestoga Drive, Fort Wayne, IN 46806-4413, Indiana, USA
+Jealotts Hill Research Station, Bracknell
+Jealott s Hill Research Station, Bracknell
+Western Research Center, 120
+Fort Wayne, IN 46806-4413, Indiana
 Abandoned vineyard, Northern Italy
 ABC Analytical Bio-Chemistry Lab. Inc.
 ABC Analytical Bio-Chemistry Lab. Inc., Columbia, USA
@@ -1633,6 +1638,7 @@ XenoTech, LLC, 16825 West 116th Street, Lenexa, KS, USA
 Zeneca Ag Products
 Zeneca Ag Products, Richmond, USA
 Zeneca Agrochemicals
+ZENECA Agrochemicals
 Zeneca Agrochemicals, Fernhurst, United Kingdom
 Zeneca Agrochemicals, Jealott’s Hill Research Station, Bracknell, Berkshire, UK
 Zeneca Agrochemical s, Jealott’s Hill, United Kingdom
@@ -1,3 +1,30 @@
+Johnson R |
+Weissler M S and Butters C A
+AD Hurt
+N Pengelly
+HA J Napper
+E M Roper
+Earl M
+Weissler M S
+Warrinton J S
+Kuet SF
+Hadeld ST
+Butters C A
+Hurt AD
+Campbell AJ
+Runnalls JK
+Tummon O J
+Chapman PF
+Snell RJ
+MclIndoe EC
+Johnson R I
+Richard Andrews
+James Paul
+Walter Richard Andrews
+Wilbur H. Palmer
+Jeff Mueller
+James McDonelI
+Jeffrey S. Heither
 1 Braid S.and Tsui G
 1 Schwader A.L.
 2 Lee MR
@@ -0,0 +1,5 @@
+Amendment 1
+Report Number: 33168
+Page
+Report Number: BFI0714
+Tesh Consultants International
@@ -7,12 +7,20 @@ global Section section

 // --------------------------------------- CBI rules -------------------------------------------------------------------

+//rule "0: Expand CBI Authors with firstname initials"
+//    when
+//        Section(matchesType("CBI_author") || matchesType("recommendation_CBI_author"))
+//    then
+//        section.expandByRegEx("CBI_author", "(,? [A-Z]\\.?( ?[A-Z]\\.?)?( ?[A-Z]\\.?)?\\b\\.?)", false, 1);
+//        section.expandByRegEx("recommendation_CBI_author", "(,? [A-Z]\\.?( ?[A-Z]\\.?)?( ?[A-Z]\\.?)?\\b\\.?)", false, 1);
+//    end
+
 rule "0: Expand CBI Authors with firstname initials"
    when
        Section(matchesType("CBI_author") || matchesType("recommendation_CBI_author"))
    then
-        section.expandByRegEx("CBI_author", "(,? [A-Z]\\.?( ?[A-Z]\\.?)?( ?[A-Z]\\.?)?\\b\\.?)", false, 1);
-        section.expandByRegEx("recommendation_CBI_author", "(,? [A-Z]\\.?( ?[A-Z]\\.?)?( ?[A-Z]\\.?)?\\b\\.?)", false, 1);
+        section.expandByRegEx("CBI_author", "(,? [A-Z]\\.?( ?[A-Z]\\.?)?( ?[A-Z]\\.?)?\\b\\.?)", false, 1, "[^\\s]+");
+        section.expandByRegEx("recommendation_CBI_author", "(,? [A-Z]\\.?( ?[A-Z]\\.?)?( ?[A-Z]\\.?)?\\b\\.?)", false, 1, "[^\\s]+");
    end


@@ -7,12 +7,20 @@ global Section section

 // --------------------------------------- CBI rules -------------------------------------------------------------------

+//rule "0: Expand CBI Authors with firstname initials"
+//    when
+//        Section(matchesType("CBI_author") || matchesType("recommendation_CBI_author"))
+//    then
+//        section.expandByRegEx("CBI_author", "(,? [A-Z]\\.?( ?[A-Z]\\.?)?( ?[A-Z]\\.?)?\\b\\.?)", false, 1);
+//        section.expandByRegEx("recommendation_CBI_author", "(,? [A-Z]\\.?( ?[A-Z]\\.?)?( ?[A-Z]\\.?)?\\b\\.?)", false, 1);
+//    end
+
 rule "0: Expand CBI Authors with firstname initials"
    when
        Section(matchesType("CBI_author") || matchesType("recommendation_CBI_author"))
    then
-        section.expandByRegEx("CBI_author", "(,? [A-Z]\\.?( ?[A-Z]\\.?)?( ?[A-Z]\\.?)?\\b\\.?)", false, 1);
-        section.expandByRegEx("recommendation_CBI_author", "(,? [A-Z]\\.?( ?[A-Z]\\.?)?( ?[A-Z]\\.?)?\\b\\.?)", false, 1);
+        section.expandByRegEx("CBI_author", "(,? [A-Z]\\.?( ?[A-Z]\\.?)?( ?[A-Z]\\.?)?\\b\\.?)", false, 1, "[^\\s]+");
+        section.expandByRegEx("recommendation_CBI_author", "(,? [A-Z]\\.?( ?[A-Z]\\.?)?( ?[A-Z]\\.?)?\\b\\.?)", false, 1, "[^\\s]+");
    end
Author	SHA1	Message	Date
Philipp Schramm	8d881d4ca6	Pull request #280 : RED-2756 Bugfix with redactions are not continuous and added some entries to dictionary Merge in RED/redaction-service from bugfix/RED-2756 to master * commit '35a4d004fda0404e9b19e7112d25627cbde2a932': RED-2756 Bugfix with redactions are not continuous and added some entries to dictionary	2021-11-30 11:15:32 +01:00
Philipp Schramm	35a4d004fd	RED-2756 Bugfix with redactions are not continuous and added some entries to dictionary	2021-11-30 11:05:06 +01:00
Ali Oezyetimoglu	ad80d4247c	Pull request #278 : RED-2841: INC6207970 Rule for initials expansion should be applied only to dictionary entries without whitespaces Merge in RED/redaction-service from RED-2841-rs1 to master * commit 'd1317c5bd4f9522eecd78775656a0f7b5a74c3d7': RED-2841: INC6207970 Rule for initials expansion should be applied only to dictionary entries without whitespaces	2021-11-29 15:40:51 +01:00
aoezyetimoglu	d1317c5bd4	RED-2841: INC6207970 Rule for initials expansion should be applied only to dictionary entries without whitespaces	2021-11-29 12:38:53 +01:00
Philipp Schramm	f5817204bf	Pull request #277 : Bugfix/RED-2756 Merge in RED/redaction-service from bugfix/RED-2756 to master * commit '9d0fafd63ddb23fd8ee2f154e02df88687e08f96': RED-2756 Bugfix with redactions are not continuous RED-2756 Bugfix for 'Redaction is not continuous', compare line height and y position instead of rounding y values	2021-11-29 10:36:05 +01:00
Philipp Schramm	9d0fafd63d	RED-2756 Bugfix with redactions are not continuous	2021-11-29 10:31:32 +01:00
Philipp Schramm	6230f42fcf	RED-2756 Bugfix for 'Redaction is not continuous', compare line height and y position instead of rounding y values	2021-11-25 16:40:26 +01:00
Timo Bejan	571035dda1	Pull request #275 : redaction-log info for RED-2659 Merge in RED/redaction-service from section-info to master * commit '892fa6ade0c9f260183686535612e7423ed2ec09': redaction-log info for RED-2659	2021-11-22 13:49:44 +01:00
Timo Bejan	892fa6ade0	redaction-log info for RED-2659	2021-11-22 14:45:02 +02:00
Timo Bejan	ab9dcbbafb	Pull request #274 : section info port Merge in RED/redaction-service from section-info to master * commit '980d14b6049c0e7f52c2cc4fffbffa7d5bf54b08': section info port	2021-11-22 08:51:10 +01:00
Timo Bejan	980d14b604	section info port	2021-11-22 09:46:12 +02:00
Timo Bejan	1cefa3dc05	Pull request #273 : 2 new falgs for UI indicators Merge in RED/redaction-service from redaction-log-updates to master * commit 'f80eb6d791f35aa96249ef783e56164db85c8278': 2 new falgs for UI indicators	2021-11-18 10:24:39 +01:00
Timo Bejan	f80eb6d791	2 new falgs for UI indicators	2021-11-18 11:18:34 +02:00
Philipp Schramm	e42d5180ec	Pull request #272 : RED-2430 do not exclude manual entries from excluded pages Merge in RED/redaction-service from feature/RED-2430 to master * commit '3ae8b2cd666eee2fff10e2254cd829084e503893': RED-2430 do not exclude manual entries from excluded pages	2021-11-16 08:53:19 +01:00
Philipp Schramm	3ae8b2cd66	RED-2430 do not exclude manual entries from excluded pages	2021-11-15 16:39:53 +01:00
Philipp Schramm	a6a1d51c17	Pull request #271 : RED-2633 Added section to manual redactions, updated version from persistence-service and extracted versions in pom.xm Merge in RED/redaction-service from RED-2633 to master * commit '6e713c4fcc010e6461e403256c4926974cec2cf8': RED-2633 Added section to manual redactions, updated version from persistence-service and extracted versions in pom.xm	2021-11-15 14:56:52 +01:00
Philipp Schramm	6e713c4fcc	RED-2633 Added section to manual redactions, updated version from persistence-service and extracted versions in pom.xm	2021-11-15 14:36:35 +01:00
Dominique Eiflaender	2c6957360b	Pull request #269 : RED-2742: Fixed annotation positions for rotation = 0 and direction = 90 Merge in RED/redaction-service from RED-2742 to master * commit 'a91877769370c804b7d9d9fa4d4e9e16752598bd': RED-2742: Fixed annotation positions for rotation = 0 and direction = 90	2021-11-12 10:16:52 +01:00
deiflaender	a918777693	RED-2742: Fixed annotation positions for rotation = 0 and direction = 90	2021-11-12 10:06:27 +01:00
Dominique Eiflaender	d8662e8e20	Pull request #266 : RED-2624: Fixed footnote is recognized as headline Merge in RED/redaction-service from RED-2624 to master * commit '3c861074c9923a59fc71e2f57ee47c838ddbe3fe': RED-2624: Fixed footnote is recognized as headline	2021-11-03 12:25:43 +01:00
Dominique Eifländer	3c861074c9	RED-2624: Fixed footnote is recognized as headline	2021-11-03 12:11:38 +01:00
Dominique Eiflaender	3250d1791c	Pull request #265 : RED-2623: Fixed headline handline on strange ocr document Merge in RED/redaction-service from RED-2623 to master * commit '1b328b2b68da0b5be71d2f7464c767357003e4f2': RED-2623: Fixed headline handline on strange ocr document	2021-11-02 16:35:06 +01:00
Dominique Eifländer	1b328b2b68	RED-2623: Fixed headline handline on strange ocr document	2021-11-02 14:47:41 +01:00
Christoph Schabert	affed2258c	Pull request #261 : Split nightly and normal build Merge in RED/redaction-service from RED-2312 to master * commit '499c36b53d9b307c4899774e1d669482aa850a9f': Split nightly and normal build	2021-11-02 11:13:47 +01:00
Dominique Eiflaender	9d0973c037	Pull request #262 : RED-2482: Always redact manual justification changes Merge in RED/redaction-service from RED-2482-A to master * commit '394e2fd4ed24e765e1bfc919688107a96af85fec': RED-2482: Always redact manual justification changes	2021-10-28 15:18:59 +02:00
Dominique Eifländer	394e2fd4ed	RED-2482: Always redact manual justification changes	2021-10-28 15:09:34 +02:00
cschabert	499c36b53d	Split nightly and normal build	2021-10-28 15:00:46 +02:00
Dominique Eiflaender	65b186be28	Pull request #259 : RED-2536 Merge in RED/redaction-service from RED-2536 to master * commit 'd892d6e81ee12927e57dc46c6439a65276824896': RED-2536: Treat \t same as whitespace RED-2223: Fixed stange end of textposition sequences that leads to wrong whitespaces	2021-10-28 12:52:47 +02:00
Dominique Eifländer	d892d6e81e	RED-2536: Treat \t same as whitespace	2021-10-28 12:42:18 +02:00
Dominique Eifländer	50017e7230	RED-2223: Fixed stange end of textposition sequences that leads to wrong whitespaces	2021-10-28 12:23:58 +02:00
Dominique Eiflaender	997317a683	Pull request #258 : RED-2575: Fixed annotating entries on pages with cropbox != mediabox Merge in RED/redaction-service from RED-2575 to master * commit '012c5a794639eee34e392e940d5e380a5ea06df7': RED-2575: Fixed annotating entries on pages with cropbox != mediabox	2021-10-26 14:23:32 +02:00
Dominique Eifländer	012c5a7946	RED-2575: Fixed annotating entries on pages with cropbox != mediabox	2021-10-26 13:51:47 +02:00
Ali Oezyetimoglu	a351761257	Pull request #256 : RED-2429: As a user I want to resize a redaction Merge in RED/redaction-service from RED-2429-rs1 to master * commit 'd8f8702b2a78e7a3bc12e55791c251f3445d5b5e': RED-2429: As a user I want to resize a redaction	2021-10-22 12:23:54 +02:00
aoezyetimoglu	d8f8702b2a	RED-2429: As a user I want to resize a redaction	2021-10-22 12:05:31 +02:00
Dominique Eiflaender	0abcca97b3	Pull request #255 : RED-2418: Fixed not working exception handling if redactionlog is not present Merge in RED/redaction-service from RED-2418 to master * commit 'f66a054cdea311376ffa88a6641b7eae9be6689f': RED-2418: Fixed not working exception handling if redactionlog is not present	2021-10-22 11:05:38 +02:00
Dominique Eifländer	f66a054cde	RED-2418: Fixed not working exception handling if redactionlog is not present	2021-10-22 10:33:42 +02:00
Dominique Eiflaender	0cc71897b8	Pull request #254 : RED-2224: Fixed overriding entries with higher rank Merge in RED/redaction-service from RED-2224-2 to master * commit '634eee17167e01e2d4ee4d3d7b9613225e8c5643': RED-2224: Fixed overriding entries with higher rank	2021-10-19 15:38:44 +02:00
Dominique Eifländer	634eee1716	RED-2224: Fixed overriding entries with higher rank	2021-10-19 15:32:20 +02:00
Dominique Eiflaender	fbad9a759b	Pull request #253 : RED-2224: Fixed missing values in engines Merge in RED/redaction-service from RED-2224 to master * commit 'fa8f598763efb334e21624df468d7e1802477076': RED-2224: Fixed missing values in engines	2021-10-19 11:45:38 +02:00