Fixed table extraction problems

Pull request #115 : Expand CBI Authors with firstname initials
Merge in RED/redaction-service from ExpandAuthors to master * commit '35f3582d0850053c1dc38ef0b149daa47bd9cc56': Expand CBI Authors with firstname initials
2021-02-03 14:34:29 +01:00 · 2021-02-02 12:35:07 +01:00 · 2021-02-02 12:20:40 +01:00 · 2021-02-01 16:17:19 +01:00 · 2021-02-01 16:04:45 +01:00 · 2021-02-01 15:46:57 +01:00
29 changed files with 961 additions and 486 deletions
@@ -0,0 +1,17 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class AnalyzeRequest {
+
+    private byte[] document;
+    private String ruleSetId;
+    private ManualRedactions manualRedactions;
+}
@@ -0,0 +1,18 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class AnalyzeResult {
+
+    private int numberOfPages;
+    private RedactionLog redactionLog;
+    private SectionGrid sectionGrid;
+
+}
@@ -0,0 +1,17 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class AnnotateRequest {
+
+    private byte[] document;
+    private RedactionLog redactionLog;
+    private SectionGrid sectionGrid;
+}
@@ -0,0 +1,15 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class AnnotateResponse {
+
+    private byte[] document;
+}
@@ -37,4 +37,7 @@ public class RedactionLogEntry {
    private String textBefore;
    private String textAfter;

+    @Builder.Default
+    private List<Comment> comments = new ArrayList<>();
+
 }
@@ -13,6 +13,5 @@ public class RedactionRequest {

    private byte[] document;
    private String ruleSetId;
-    private boolean flatRedaction;
    private ManualRedactions manualRedactions;
 }
@@ -1,5 +1,9 @@
 package com.iqser.red.service.redaction.v1.resources;

+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.RedactionRequest;
 import com.iqser.red.service.redaction.v1.model.RedactionResult;
 import org.springframework.http.MediaType;
@@ -14,8 +18,11 @@ public interface RedactionResource {
    String RULE_SET_PARAMETER_NAME = "ruleSetId";
    String RULE_SET_PATH_VARIABLE = "/{" + RULE_SET_PARAMETER_NAME + "}";

-    @PostMapping(value = "/redact", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
-    RedactionResult redact(@RequestBody RedactionRequest redactionRequest);
+    @PostMapping(value = "/analyze", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
+    AnalyzeResult analyze(@RequestBody AnalyzeRequest analyzeRequest);
+
+    @PostMapping(value = "/annotate", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
+    AnnotateResponse annotate(@RequestBody AnnotateRequest annotateRequest);

    @PostMapping(value = "/debug/classifications", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
    RedactionResult classify(@RequestBody RedactionRequest redactionRequest);
@@ -1,5 +1,6 @@
 package com.iqser.red.service.redaction.v1.server.classification.model;

+import java.awt.geom.Rectangle2D;
 import java.util.List;

 import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
@@ -16,6 +17,8 @@ public class Page {
    @NonNull
    private List<AbstractTextContainer> textBlocks;

+    private List<Rectangle2D> imageBounds;
+
    private Rectangle bodyTextFrame;

    private boolean landscape;
@@ -1,5 +1,9 @@
 package com.iqser.red.service.redaction.v1.server.controller;

+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.RedactionLog;
 import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
 import com.iqser.red.service.redaction.v1.model.RedactionRequest;
@@ -9,12 +13,14 @@ import com.iqser.red.service.redaction.v1.resources.RedactionResource;
 import com.iqser.red.service.redaction.v1.server.classification.model.Document;
 import com.iqser.red.service.redaction.v1.server.classification.model.Page;
 import com.iqser.red.service.redaction.v1.server.exception.RedactionException;
+import com.iqser.red.service.redaction.v1.server.redaction.service.AnnotationService;
+import com.iqser.red.service.redaction.v1.server.redaction.service.DictionaryService;
 import com.iqser.red.service.redaction.v1.server.redaction.service.DroolsExecutionService;
 import com.iqser.red.service.redaction.v1.server.redaction.service.EntityRedactionService;
+import com.iqser.red.service.redaction.v1.server.redaction.service.RedactionLogCreatorService;
 import com.iqser.red.service.redaction.v1.server.segmentation.PdfSegmentationService;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
-import com.iqser.red.service.redaction.v1.server.visualization.service.AnnotationHighlightService;
 import com.iqser.red.service.redaction.v1.server.visualization.service.PdfVisualisationService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -35,34 +41,35 @@ public class RedactionController implements RedactionResource {

    private final PdfVisualisationService pdfVisualisationService;
    private final PdfSegmentationService pdfSegmentationService;
-    private final AnnotationHighlightService annotationHighlightService;
+    private final RedactionLogCreatorService redactionLogCreatorService;
    private final EntityRedactionService entityRedactionService;
    private final DroolsExecutionService droolsExecutionService;
+    private final DictionaryService dictionaryService;
+    private final AnnotationService annotationService;


    @Override
-    public RedactionResult redact(@RequestBody RedactionRequest redactionRequest) {
+    public AnalyzeResult analyze(@RequestBody AnalyzeRequest analyzeRequest) {

-        try (PDDocument pdDocument = PDDocument.load(new ByteArrayInputStream(redactionRequest.getDocument()))) {
+        try (PDDocument pdDocument = PDDocument.load(new ByteArrayInputStream(analyzeRequest.getDocument()))) {
            pdDocument.setAllSecurityToBeRemoved(true);

            Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);

            log.info("Document structure analysis successful, starting redaction analysis...");

-            entityRedactionService.processDocument(classifiedDoc, redactionRequest.getRuleSetId(), redactionRequest.getManualRedactions());
-            annotationHighlightService.highlight(pdDocument, classifiedDoc, redactionRequest.isFlatRedaction(), redactionRequest
-                    .getManualRedactions(), redactionRequest.getRuleSetId());
+            entityRedactionService.processDocument(classifiedDoc, analyzeRequest.getRuleSetId(), analyzeRequest.getManualRedactions());
+            redactionLogCreatorService.createRedactionLog(classifiedDoc, pdDocument.getNumberOfPages(), analyzeRequest.getManualRedactions(), analyzeRequest
+                    .getRuleSetId());

            log.info("Redaction analysis successful...");

-            return convert(pdDocument,
-                    classifiedDoc.getPages().size(),
-                    classifiedDoc.getRedactionLogEntities(),
-                    classifiedDoc.getSectionGrid(),
-                    classifiedDoc.getDictionaryVersion(),
-                    classifiedDoc.getRulesVersion(),
-                    redactionRequest.getRuleSetId());
+            return AnalyzeResult.builder()
+                    .sectionGrid(classifiedDoc.getSectionGrid())
+                    .redactionLog(new RedactionLog(classifiedDoc.getRedactionLogEntities(), classifiedDoc.getDictionaryVersion(), classifiedDoc
+                    .getRulesVersion(), analyzeRequest.getRuleSetId()))
+                    .numberOfPages(classifiedDoc.getPages().size())
+                    .build();

        } catch (Exception e) {
            throw new RedactionException(e);
@@ -71,6 +78,25 @@ public class RedactionController implements RedactionResource {
    }


+    public AnnotateResponse annotate(@RequestBody AnnotateRequest annotateRequest) {
+
+        try (PDDocument pdDocument = PDDocument.load(new ByteArrayInputStream(annotateRequest.getDocument()))) {
+
+            pdDocument.setAllSecurityToBeRemoved(true);
+            dictionaryService.updateDictionary(annotateRequest.getRedactionLog().getRuleSetId());
+            annotationService.annotate(pdDocument, annotateRequest.getRedactionLog(), annotateRequest.getSectionGrid());
+
+            try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
+                pdDocument.save(byteArrayOutputStream);
+                return AnnotateResponse.builder().document(byteArrayOutputStream.toByteArray()).build();
+            }
+
+        } catch (Exception e) {
+            throw new RedactionException(e);
+        }
+    }
+
+
    @Override
    public RedactionResult classify(@RequestBody RedactionRequest pdfSegmentationRequest) {

@@ -136,11 +162,14 @@ public class RedactionController implements RedactionResource {

    @Override
    public void updateRules(@PathVariable(RULE_SET_PARAMETER_NAME) String ruleSetId) {
+
        droolsExecutionService.updateRules(ruleSetId);
    }

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

@@ -152,8 +181,8 @@ public class RedactionController implements RedactionResource {


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

        try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
            document.save(byteArrayOutputStream);
@@ -1,6 +1,8 @@
 package com.iqser.red.service.redaction.v1.server.parsing;

+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;
@@ -28,10 +30,15 @@ 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;
 import org.apache.pdfbox.cos.COSNumber;
 import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.graphics.PDXObject;
+import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
 import org.apache.pdfbox.text.PDFTextStripper;
 import org.apache.pdfbox.text.TextPosition;
+import org.apache.pdfbox.util.Matrix;

 import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Ruling;
@@ -43,11 +50,11 @@ import lombok.extern.slf4j.Slf4j;
@Slf4j
 public class PDFLinesTextStripper extends PDFTextStripper {

-    @Getter
-    private int maxCharWidths;
+    @Setter
+    protected PDPage pdpage;

    @Getter
-    private int maxCharHeight;
+    private int minCharWidths;

    @Getter
    private final List<TextPositionSequence> textPositionSequences = new ArrayList<>();
@@ -57,13 +64,18 @@ public class PDFLinesTextStripper extends PDFTextStripper {

    private final List<Ruling> graphicsPath = new ArrayList<>();

+    @Getter
+    private List<Rectangle2D> imageBounds = new ArrayList<>();
+
    private float path_x;
    private float path_y;

    @Setter
    private int pageNumber;

+
    public PDFLinesTextStripper() throws IOException {
+
        super();
        this.addOperator(new SetStrokingColorSpace());
        this.addOperator(new SetNonStrokingColorSpace());
@@ -87,9 +99,9 @@ public class PDFLinesTextStripper extends PDFTextStripper {
        this.addOperator(new SetLineWidth());
    }

+
    @Override
-    protected void processOperator(Operator operator, List<COSBase> arguments)
-            throws IOException {
+    protected void processOperator(Operator operator, List<COSBase> arguments) throws IOException {

        String operation = operator.getName();

@@ -110,9 +122,11 @@ public class PDFLinesTextStripper extends PDFTextStripper {

                    // The direction of vertical lines must always be from bottom to top for the table extraction algorithm.
                    if (pos.getY() > path_y) {
-                        graphicsPath.add(new Ruling(new Point2D.Float(path_x, path_y), new Point2D.Float((float) pos.getX(), (float) pos.getY())));
+                        graphicsPath.add(new Ruling(new Point2D.Float(path_x, path_y), new Point2D.Float((float) pos.getX(), (float) pos
+                                .getY())));
                    } else {
-                        graphicsPath.add(new Ruling(new Point2D.Float(path_x, (float) pos.getY()), new Point2D.Float((float) pos.getX(), path_y)));
+                        graphicsPath.add(new Ruling(new Point2D.Float(path_x, (float) pos.getY()), new Point2D.Float((float) pos
+                                .getX(), path_y)));
                    }

                    path_x = (float) pos.getX();
@@ -133,19 +147,25 @@ public class PDFLinesTextStripper extends PDFTextStripper {
                    Point2D p2 = transformPosition(x + width, y + height);

                    // Horizontal lines
-                    graphicsPath.add(new Ruling(new Point2D.Float((float) p1.getX(), (float) p1.getY()), new Point2D.Float((float) p2.getX(), (float) p1.getY())));
-                    graphicsPath.add(new Ruling(new Point2D.Float((float) p1.getX(), (float) p2.getY()), new Point2D.Float((float) p2.getX(), (float) p2.getY())));
+                    graphicsPath.add(new Ruling(new Point2D.Float((float) p1.getX(), (float) p1.getY()), new Point2D.Float((float) p2
+                            .getX(), (float) p1.getY())));
+                    graphicsPath.add(new Ruling(new Point2D.Float((float) p1.getX(), (float) p2.getY()), new Point2D.Float((float) p2
+                            .getX(), (float) p2.getY())));

                    // Vertical lines, direction must always be from bottom to top for the table extraction algorithm.
                    if (p2.getY() > p1.getY()) {
-                        graphicsPath.add(new Ruling(new Point2D.Float((float) p2.getX(), (float) p1.getY()), new Point2D.Float((float) p2.getX(), (float) p2.getY())));
+                        graphicsPath.add(new Ruling(new Point2D.Float((float) p2.getX(), (float) p1.getY()), new Point2D.Float((float) p2
+                                .getX(), (float) p2.getY())));
                    } else {
-                        graphicsPath.add(new Ruling(new Point2D.Float((float) p2.getX(), (float) p2.getY()), new Point2D.Float((float) p2.getX(), (float) p1.getY())));
+                        graphicsPath.add(new Ruling(new Point2D.Float((float) p2.getX(), (float) p2.getY()), new Point2D.Float((float) p2
+                                .getX(), (float) p1.getY())));
                    }
                    if (p2.getY() > p1.getY()) {
-                        graphicsPath.add(new Ruling(new Point2D.Float((float) p1.getX(), (float) p1.getY()), new Point2D.Float((float) p1.getX(), (float) p2.getY())));
+                        graphicsPath.add(new Ruling(new Point2D.Float((float) p1.getX(), (float) p1.getY()), new Point2D.Float((float) p1
+                                .getX(), (float) p2.getY())));
                    } else {
-                        graphicsPath.add(new Ruling(new Point2D.Float((float) p1.getX(), (float) p2.getY()), new Point2D.Float((float) p1.getX(), (float) p1.getY())));
+                        graphicsPath.add(new Ruling(new Point2D.Float((float) p1.getX(), (float) p2.getY()), new Point2D.Float((float) p1
+                                .getX(), (float) p1.getY())));
                    }
                }
                break;
@@ -168,12 +188,59 @@ public class PDFLinesTextStripper extends PDFTextStripper {
            case OperatorName.ENDPATH:
                graphicsPath.clear();
                break;
+
+            case OperatorName.DRAW_OBJECT:
+                processImageOperation(arguments);
+                break;
+
        }

        super.processOperator(operator, arguments);
    }

+
+    protected void processImageOperation(List<COSBase> arguments) {
+
+        try {
+            COSName objectName = (COSName) arguments.get(0);
+            PDXObject xobject = getResources().getXObject(objectName);
+            if (xobject instanceof PDImageXObject) {
+                PDImageXObject pdfImage = (PDImageXObject) xobject;
+
+                Rectangle2D imageBounds = calculateImagePosition(pdfImage);
+
+                Rectangle2D rect = new Rectangle2D.Float((float) imageBounds.getX(), (float) imageBounds.getY(), (float) imageBounds
+                        .getWidth(), (float) imageBounds.getHeight());
+
+                if (rect.getHeight() > 2 && rect.getWidth() > 2) {
+                    this.imageBounds.add(rect);
+                }
+            }
+        } catch (Exception e) {
+            log.warn("Problem during image extraction: {}", e.getMessage());
+        }
+    }
+
+
+    private Rectangle2D calculateImagePosition(PDImageXObject pdfImage) throws IOException {
+
+        Matrix ctm = getGraphicsState().getCurrentTransformationMatrix();
+
+        Rectangle2D imageBounds = pdfImage.getImage().getRaster().getBounds();
+
+        AffineTransform imageTransform = new AffineTransform(ctm.createAffineTransform());
+        imageTransform.scale(1.0 / pdfImage.getWidth(), -1.0 / pdfImage.getHeight());
+        imageTransform.translate(0, -pdfImage.getHeight());
+
+        AffineTransform pageTransform = new AffineTransform();
+        pageTransform.concatenate(imageTransform);
+
+        return pageTransform.createTransformedShape(imageBounds).getBounds2D();
+    }
+
+
    private float floatValue(COSBase value) {
+
        if (value instanceof COSNumber) {
            return ((COSNumber) value).floatValue();
        } else {
@@ -181,38 +248,45 @@ public class PDFLinesTextStripper extends PDFTextStripper {
        }
    }

+
    private Point2D.Float transformPosition(float x, float y) {
+
        return super.transformedPoint(x, y);
    }

+
    private void addVisibleRulings(List<Ruling> path, boolean stroke) throws IOException {

        try {
-            if (stroke && !getGraphicsState().getStrokingColor().isPattern() && getGraphicsState().getStrokingColor().toRGB() == 0 || !stroke && !getGraphicsState().getNonStrokingColor().isPattern() && getGraphicsState().getNonStrokingColor().toRGB() == 0) {
+            if (stroke && !getGraphicsState().getStrokingColor().isPattern() && getGraphicsState().getStrokingColor()
+                    .toRGB() == 0 || !stroke && !getGraphicsState().getNonStrokingColor()
+                    .isPattern() && getGraphicsState().getNonStrokingColor().toRGB() == 0) {
                rulings.addAll(path);
            }
        } catch (UnsupportedOperationException e) {
-            log.error("UnsupportedOperationException: " + getGraphicsState().getStrokingColor().getColorSpace().getName() + " or " + getGraphicsState().getNonStrokingColor().getColorSpace().getName() + " does not support toRGB");
+            log.error("UnsupportedOperationException: " + getGraphicsState().getStrokingColor()
+                    .getColorSpace()
+                    .getName() + " or " + getGraphicsState().getNonStrokingColor()
+                    .getColorSpace()
+                    .getName() + " does not support toRGB");
        }
    }

+
    @Override
    public void writeString(String text, List<TextPosition> textPositions) throws IOException {

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

-            int charHeight = (int) textPositions.get(i).getHeightDir();
-            if(charHeight > maxCharHeight){
-                maxCharHeight = charHeight;
-            }
-
            int charWidth = (int) textPositions.get(i).getWidthDirAdj();
-            if(charWidth > maxCharWidths){
-                maxCharWidths = charWidth;
+            if (charWidth < minCharWidths) {
+                minCharWidths = charWidth;
            }

-            if (i == 0 && (textPositions.get(i).getUnicode().equals(" ") || textPositions.get(i).getUnicode().equals("\u00A0"))) {
+            if (i == 0 && (textPositions.get(i).getUnicode().equals(" ") || textPositions.get(i)
+                    .getUnicode()
+                    .equals("\u00A0"))) {
                startIndex++;
                continue;
            }
@@ -220,15 +294,21 @@ public class PDFLinesTextStripper extends PDFTextStripper {
            // Strange but sometimes this is happening, for example: Metolachlor2.pdf
            if (i > 0 && textPositions.get(i).getX() < textPositions.get(i - 1).getX()) {
                List<TextPosition> sublist = textPositions.subList(startIndex, i);
-                if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0).getUnicode().equals(" ") || sublist.get(0).getUnicode().equals("\u00A0")))) {
+                if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0)
+                        .getUnicode()
+                        .equals(" ") || sublist.get(0).getUnicode().equals("\u00A0")))) {
                    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) {
+            if (i > 0 && (textPositions.get(i).getUnicode().equals(" ") || textPositions.get(i)
+                    .getUnicode()
+                    .equals("\u00A0")) && 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")))) {
+                if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0)
+                        .getUnicode()
+                        .equals(" ") || sublist.get(0).getUnicode().equals("\u00A0")))) {
                    textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
                }
                startIndex = i + 1;
@@ -236,21 +316,26 @@ 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"))) {
+        if (!sublist.isEmpty() && (sublist.get(sublist.size() - 1)
+                .getUnicode()
+                .equals(" ") || sublist.get(sublist.size() - 1).getUnicode().equals("\u00A0"))) {
            sublist = sublist.subList(0, sublist.size() - 1);
        }
-        if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0).getUnicode().equals(" ") || sublist.get(0).getUnicode().equals("\u00A0")))) {
+        if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0).getUnicode().equals(" ") || sublist.get(0)
+                .getUnicode()
+                .equals("\u00A0")))) {
            textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
        }
        super.writeString(text);
    }

+
    @Override
    public String getText(PDDocument doc) throws IOException {

-        maxCharWidths = 0;
-        maxCharWidths = 0;
+        minCharWidths = Integer.MAX_VALUE;
        textPositionSequences.clear();
+        imageBounds = new ArrayList<>();
        rulings.clear();
        graphicsPath.clear();
        path_x = 0.0f;
@@ -1,5 +1,6 @@
 package com.iqser.red.service.redaction.v1.server.parsing.model;

+import java.awt.geom.Rectangle2D;
 import java.util.List;

 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Ruling;
@@ -13,10 +14,10 @@ public class ParsedElements {

    private List<TextPositionSequence> sequences;
    private List<Ruling> rulings;
+    private List<Rectangle2D> imageBounds;

    private boolean landscape;
    private boolean rotated;

-    private float maxCharWidth;
-    private float maxCharHeight;
+    private float minCharWidth;
 }
@@ -28,6 +28,14 @@ public class Dictionary {
    }


+    public int getDictionaryRank(String type){
+        if(!localAccessMap.containsKey(type)){
+            return 0;
+        }
+        return localAccessMap.get(type).getRank();
+    }
+
+
    public boolean isRecommendation(String type) {

        DictionaryModel model = localAccessMap.get(type);
@@ -62,6 +62,13 @@ public class Section {
    }


+    public boolean hasTableHeader(String headerName) {
+
+        String cleanHeaderName = headerName.replaceAll("\n", "").replaceAll(" ", "").replaceAll("-", "");
+        return tabularData != null && tabularData.containsKey(cleanHeaderName);
+    }
+
+
    public boolean matchesType(String type) {

        return entities.stream().anyMatch(entity -> entity.getType().equals(type));
@@ -74,6 +81,34 @@ public class Section {
    }


+    public void expandByRegEx(String type, String pattern, boolean patternCaseInsensitive, int group) {
+
+        Pattern compiledPattern = Patterns.getCompiledPattern(pattern, patternCaseInsensitive);
+
+        Set<Entity> expanded = new HashSet<>();
+        for (Entity entity : entities) {
+
+            if (!entity.getType().equals(type) || entity.getTextAfter() == null) {
+                continue;
+            }
+
+            Matcher matcher = compiledPattern.matcher(entity.getTextAfter());
+
+            while (matcher.find()) {
+                String match = matcher.group(group);
+                if (StringUtils.isNotBlank(match)) {
+                    expanded.addAll(findEntities(entity.getWord() + match, type, false, entity.isRedaction(), entity.getMatchedRule(), entity
+                            .getRedactionReason(), entity.getLegalBasis()));
+
+                }
+            }
+        }
+
+        EntitySearchUtils.addEntitiesWithHigherRank(entities, expanded, dictionary);
+        EntitySearchUtils.removeEntitiesContainedInLarger(entities);
+    }
+
+
    public void redact(String type, int ruleNumber, String reason, String legalBasis) {

        boolean hasRecommendationDictionary = dictionaryTypes.contains(RECOMMENDATION_PREFIX + type);
@@ -121,7 +156,7 @@ public class Section {
    public void addHintAnnotation(String value, String asType) {

        Set<Entity> found = findEntities(value.trim(), asType, true, false, 0, null, null);
-        addNewerToEntities(found);
+        EntitySearchUtils.addEntitiesWithHigherRank(entities, found, dictionary);
    }


@@ -134,7 +169,7 @@ public class Section {
            for (String value : values) {
                if (StringUtils.isNotBlank(value)) {
                    Set<Entity> found = findEntities(value.trim(), asType, false, true, ruleNumber, reason, legalBasis);
-                    addNewerToEntities(found);
+                    EntitySearchUtils.addEntitiesWithHigherRank(entities, found, dictionary);

                    if (redactEverywhere && !isLocal()) {
                        localDictionaryAdds.computeIfAbsent(asType, (x) -> new HashSet<>()).add(value.trim());
@@ -154,7 +189,7 @@ public class Section {

                String trimmedValue = value.trim();
                String cleanValue;
-                if(trimmedValue.startsWith(":")){
+                if (trimmedValue.startsWith(":")) {
                    cleanValue = trimmedValue.substring(1).trim();
                } else {
                    cleanValue = trimmedValue;
@@ -180,7 +215,7 @@ public class Section {
            String match = matcher.group(group);
            if (StringUtils.isNotBlank(match)) {
                Set<Entity> found = findEntities(match.trim(), asType, false, true, ruleNumber, reason, legalBasis);
-                addNewerToEntities(found);
+                EntitySearchUtils.addEntitiesWithHigherRank(entities, found, dictionary);
            }
        }
    }
@@ -201,8 +236,8 @@ public class Section {
    }


-    public void redactAndRecommendByRegEx(String pattern, boolean patternCaseInsensitive, int group, String asType, int ruleNumber,
-                              String reason, String legalBasis) {
+    public void redactAndRecommendByRegEx(String pattern, boolean patternCaseInsensitive, int group, String asType,
+                                          int ruleNumber, String reason, String legalBasis) {

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

@@ -228,7 +263,7 @@ public class Section {
                if (StringUtils.isNotBlank(value)) {

                    Set<Entity> found = findEntities(value.trim(), asType, false, true, ruleNumber, reason, legalBasis);
-                    addNewerToEntities(found);
+                    EntitySearchUtils.addEntitiesWithHigherRank(entities, found, dictionary);

                    if (redactEverywhere && !isLocal()) {
                        localDictionaryAdds.computeIfAbsent(asType, (x) -> new HashSet<>()).add(value.trim());
@@ -256,7 +291,7 @@ public class Section {
                        }

                        Set<Entity> found = findEntities(line.trim(), asType, false, true, ruleNumber, reason, legalBasis);
-                        addNewerToEntities(found);
+                        EntitySearchUtils.addEntitiesWithHigherRank(entities, found, dictionary);

                        if (redactEverywhere && !isLocal()) {
                            localDictionaryAdds.computeIfAbsent(asType, (x) -> new HashSet<>()).add(line.trim());
@@ -335,7 +370,7 @@ public class Section {
            singleEntitySet.add(entity);
            EntitySearchUtils.clearAndFindPositions(singleEntitySet, searchableText, dictionary);

-            addNewerToEntities(entity);
+            EntitySearchUtils.addEntitiesWithHigherRank(entities, entity, dictionary);

            EntitySearchUtils.removeEntitiesContainedInLarger(entities);

@@ -358,20 +393,6 @@ public class Section {
        }
    }

-
-    private void addNewerToEntities(Set<Entity> found) {
-        // HashSet keeps the older value, but we want the new only.
-        entities.removeAll(found);
-        entities.addAll(found);
-    }
-
-
-    private void addNewerToEntities(Entity found) {
-        // HashSet keeps the older value, but we want the new only.
-        entities.remove(found);
-        entities.add(found);
-    }
-
 }


@@ -0,0 +1,268 @@
+package com.iqser.red.service.redaction.v1.server.redaction.service;
+
+import java.awt.Color;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.GregorianCalendar;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.PDPageContentStream;
+import org.apache.pdfbox.pdmodel.common.PDRectangle;
+import org.apache.pdfbox.pdmodel.font.PDType1Font;
+import org.apache.pdfbox.pdmodel.graphics.color.PDColor;
+import org.apache.pdfbox.pdmodel.graphics.color.PDDeviceRGB;
+import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotation;
+import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationText;
+import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationTextMarkup;
+import org.springframework.stereotype.Service;
+
+import com.iqser.red.service.redaction.v1.model.CellRectangle;
+import com.iqser.red.service.redaction.v1.model.Comment;
+import com.iqser.red.service.redaction.v1.model.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.SectionGrid;
+import com.iqser.red.service.redaction.v1.model.SectionRectangle;
+
+import lombok.RequiredArgsConstructor;
+
+@Service
+@RequiredArgsConstructor
+public class AnnotationService {
+
+    private final DictionaryService dictionaryService;
+
+
+    public void annotate(PDDocument document, RedactionLog redactionLog, SectionGrid sectionGrid) throws IOException {
+
+        Map<Integer, List<RedactionLogEntry>> redactionLogPerPage = convertRedactionLog(redactionLog);
+
+        for (int page = 1; page <= document.getNumberOfPages(); page++) {
+
+            PDPage pdPage = document.getPage(page - 1);
+
+            List<SectionRectangle> sectionRectangles = sectionGrid.getRectanglesPerPage().get(page);
+            if (sectionRectangles != null && !sectionRectangles.isEmpty()) {
+                drawSectionGrid(document, pdPage, sectionRectangles);
+            }
+
+            List<RedactionLogEntry> logEntries = redactionLogPerPage.get(page);
+            if (logEntries != null && !logEntries.isEmpty()) {
+                addAnnotations(logEntries, pdPage, page);
+            }
+        }
+    }
+
+
+    private void addAnnotations(List<RedactionLogEntry> logEntries, PDPage pdPage, int page) throws IOException {
+
+        List<PDAnnotation> annotations = pdPage.getAnnotations();
+
+        for (RedactionLogEntry entry : logEntries) {
+            annotations.addAll(createAnnotation(entry, page, pdPage.getMediaBox(), pdPage.getCropBox()));
+        }
+    }
+
+
+    private List<PDAnnotation> createAnnotation(RedactionLogEntry redactionLogEntry, int page, PDRectangle mediaBox,
+                                                PDRectangle cropBox) {
+
+        List<PDAnnotation> annotations = new ArrayList<>();
+
+        List<Rectangle> rectangles = redactionLogEntry.getPositions()
+                .stream()
+                .filter(pos -> pos.getPage() == page)
+                .collect(Collectors.toList());
+
+        if (rectangles.isEmpty()) {
+            return annotations;
+        }
+
+        PDAnnotationTextMarkup annotation = new PDAnnotationTextMarkup(PDAnnotationTextMarkup.SUB_TYPE_HIGHLIGHT);
+        annotation.constructAppearances();
+        PDRectangle pdRectangle = toPDRectangle(rectangles, mediaBox, cropBox);
+        annotation.setRectangle(pdRectangle);
+        annotation.setQuadPoints(toQuadPoints(rectangles, mediaBox, cropBox));
+        if (!redactionLogEntry.isHint()) {
+            annotation.setContents(createAnnotationContent(redactionLogEntry));
+        }
+        annotation.setTitlePopup(redactionLogEntry.getId());
+        annotation.setAnnotationName(redactionLogEntry.getId());
+        annotation.setColor(new PDColor(redactionLogEntry.getColor(), PDDeviceRGB.INSTANCE));
+        annotations.add(annotation);
+
+        if (redactionLogEntry.getComments() != null) {
+            for (Comment comment : redactionLogEntry.getComments()) {
+                PDAnnotationText txtAnnot = new PDAnnotationText();
+                txtAnnot.setAnnotationName(comment.getId());
+                txtAnnot.setInReplyTo(annotation); // Reference to highlight annotation
+                txtAnnot.setName(PDAnnotationText.NAME_COMMENT);
+                txtAnnot.setCreationDate(GregorianCalendar.from(comment.getDate().toZonedDateTime()));
+                txtAnnot.setTitlePopup(comment.getUser());
+                txtAnnot.setContents(comment.getText());
+                txtAnnot.setRectangle(pdRectangle);
+                annotations.add(txtAnnot);
+            }
+        }
+
+        return annotations;
+    }
+
+
+    private String createAnnotationContent(RedactionLogEntry redactionLogEntry) {
+
+        if (redactionLogEntry.isManual()) {
+            return "\nManual Redaction\n\nIn Section : \"" + redactionLogEntry.getSection() + "\"";
+        }
+        return "\nRule " + redactionLogEntry.getMatchedRule() + " matched\n\n" + redactionLogEntry.getReason() + "\n\nLegal basis:" + redactionLogEntry
+                .getLegalBasis() + "\n\nIn section: \"" + redactionLogEntry.getSection() + "\"";
+    }
+
+
+    private PDRectangle toPDRectangle(List<Rectangle> rectangles, PDRectangle mediaBox, PDRectangle cropBox) {
+
+        float lowerLeftX = Float.MAX_VALUE;
+        float upperRightX = 0;
+        float lowerLeftY = 0;
+        float upperRightY = Float.MAX_VALUE;
+
+        for (Rectangle rectangle : rectangles) {
+            if (rectangle.getTopLeft().getX() < lowerLeftX) {
+                lowerLeftX = rectangle.getTopLeft().getX();
+            }
+            if (rectangle.getTopLeft().getX() + rectangle.getWidth() > upperRightX) {
+                upperRightX = rectangle.getTopLeft().getX() + rectangle.getWidth();
+            }
+            if (rectangle.getTopLeft().getY() + rectangle.getHeight() > lowerLeftY) {
+                lowerLeftY = rectangle.getTopLeft().getY() + rectangle.getHeight();
+            }
+            if (rectangle.getTopLeft().getY() < upperRightY) {
+                upperRightY = rectangle.getTopLeft().getY();
+            }
+        }
+
+        var x1 = lowerLeftX + cropBox.getLowerLeftX() - mediaBox.getLowerLeftY();
+        var y1 = lowerLeftY + (mediaBox.getLowerLeftY() - cropBox.getLowerLeftY());
+        var x2 = upperRightX + cropBox.getLowerLeftX() - mediaBox.getLowerLeftY();
+        var y2 = upperRightY - (mediaBox.getLowerLeftY() - cropBox.getLowerLeftY());
+
+        PDRectangle annotationPosition = new PDRectangle();
+        annotationPosition.setLowerLeftX(x1);
+        annotationPosition.setLowerLeftY(y1);
+        annotationPosition.setUpperRightX(x2);
+        annotationPosition.setUpperRightY(y2);
+        return annotationPosition;
+    }
+
+
+    private float[] toQuadPoints(List<Rectangle> rectangles, PDRectangle mediaBox, PDRectangle cropBox) {
+
+        float[] quadPoints = new float[rectangles.size() * 8];
+        int i = 0;
+
+        for (Rectangle rectangle : rectangles) {
+            float[] quadPoint = toQuadPoint(rectangle, mediaBox, cropBox);
+            for (int j = 0; j <= 7; j++) {
+                quadPoints[i + j] = quadPoint[j];
+            }
+            i += 8;
+        }
+        return quadPoints;
+    }
+
+
+    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 x2 = rectangle.getTopLeft()
+                .getX() + rectangle.getWidth() + cropBox.getLowerLeftX() - mediaBox.getLowerLeftY();
+        var y2 = rectangle.getTopLeft()
+                .getY() + rectangle.getHeight() - (mediaBox.getLowerLeftY() - cropBox.getLowerLeftY());
+
+        // 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
+        return new float[]{x1, y1, x2, y2, x1, y2 - rectangle.getHeight(), x2, y1 - rectangle.getHeight()};
+    }
+
+
+    private void drawSectionGrid(PDDocument document, PDPage pdPage,
+                                 List<SectionRectangle> sectionRectangles) throws IOException {
+
+        PDPageContentStream contentStream = new PDPageContentStream(document, pdPage, PDPageContentStream.AppendMode.APPEND, true);
+        for (SectionRectangle sectionRectangle : sectionRectangles) {
+            drawSectionRectangle(contentStream, sectionRectangle);
+            drawSectionPartNumberText(contentStream, sectionRectangle);
+            drawTableCells(contentStream, sectionRectangle);
+        }
+        contentStream.close();
+    }
+
+
+    private void drawSectionRectangle(PDPageContentStream contentStream,
+                                      SectionRectangle sectionRectangle) throws IOException {
+
+        contentStream.setStrokingColor(Color.LIGHT_GRAY);
+        contentStream.setLineWidth(0.5f);
+        contentStream.addRect(sectionRectangle.getTopLeft().getX(), sectionRectangle.getTopLeft()
+                .getY(), sectionRectangle.getWidth(), sectionRectangle.getHeight());
+        contentStream.stroke();
+    }
+
+
+    private void drawSectionPartNumberText(PDPageContentStream contentStream,
+                                           SectionRectangle sectionRectangle) throws IOException {
+
+        contentStream.beginText();
+        contentStream.setNonStrokingColor(Color.DARK_GRAY);
+        contentStream.setFont(PDType1Font.TIMES_ROMAN, 8f);
+        if (sectionRectangle.getTableCells() == null) {
+            contentStream.newLineAtOffset(sectionRectangle.getTopLeft().getX(), sectionRectangle.getTopLeft()
+                    .getY() + sectionRectangle.getHeight());
+        } else {
+            contentStream.newLineAtOffset(sectionRectangle.getTopLeft().getX(), sectionRectangle.getTopLeft().getY());
+        }
+        contentStream.showText(sectionRectangle.getPart() + "/" + sectionRectangle.getNumberOfParts());
+        contentStream.endText();
+    }
+
+
+    private void drawTableCells(PDPageContentStream contentStream,
+                                SectionRectangle sectionRectangle) throws IOException {
+
+        if (sectionRectangle.getTableCells() != null) {
+            for (CellRectangle cell : sectionRectangle.getTableCells()) {
+                contentStream.setLineWidth(0.5f);
+                contentStream.setStrokingColor(Color.CYAN);
+                contentStream.addRect(cell.getTopLeft().getX(), cell.getTopLeft()
+                        .getY(), cell.getWidth(), cell.getHeight());
+                contentStream.stroke();
+            }
+        }
+    }
+
+
+    private Map<Integer, List<RedactionLogEntry>> convertRedactionLog(RedactionLog redactionLog) {
+
+        Map<Integer, List<RedactionLogEntry>> redactionLogPerPage = new HashMap<>();
+        if (redactionLog == null) {
+            return redactionLogPerPage;
+        }
+        for (RedactionLogEntry entry : redactionLog.getRedactionLogEntry()) {
+            int page = 0;
+            for (Rectangle position : entry.getPositions()) {
+                if (position.getPage() != page) {
+                    redactionLogPerPage.computeIfAbsent(position.getPage(), x -> new ArrayList<>()).add(entry);
+                    page = position.getPage();
+                }
+            }
+        }
+        return redactionLogPerPage;
+    }
+
+}
@@ -67,10 +67,7 @@ public class EntityRedactionService {
            });

            Set<Entity> foundByLocal = findEntities(classifiedDoc, container, manualRedactions, dictionary, true, hintsPerSectionNumber);
-            // HashSet keeps the older value, but we want the new only.
-            documentEntities.removeAll(foundByLocal);
-            documentEntities.addAll(foundByLocal);
-
+            EntitySearchUtils.addEntitiesWithHigherRank(documentEntities, foundByLocal, dictionary);
            EntitySearchUtils.removeEntitiesContainedInLarger(documentEntities);
        }

@@ -159,6 +156,8 @@ public class EntityRedactionService {
                                                               Map<Integer, Set<Entity>> hintsPerSectionNumber) {

        List<SectionSearchableTextPair> sectionSearchableTextPairs = new ArrayList<>();
+
+        int rowNumber = 0;
        for (List<Cell> row : table.getRows()) {
            SearchableText searchableRow = new SearchableText();
            Map<String, CellValue> tabularData = new HashMap<>();
@@ -170,15 +169,15 @@ public class EntityRedactionService {
                }
                addSectionToManualRedactions(cell.getTextBlocks(), manualRedactions, table.getHeadline(), sectionNumber.intValue());
                int cellStart = start;
-                cell.getHeaderCells().forEach(headerCell -> {
-                    StringBuilder headerBuilder = new StringBuilder();
-                    headerCell.getTextBlocks().forEach(textBlock -> headerBuilder.append(textBlock.getText()));
-                    String headerName = headerBuilder.toString()
-                            .replaceAll("\n", "")
-                            .replaceAll(" ", "")
-                            .replaceAll("-", "");
-                    tabularData.put(headerName, new CellValue(cell.getTextBlocks(), cellStart));
-                });
+
+                if(rowNumber != 0) {
+                    cell.getHeaderCells().forEach(headerCell -> {
+                        StringBuilder headerBuilder = new StringBuilder();
+                        headerCell.getTextBlocks().forEach(textBlock -> headerBuilder.append(textBlock.getText()));
+                        String headerName = headerBuilder.toString().replaceAll("\n", "").replaceAll(" ", "").replaceAll("-", "");
+                        tabularData.put(headerName, new CellValue(cell.getTextBlocks(), cellStart));
+                    });
+                }

                for (TextBlock textBlock : cell.getTextBlocks()) {
                    // TODO avoid cell overlap merging.
@@ -206,6 +205,7 @@ public class EntityRedactionService {
                    .build(), searchableRow));

            sectionNumber.incrementAndGet();
+            rowNumber++;
        }
        return sectionSearchableTextPairs;
    }
@@ -1,4 +1,15 @@
-package com.iqser.red.service.redaction.v1.server.visualization.service;
+package com.iqser.red.service.redaction.v1.server.redaction.service;
+
+import java.awt.geom.Rectangle2D;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.pdfbox.text.TextPosition;
+import org.springframework.stereotype.Service;

 import com.iqser.red.service.redaction.v1.model.CellRectangle;
 import com.iqser.red.service.redaction.v1.model.Comment;
@@ -17,59 +28,62 @@ import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
 import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
 import com.iqser.red.service.redaction.v1.server.redaction.model.EntityPositionSequence;
-import com.iqser.red.service.redaction.v1.server.redaction.service.DictionaryService;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.IdBuilder;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Cell;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
-import lombok.RequiredArgsConstructor;
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.pdmodel.PDPageContentStream;
-import org.apache.pdfbox.pdmodel.common.PDRectangle;
-import org.apache.pdfbox.pdmodel.font.PDType1Font;
-import org.apache.pdfbox.pdmodel.graphics.color.PDColor;
-import org.apache.pdfbox.pdmodel.graphics.color.PDDeviceRGB;
-import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotation;
-import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationText;
-import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationTextMarkup;
-import org.apache.pdfbox.text.TextPosition;
-import org.springframework.stereotype.Service;

-import java.awt.Color;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.GregorianCalendar;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
+import lombok.RequiredArgsConstructor;

@Service
@RequiredArgsConstructor
-public class AnnotationHighlightService {
+public class RedactionLogCreatorService {
+
+    private static final String IMAGE = "image";

    private final DictionaryService dictionaryService;


-    public void highlight(PDDocument document, Document classifiedDoc, boolean flatRedaction,
-                          ManualRedactions manualRedactions, String ruleSetId) throws IOException {
+    public void createRedactionLog(Document classifiedDoc, int numberOfPages, ManualRedactions manualRedactions,
+                                   String ruleSetId) {

        Set<Integer> manualRedactionPages = getManualRedactionPages(manualRedactions);

-        for (int page = 1; page <= document.getNumberOfPages(); page++) {
+        for (int page = 1; page <= numberOfPages; page++) {

-            PDPage pdPage = document.getPage(page - 1);
-
-            drawSectionFrames(document, classifiedDoc, flatRedaction, pdPage, page);
+            addSectionGrid(classifiedDoc, page);

            if (classifiedDoc.getEntities().get(page) != null) {
-                addAnnotations(pdPage, classifiedDoc, flatRedaction, manualRedactions, page, ruleSetId);
+                addEntries(classifiedDoc, manualRedactions, page, ruleSetId);
            }

            if (manualRedactionPages.contains(page)) {
-                addManualAnnotations(pdPage, classifiedDoc, manualRedactions, page, ruleSetId);
+                addManualEntries(classifiedDoc, manualRedactions, page, ruleSetId);
            }
+
+            if (!classifiedDoc.getPages().get(page - 1).getImageBounds().isEmpty()) {
+                addImageEntries(classifiedDoc, page, ruleSetId);
+            }
+        }
+    }
+
+
+    private void addImageEntries(Document classifiedDoc, int pageNumber, String ruleSetId) {
+
+        for (Rectangle2D imageBounds : classifiedDoc.getPages().get(pageNumber - 1).getImageBounds()) {
+            RedactionLogEntry redactionLogEntry = RedactionLogEntry.builder()
+                    .id(IdBuilder.buildId(imageBounds, pageNumber))
+                    .color(getColor(IMAGE, ruleSetId))
+                    .type(IMAGE)
+                    .redacted(false)
+                    .isHint(true)
+                    .manual(false)
+                    .isDictionaryEntry(false)
+                    .isRecommendation(false)
+                    .positions(List.of(new Rectangle(new Point((float) imageBounds.getX(), (float) imageBounds.getY()), (float) imageBounds
+                            .getWidth(), (float) imageBounds.getHeight(), pageNumber)))
+                    .build();
+            classifiedDoc.getRedactionLogEntities().add(redactionLogEntry);
        }
    }

@@ -91,10 +105,7 @@ public class AnnotationHighlightService {
    }


-    private void addAnnotations(PDPage pdPage, Document classifiedDoc, boolean flatRedaction,
-                                ManualRedactions manualRedactions, int page, String ruleSetId) throws IOException {
-
-        List<PDAnnotation> annotations = pdPage.getAnnotations();
+    private void addEntries(Document classifiedDoc, ManualRedactions manualRedactions, int page, String ruleSetId) {

        // Duplicates can exist due table extraction colums over multiple rows.
        Set<String> processedIds = new HashSet<>();
@@ -102,11 +113,6 @@ public class AnnotationHighlightService {
        entityLoop:
        for (Entity entity : classifiedDoc.getEntities().get(page)) {

-            if (flatRedaction && !isRedactionType(entity, ruleSetId)) {
-                continue;
-            }
-
-            boolean requestedToRemove = false;
            List<Comment> comments = null;

            for (EntityPositionSequence entityPositionSequence : entity.getPositionSequences()) {
@@ -131,7 +137,6 @@ public class AnnotationHighlightService {
                                redactionLogEntry.setStatus(Status.APPROVED);
                                manualOverrideReason = entity.getRedactionReason() + ", removed by manual override";
                            } else if (manualRemoval.getStatus().equals(Status.REQUESTED)) {
-                                requestedToRemove = true;
                                manualOverrideReason = entity.getRedactionReason() + ", requested to remove";
                                redactionLogEntry.setStatus(Status.REQUESTED);
                            } else {
@@ -157,9 +162,9 @@ public class AnnotationHighlightService {
                        comments = manualRedactions.getComments().get(entityPositionSequence.getId());
                    }

+                    redactionLogEntry.setComments(comments);
                    redactionLogEntry.getPositions().addAll(rectanglesPerLine);

-                    annotations.addAll(createAnnotation(rectanglesPerLine, entityPositionSequence.getId(), createAnnotationContent(entity), getColor(entity, ruleSetId, requestedToRemove), comments, !isHint(entity, ruleSetId)));
                }

                redactionLogEntry.setId(entityPositionSequence.getId());
@@ -169,9 +174,7 @@ public class AnnotationHighlightService {
                    classifiedDoc.getRedactionLogEntities().add(redactionLogEntry);
                }
            }
-
        }
-
    }


@@ -200,15 +203,13 @@ public class AnnotationHighlightService {
    }


-    private void addManualAnnotations(PDPage pdPage, Document classifiedDoc, ManualRedactions manualRedactions,
-                                      int page, String ruleSetId) throws IOException {
+    private void addManualEntries(Document classifiedDoc, ManualRedactions manualRedactions, int page,
+                                  String ruleSetId) {

        if (manualRedactions == null) {
            return;
        }

-        List<PDAnnotation> annotations = pdPage.getAnnotations();
-
        for (ManualRedactionEntry manualRedactionEntry : manualRedactions.getEntriesToAdd()) {

            String id = manualRedactionEntry.getId();
@@ -223,9 +224,8 @@ public class AnnotationHighlightService {
                }
            }

+            redactionLogEntry.setComments(manualRedactions.getComments().get(id));
            if (!rectanglesOnPage.isEmpty() && !approvedAndShouldBeInDictionary(manualRedactionEntry)) {
-                annotations.addAll(createAnnotation(rectanglesOnPage, id, createAnnotationContent(manualRedactionEntry), getColorForManualAdd(manualRedactionEntry
-                        .getType(), ruleSetId, manualRedactionEntry.getStatus()), manualRedactions.getComments().get(id), true));
                classifiedDoc.getRedactionLogEntities().add(redactionLogEntry);
            }
        }
@@ -238,11 +238,12 @@ public class AnnotationHighlightService {
    }


-    private RedactionLogEntry createRedactionLogEntry(ManualRedactionEntry manualRedactionEntry, String id, String ruleSetId) {
+    private RedactionLogEntry createRedactionLogEntry(ManualRedactionEntry manualRedactionEntry, String id,
+                                                      String ruleSetId) {

        return RedactionLogEntry.builder()
                .id(id)
-                .color(getColor(manualRedactionEntry.getType(), ruleSetId))
+                .color(getColorForManualAdd(manualRedactionEntry.getType(), ruleSetId, manualRedactionEntry.getStatus()))
                .reason(manualRedactionEntry.getReason())
                .legalBasis(manualRedactionEntry.getLegalBasis())
                .value(manualRedactionEntry.getValue())
@@ -280,122 +281,6 @@ public class AnnotationHighlightService {
    }


-    private List<PDAnnotation> createAnnotation(List<Rectangle> rectangles, String id, String content, float[] color,
-                                                List<Comment> comments, boolean popup) {
-
-        List<PDAnnotation> annotations = new ArrayList<>();
-
-        PDAnnotationTextMarkup annotation = new PDAnnotationTextMarkup(PDAnnotationTextMarkup.SUB_TYPE_HIGHLIGHT);
-        annotation.constructAppearances();
-        PDRectangle pdRectangle = toPDRectangle(rectangles);
-        annotation.setRectangle(pdRectangle);
-        annotation.setQuadPoints(toQuadPoints(rectangles));
-        if (popup) {
-            annotation.setContents(content);
-        }
-        annotation.setTitlePopup(id);
-        annotation.setAnnotationName(id);
-        annotation.setColor(new PDColor(color, PDDeviceRGB.INSTANCE));
-        annotations.add(annotation);
-
-        if (comments != null) {
-            for (Comment comment : comments) {
-                PDAnnotationText txtAnnot = new PDAnnotationText();
-                txtAnnot.setAnnotationName(comment.getId());
-                txtAnnot.setInReplyTo(annotation); // Reference to highlight annotation
-                txtAnnot.setName(PDAnnotationText.NAME_COMMENT);
-                txtAnnot.setCreationDate(GregorianCalendar.from(comment.getDate().toZonedDateTime()));
-                txtAnnot.setTitlePopup(comment.getUser());
-                txtAnnot.setContents(comment.getText());
-                txtAnnot.setRectangle(pdRectangle);
-                annotations.add(txtAnnot);
-            }
-        }
-
-        return annotations;
-    }
-
-
-    private String createAnnotationContent(Entity entity) {
-
-        return "\nRule " + entity.getMatchedRule() + " matched\n\n" + entity.getRedactionReason() + "\n\nLegal basis:" + entity
-                .getLegalBasis() + "\n\nIn section: \"" + entity.getHeadline() + "\"";
-    }
-
-
-    private String createAnnotationContent(ManualRedactionEntry entry) {
-
-        return "\nManual Redaction\n\nIn Section : \"" + entry.getSection() + "\"";
-    }
-
-
-    private PDRectangle toPDRectangle(List<Rectangle> rectangles) {
-
-        float lowerLeftX = Float.MAX_VALUE;
-        float upperRightX = 0;
-        float lowerLeftY = 0;
-        float upperRightY = Float.MAX_VALUE;
-
-        for (Rectangle rectangle : rectangles) {
-            if (rectangle.getTopLeft().getX() < lowerLeftX) {
-                lowerLeftX = rectangle.getTopLeft().getX();
-            }
-            if (rectangle.getTopLeft().getX() + rectangle.getWidth() > upperRightX) {
-                upperRightX = rectangle.getTopLeft().getX() + rectangle.getWidth();
-            }
-            if (rectangle.getTopLeft().getY() + rectangle.getHeight() > lowerLeftY) {
-                lowerLeftY = rectangle.getTopLeft().getY() + rectangle.getHeight();
-            }
-            if (rectangle.getTopLeft().getY() < upperRightY) {
-                upperRightY = rectangle.getTopLeft().getY();
-            }
-        }
-
-        PDRectangle annotationPosition = new PDRectangle();
-        annotationPosition.setLowerLeftX(lowerLeftX);
-        annotationPosition.setLowerLeftY(lowerLeftY);
-        annotationPosition.setUpperRightX(upperRightX);
-        annotationPosition.setUpperRightY(upperRightY);
-        return annotationPosition;
-    }
-
-
-    private float[] toQuadPoints(List<Rectangle> rectangles) {
-
-        float[] quadPoints = new float[rectangles.size() * 8];
-        int i = 0;
-
-        for (Rectangle rectangle : rectangles) {
-            float[] quadPoint = toQuadPoint(rectangle);
-            for (int j = 0; j <= 7; j++) {
-                quadPoints[i + j] = quadPoint[j];
-            }
-            i += 8;
-        }
-        return quadPoints;
-    }
-
-
-    private float[] toQuadPoint(Rectangle rectangle) {
-
-        // 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
-        return new float[]{rectangle.getTopLeft().getX(), rectangle.getTopLeft().getY(), rectangle.getTopLeft()
-                .getX() + rectangle.getWidth(), rectangle.getTopLeft().getY(), rectangle.getTopLeft().getX(), rectangle.getTopLeft()
-                .getY() + rectangle.getHeight(), rectangle.getTopLeft()
-                .getX() + rectangle.getWidth(), rectangle.getTopLeft().getY() + rectangle.getHeight()};
-    }
-
-
-    private boolean isRedactionType(Entity entity, String ruleSetId) {
-
-        if (!entity.isRedaction()) {
-            return false;
-        }
-        return !isHint(entity, ruleSetId);
-    }
-
-
    private float[] getColor(Entity entity, String ruleSetId, boolean requestedToRemove) {

        if (requestedToRemove) {
@@ -420,27 +305,25 @@ public class AnnotationHighlightService {


    private float[] getColor(String type, String ruleSetId) {
+
        return dictionaryService.getColor(type, ruleSetId);
    }


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

+
    private boolean isRecommendation(Entity entity, String ruleSetId) {
+
        return dictionaryService.isRecommendation(entity.getType(), ruleSetId);
    }


-    private void drawSectionFrames(PDDocument document, Document classifiedDoc, boolean flatRedaction, PDPage pdPage,
-                                   int page) throws IOException {
+    private void addSectionGrid(Document classifiedDoc, int page) {

-        if (flatRedaction) {
-            return;
-        }
-
-        PDPageContentStream contentStream = new PDPageContentStream(document, pdPage, PDPageContentStream.AppendMode.APPEND, true);
        for (Paragraph paragraph : classifiedDoc.getParagraphs()) {

            for (int i = 0; i <= paragraph.getPageBlocks().size() - 1; i++) {
@@ -450,10 +333,8 @@ public class AnnotationHighlightService {
                if (textBlock.getPage() != page) {
                    continue;
                }
-                if (textBlock instanceof TextBlock) {

-                    textBlock.setClassification((i + 1) + "/" + paragraph.getPageBlocks().size());
-                    visualizeTextBlock((TextBlock) textBlock, contentStream);
+                if (textBlock instanceof TextBlock) {

                    classifiedDoc.getSectionGrid()
                            .getRectanglesPerPage()
@@ -463,8 +344,15 @@ public class AnnotationHighlightService {

                } else if (textBlock instanceof Table) {

-                    textBlock.setClassification((i + 1) + "/" + paragraph.getPageBlocks().size());
-                    List<CellRectangle> cellRectangles = visualizeTable((Table) textBlock, contentStream);
+                    List<CellRectangle> cellRectangles = new ArrayList<>();
+                    for (List<Cell> row : ((Table) textBlock).getRows()) {
+                        for (Cell cell : row) {
+                            if (cell != null) {
+                                cellRectangles.add(new CellRectangle(new Point((float) cell.getX(), (float) cell.getY()), (float) cell
+                                        .getWidth(), (float) cell.getHeight()));
+                            }
+                        }
+                    }

                    classifiedDoc.getSectionGrid()
                            .getRectanglesPerPage()
@@ -475,56 +363,6 @@ public class AnnotationHighlightService {
                }
            }
        }
-        contentStream.close();
-    }
-
-
-    private void visualizeTextBlock(TextBlock textBlock, PDPageContentStream contentStream) throws IOException {
-
-        contentStream.setStrokingColor(Color.LIGHT_GRAY);
-        contentStream.setLineWidth(0.5f);
-        contentStream.addRect(textBlock.getMinX(), textBlock.getMinY(), textBlock.getWidth(), textBlock.getHeight());
-        contentStream.stroke();
-
-        if (textBlock.getClassification() != null) {
-            contentStream.beginText();
-            contentStream.setNonStrokingColor(Color.DARK_GRAY);
-            contentStream.setFont(PDType1Font.TIMES_ROMAN, 8f);
-            contentStream.newLineAtOffset(textBlock.getMinX(), textBlock.getMaxY());
-            contentStream.showText(textBlock.getClassification());
-            contentStream.endText();
-        }
-    }
-
-
-    private List<CellRectangle> visualizeTable(Table table, PDPageContentStream contentStream) throws IOException {
-
-        List<CellRectangle> cellRectangles = new ArrayList<>();
-        for (List<Cell> row : table.getRows()) {
-            for (Cell cell : row) {
-
-                if (cell != null) {
-                    contentStream.setLineWidth(0.5f);
-                    contentStream.setStrokingColor(Color.CYAN);
-                    contentStream.addRect((float) cell.getX(), (float) cell.getY(), (float) cell.getWidth(), (float) cell
-                            .getHeight());
-                    contentStream.stroke();
-                    cellRectangles.add(new CellRectangle(new Point((float) cell.getX(), (float) cell.getY()), (float) cell
-                            .getWidth(), (float) cell.getHeight()));
-                }
-            }
-        }
-
-        if (table.getClassification() != null) {
-            contentStream.beginText();
-            contentStream.setNonStrokingColor(Color.DARK_GRAY);
-            contentStream.setFont(PDType1Font.TIMES_ROMAN, 8f);
-            contentStream.newLineAtOffset(table.getMinX(), table.getMinY());
-            contentStream.showText(table.getClassification());
-            contentStream.endText();
-        }
-
-        return cellRectangles;
    }

 }
@@ -104,4 +104,21 @@ public class EntitySearchUtils {
        }
        entities.removeAll(wordsToRemove);
    }
+
+
+    public void addEntitiesWithHigherRank(Set<Entity> entities, Set<Entity> found, Dictionary dictionary) {
+        found.forEach(f -> addEntitiesWithHigherRank(entities, f, dictionary));
+    }
+
+
+    public void addEntitiesWithHigherRank(Set<Entity> entities, Entity found, Dictionary dictionary) {
+
+        if(entities.contains(found)){
+            Entity existing = entities.stream().filter(entity -> entity.equals(found)).findFirst().get();
+            if (dictionary.getDictionaryRank(existing.getType()) <= dictionary.getDictionaryRank(found.getType())){
+                entities.remove(found);
+            }
+        }
+        entities.add(found);
+    }
 }
@@ -1,5 +1,6 @@
 package com.iqser.red.service.redaction.v1.server.redaction.utils;

+import java.awt.geom.Rectangle2D;
 import java.nio.charset.StandardCharsets;
 import java.util.List;

@@ -23,4 +24,16 @@ public class IdBuilder {

        return hashFunction.hashString(sb.toString(), StandardCharsets.UTF_8).toString();
    }
+
+
+    public String buildId(Rectangle2D rectangle2D, int page){
+
+        StringBuilder sb = new StringBuilder();
+        sb.append("x").append(rectangle2D.getX()).append("y").append(rectangle2D.getY()).append("h").append(rectangle2D.getHeight()).append("w").append(rectangle2D.getWidth()).append("p").append(page);
+
+        return hashFunction.hashString(sb.toString(), StandardCharsets.UTF_8).toString();
+    }
+
+
+
 }
@@ -48,6 +48,7 @@ public class PdfSegmentationService {
            stripper.setPageNumber(pageNumber);
            stripper.setStartPage(pageNumber);
            stripper.setEndPage(pageNumber);
+            stripper.setPdpage(pdPage);
            stripper.getText(pdDocument);

            PDRectangle pdr = pdPage.getMediaBox();
@@ -56,18 +57,17 @@ public class PdfSegmentationService {
            int rotation = pdPage.getRotation();
            boolean isRotated = rotation != 0 && rotation != 360;

-
            ParsedElements parsedElements = ParsedElements.builder()
                    .rulings(stripper.getRulings())
                    .sequences(stripper.getTextPositionSequences())
-                    .maxCharWidth(stripper.getMaxCharWidths())
-                    .maxCharHeight(stripper.getMaxCharWidths())
+                    .imageBounds(stripper.getImageBounds())
+                    .minCharWidth(stripper.getMinCharWidths())
                    .landscape(isLandscape)
                    .rotated(isRotated)
                    .build();

            CleanRulings cleanRulings = rulingCleaningService.getCleanRulings(parsedElements.getRulings(), parsedElements
-                    .getMaxCharWidth(), parsedElements.getMaxCharHeight());
+                    .getMinCharWidth());

            Page page = blockificationService.blockify(parsedElements.getSequences(), cleanRulings.getHorizontal(), cleanRulings
                    .getVertical());
@@ -81,8 +81,10 @@ public class PdfSegmentationService {

            page.setPageNumber(pageNumber);
            increaseDocumentStatistics(page, document);
+            page.setImageBounds(parsedElements.getImageBounds());
            pages.add(page);
        }
+
        document.setPages(pages);

        classificationService.classifyDocument(document);
@@ -90,11 +92,9 @@ public class PdfSegmentationService {
        sectionsBuilderService.buildSections(document);

        return document;
-
    }


-
    private void increaseDocumentStatistics(Page page, Document document) {

        if (!page.isLandscape()) {
@@ -59,6 +59,16 @@ public class Table extends AbstractTextContainer {

        if (rows == null) {
            rows = computeRows();
+
+            // Ignore rows that does not contain any cells and values.
+            List<List<Cell>> rowsToRemove = new ArrayList<>();
+            for (List<Cell> row: rows){
+                if (row.size() == 1 && row.get(0).getTextBlocks().isEmpty()){
+                    rowsToRemove.add(row);
+                }
+            }
+            rows.removeAll(rowsToRemove);
+
            computeHeaders();
        }

@@ -18,9 +18,9 @@ import com.iqser.red.service.redaction.v1.server.tableextraction.utils.Utils;
@Service
 public class RulingCleaningService {

-    public CleanRulings getCleanRulings(List<Ruling> rulings, float maxCharWidth, float maxCharHeight){
+    public CleanRulings getCleanRulings(List<Ruling> rulings, float minCharWidth){
        if (!rulings.isEmpty()) {
-            snapPoints(rulings, maxCharWidth , maxCharHeight);
+            snapPoints(rulings, minCharWidth , minCharWidth);
        }

        List<Ruling> vrs = new ArrayList<>();
@@ -1,41 +1,8 @@
 package com.iqser.red.service.redaction.v1.server;

-import com.iqser.red.service.configuration.v1.api.model.Colors;
-import com.iqser.red.service.configuration.v1.api.model.DictionaryResponse;
-import com.iqser.red.service.configuration.v1.api.model.RulesResponse;
-import com.iqser.red.service.configuration.v1.api.model.TypeResponse;
-import com.iqser.red.service.configuration.v1.api.model.TypeResult;
-import com.iqser.red.service.redaction.v1.model.Comment;
-import com.iqser.red.service.redaction.v1.model.IdRemoval;
-import com.iqser.red.service.redaction.v1.model.ManualRedactionEntry;
-import com.iqser.red.service.redaction.v1.model.ManualRedactions;
-import com.iqser.red.service.redaction.v1.model.Point;
-import com.iqser.red.service.redaction.v1.model.Rectangle;
-import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
-import com.iqser.red.service.redaction.v1.model.RedactionRequest;
-import com.iqser.red.service.redaction.v1.model.RedactionResult;
-import com.iqser.red.service.redaction.v1.model.Status;
-import com.iqser.red.service.redaction.v1.server.client.DictionaryClient;
-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.redaction.utils.ResourceLoader;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizationUtilities;
-import org.apache.commons.io.IOUtils;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.kie.api.KieServices;
-import org.kie.api.builder.KieBuilder;
-import org.kie.api.builder.KieFileSystem;
-import org.kie.api.builder.KieModule;
-import org.kie.api.runtime.KieContainer;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.context.TestConfiguration;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.test.context.junit4.SpringRunner;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.when;
+import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;

 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
@@ -56,9 +23,47 @@ import java.util.Set;
 import java.util.UUID;
 import java.util.stream.Collectors;

-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.when;
-import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
+import org.apache.commons.io.IOUtils;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.kie.api.KieServices;
+import org.kie.api.builder.KieBuilder;
+import org.kie.api.builder.KieFileSystem;
+import org.kie.api.builder.KieModule;
+import org.kie.api.runtime.KieContainer;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.TestConfiguration;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.iqser.red.service.configuration.v1.api.model.Colors;
+import com.iqser.red.service.configuration.v1.api.model.DictionaryResponse;
+import com.iqser.red.service.configuration.v1.api.model.RulesResponse;
+import com.iqser.red.service.configuration.v1.api.model.TypeResponse;
+import com.iqser.red.service.configuration.v1.api.model.TypeResult;
+import com.iqser.red.service.redaction.v1.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.Comment;
+import com.iqser.red.service.redaction.v1.model.IdRemoval;
+import com.iqser.red.service.redaction.v1.model.ManualRedactionEntry;
+import com.iqser.red.service.redaction.v1.model.ManualRedactions;
+import com.iqser.red.service.redaction.v1.model.Point;
+import com.iqser.red.service.redaction.v1.model.Rectangle;
+import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
+import com.iqser.red.service.redaction.v1.model.RedactionRequest;
+import com.iqser.red.service.redaction.v1.model.RedactionResult;
+import com.iqser.red.service.redaction.v1.model.Status;
+import com.iqser.red.service.redaction.v1.server.client.DictionaryClient;
+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.redaction.utils.ResourceLoader;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizationUtilities;

@RunWith(SpringRunner.class)
@SpringBootTest(webEnvironment = RANDOM_PORT)
@@ -76,6 +81,7 @@ public class RedactionIntegrationTest {
    private static final String PUBLISHED_INFORMATION = "published_information";
    private static final String TEST_METHOD = "test_method";
    private static final String PURITY = "purity";
+    private static final String IMAGE = "image";

    private static final String RECOMMENDATION_AUTHOR = "recommendation_CBI_author";
    private static final String RECOMMENDATION_ADDRESS = "recommendation_CBI_address";
@@ -98,6 +104,7 @@ public class RedactionIntegrationTest {
    private final Map<String, Boolean> hintTypeMap = new HashMap<>();
    private final Map<String, Boolean> caseInSensitiveMap = new HashMap<>();
    private final Map<String, Boolean> recommendationTypeMap = new HashMap<>();
+    private final Map<String, Integer> rankTypeMap = new HashMap<>();
    private final Colors colors = new Colors();

    private final static String TEST_RULESET_ID = "123";
@@ -133,7 +140,9 @@ public class RedactionIntegrationTest {
        loadDictionaryForTest();
        loadTypeForTest();
        when(dictionaryClient.getVersion(TEST_RULESET_ID)).thenReturn(0L);
-        when(dictionaryClient.getAllTypes(TEST_RULESET_ID)).thenReturn(TypeResponse.builder().types(getTypeResponse()).build());
+        when(dictionaryClient.getAllTypes(TEST_RULESET_ID)).thenReturn(TypeResponse.builder()
+                .types(getTypeResponse())
+                .build());
        when(dictionaryClient.getDictionaryForType(VERTEBRATE, TEST_RULESET_ID)).thenReturn(getDictionaryResponse(VERTEBRATE));
        when(dictionaryClient.getDictionaryForType(ADDRESS, TEST_RULESET_ID)).thenReturn(getDictionaryResponse(ADDRESS));
        when(dictionaryClient.getDictionaryForType(AUTHOR, TEST_RULESET_ID)).thenReturn(getDictionaryResponse(AUTHOR));
@@ -149,6 +158,7 @@ public class RedactionIntegrationTest {
        when(dictionaryClient.getDictionaryForType(RECOMMENDATION_ADDRESS, TEST_RULESET_ID)).thenReturn(getDictionaryResponse(RECOMMENDATION_ADDRESS));
        when(dictionaryClient.getDictionaryForType(FALSE_POSITIVE, TEST_RULESET_ID)).thenReturn(getDictionaryResponse(FALSE_POSITIVE));
        when(dictionaryClient.getDictionaryForType(PURITY, TEST_RULESET_ID)).thenReturn(getDictionaryResponse(PURITY));
+        when(dictionaryClient.getDictionaryForType(IMAGE, TEST_RULESET_ID)).thenReturn(getDictionaryResponse(IMAGE));
        when(dictionaryClient.getColors(TEST_RULESET_ID)).thenReturn(colors);
    }

@@ -230,6 +240,11 @@ public class RedactionIntegrationTest {
                        .stream()
                        .map(this::cleanDictionaryEntry)
                        .collect(Collectors.toSet()));
+        dictionary.computeIfAbsent(IMAGE, v -> new ArrayList<>())
+                .addAll(ResourceLoader.load("dictionaries/image.txt")
+                        .stream()
+                        .map(this::cleanDictionaryEntry)
+                        .collect(Collectors.toSet()));
    }


@@ -256,6 +271,7 @@ public class RedactionIntegrationTest {
        typeColorMap.put(RECOMMENDATION_ADDRESS, "#8df06c");
        typeColorMap.put(FALSE_POSITIVE, "#ffffff");
        typeColorMap.put(PURITY, "#ffe187");
+        typeColorMap.put(IMAGE, "#fcc5fb");

        hintTypeMap.put(VERTEBRATE, true);
        hintTypeMap.put(ADDRESS, false);
@@ -272,6 +288,7 @@ public class RedactionIntegrationTest {
        hintTypeMap.put(RECOMMENDATION_ADDRESS, false);
        hintTypeMap.put(FALSE_POSITIVE, true);
        hintTypeMap.put(PURITY, false);
+        hintTypeMap.put(IMAGE, true);

        caseInSensitiveMap.put(VERTEBRATE, true);
        caseInSensitiveMap.put(ADDRESS, false);
@@ -288,6 +305,7 @@ public class RedactionIntegrationTest {
        caseInSensitiveMap.put(RECOMMENDATION_ADDRESS, false);
        caseInSensitiveMap.put(FALSE_POSITIVE, false);
        caseInSensitiveMap.put(PURITY, false);
+        caseInSensitiveMap.put(IMAGE, true);

        recommendationTypeMap.put(VERTEBRATE, false);
        recommendationTypeMap.put(ADDRESS, false);
@@ -304,6 +322,26 @@ public class RedactionIntegrationTest {
        recommendationTypeMap.put(RECOMMENDATION_ADDRESS, true);
        recommendationTypeMap.put(FALSE_POSITIVE, false);
        recommendationTypeMap.put(PURITY, false);
+        recommendationTypeMap.put(IMAGE, false);
+
+
+        rankTypeMap.put(FALSE_POSITIVE, 160);
+        rankTypeMap.put(PURITY, 155);
+        rankTypeMap.put(PII, 150);
+        rankTypeMap.put(ADDRESS, 140);
+        rankTypeMap.put(AUTHOR, 130);
+        rankTypeMap.put(SPONSOR, 120);
+        rankTypeMap.put(VERTEBRATE, 110);
+        rankTypeMap.put(MUST_REDACT, 100);
+        rankTypeMap.put(REDACTION_INDICATOR, 90);
+        rankTypeMap.put(NO_REDACTION_INDICATOR, 80);
+        rankTypeMap.put(PUBLISHED_INFORMATION, 70);
+        rankTypeMap.put(TEST_METHOD, 60);
+        rankTypeMap.put(HINT_ONLY, 50);
+        rankTypeMap.put(RECOMMENDATION_AUTHOR, 40);
+        rankTypeMap.put(RECOMMENDATION_ADDRESS, 30);
+        rankTypeMap.put(IMAGE, 30);
+

        colors.setDefaultColor("#acfc00");
        colors.setNotRedacted("#cccccc");
@@ -323,6 +361,7 @@ public class RedactionIntegrationTest {
                        .isHint(hintTypeMap.get(typeColor.getKey()))
                        .isCaseInsensitive(caseInSensitiveMap.get(typeColor.getKey()))
                        .isRecommendation(recommendationTypeMap.get(typeColor.getKey()))
+                        .rank(rankTypeMap.get(typeColor.getKey()))
                        .build())

                .collect(Collectors.toList());
@@ -337,6 +376,7 @@ public class RedactionIntegrationTest {
                .isHint(hintTypeMap.get(type))
                .isCaseInsensitive(caseInSensitiveMap.get(type))
                .isRecommendation(recommendationTypeMap.get(type))
+                .rank(rankTypeMap.get(type))
                .build();
    }

@@ -354,12 +394,12 @@ public class RedactionIntegrationTest {
            input.addAll(getPathsRecursively(file));
        }
        for (File path : input) {
-            RedactionRequest request = RedactionRequest.builder()
+            AnalyzeRequest request = AnalyzeRequest.builder()
                    .ruleSetId(TEST_RULESET_ID)
                    .document(IOUtils.toByteArray(new FileInputStream(path)))
                    .build();
            System.out.println("Redacting file : " + path.getName());
-            RedactionResult result = redactionController.redact(request);
+            AnalyzeResult result = redactionController.analyze(request);

            Map<String, List<RedactionLogEntry>> duplicates = new HashMap<>();
            result.getRedactionLog().getRedactionLogEntry().forEach(entry -> {
@@ -401,25 +441,23 @@ public class RedactionIntegrationTest {

        System.out.println("redactionTest");
        long start = System.currentTimeMillis();
-        ClassPathResource pdfFileResource = new ClassPathResource("files/Metolachlor/S-Metolachlor_RAR_08_Volume_3CA_B-6_2018-09-06.pdf");
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Metolachlor/S-Metolachlor_RAR_01_Volume_1_2018-09-06.pdf");

-        RedactionRequest request = RedactionRequest.builder()
+        AnalyzeRequest request = AnalyzeRequest.builder()
                .ruleSetId(TEST_RULESET_ID)
                .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))
                .build();
-        request.setFlatRedaction(false);

-        RedactionResult result = redactionController.redact(request);

-//        result.getRedactionLog().getRedactionLogEntry().forEach(entry -> {
-//            if(!entry.isHint()){
-//                System.out.println(entry.getPositions().get(0).getPage() +":"+ entry.getTextBefore() +"--->"+ entry.getValue() + "--->" + entry.getTextAfter());
-//            }
-//        });
+        AnalyzeResult result = redactionController.analyze(request);

-        try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Redacted.pdf")) {
-            fileOutputStream.write(result.getDocument());
+        AnnotateResponse annotateResponse = redactionController.annotate(AnnotateRequest.builder().document(IOUtils.toByteArray(pdfFileResource.getInputStream())).redactionLog(result.getRedactionLog()).sectionGrid(result.getSectionGrid()).build());
+
+
+        try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Annotated.pdf")) {
+            fileOutputStream.write(annotateResponse.getDocument());
        }
+
        long end = System.currentTimeMillis();

        System.out.println("duration: " + (end - start));
@@ -434,15 +472,19 @@ public class RedactionIntegrationTest {
        long start = System.currentTimeMillis();
        ClassPathResource pdfFileResource = new ClassPathResource("files/Metolachlor/S-Metolachlor_RAR_02_Volume_2_2018-09-06.pdf");

-        RedactionRequest request = RedactionRequest.builder()
+        AnalyzeRequest request = AnalyzeRequest.builder()
                .ruleSetId(TEST_RULESET_ID)
                .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))
                .build();

-        RedactionResult result = redactionController.redact(request);

-        try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Redacted.pdf")) {
-            fileOutputStream.write(result.getDocument());
+        AnalyzeResult result = redactionController.analyze(request);
+
+        AnnotateResponse annotateResponse = redactionController.annotate(AnnotateRequest.builder().document(IOUtils.toByteArray(pdfFileResource.getInputStream())).redactionLog(result.getRedactionLog()).sectionGrid(result.getSectionGrid()).build());
+
+
+        try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Annotated.pdf")) {
+            fileOutputStream.write(annotateResponse.getDocument());
        }
        long end = System.currentTimeMillis();

@@ -486,16 +528,20 @@ public class RedactionIntegrationTest {

        manualRedactions.getEntriesToAdd().add(manualRedactionEntry);

-        RedactionRequest request = RedactionRequest.builder()
+        AnalyzeRequest request = AnalyzeRequest.builder()
                .ruleSetId(TEST_RULESET_ID)
                .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))
                .manualRedactions(manualRedactions)
                .build();

-        RedactionResult result = redactionController.redact(request);

-        try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Redacted.pdf")) {
-            fileOutputStream.write(result.getDocument());
+        AnalyzeResult result = redactionController.analyze(request);
+
+        AnnotateResponse annotateResponse = redactionController.annotate(AnnotateRequest.builder().document(IOUtils.toByteArray(pdfFileResource.getInputStream())).redactionLog(result.getRedactionLog()).sectionGrid(result.getSectionGrid()).build());
+
+
+        try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Annotated.pdf")) {
+            fileOutputStream.write(annotateResponse.getDocument());
        }
        long end = System.currentTimeMillis();

@@ -581,13 +627,13 @@ public class RedactionIntegrationTest {

        ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/Phantom Cells.pdf");

-        RedactionRequest request = RedactionRequest.builder()
+        AnalyzeRequest request = AnalyzeRequest.builder()
                .ruleSetId(TEST_RULESET_ID)
                .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))
                .build();
-        request.setFlatRedaction(false);

-        RedactionResult result = redactionController.redact(request);
+
+        AnalyzeResult result = redactionController.analyze(request);

        result.getRedactionLog().getRedactionLogEntry().forEach(entry -> {
            if (!entry.isHint()) {
@@ -603,16 +649,19 @@ public class RedactionIntegrationTest {
        long start = System.currentTimeMillis();
        ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/sponsor_companies.pdf");

-        RedactionRequest request = RedactionRequest.builder()
+        AnalyzeRequest request = AnalyzeRequest.builder()
                .ruleSetId(TEST_RULESET_ID)
-                .flatRedaction(false)
                .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))
                .build();

-        RedactionResult result = redactionController.redact(request);

-        try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Redacted.pdf")) {
-            fileOutputStream.write(result.getDocument());
+        AnalyzeResult result = redactionController.analyze(request);
+
+        AnnotateResponse annotateResponse = redactionController.annotate(AnnotateRequest.builder().document(IOUtils.toByteArray(pdfFileResource.getInputStream())).redactionLog(result.getRedactionLog()).sectionGrid(result.getSectionGrid()).build());
+
+
+        try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Annotated.pdf")) {
+            fileOutputStream.write(annotateResponse.getDocument());
        }
        long end = System.currentTimeMillis();

@@ -16,6 +16,7 @@ import com.iqser.red.service.redaction.v1.server.segmentation.PdfSegmentationSer
 import org.apache.commons.io.IOUtils;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.kie.api.KieServices;
@@ -412,6 +413,7 @@ public class EntityRedactionServiceTest {


    @Test
+    @Ignore
    public void testNGuideline() throws IOException {

        ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/Empty Tabular Data.pdf");
@@ -1,15 +1,36 @@
 package com.iqser.red.service.redaction.v1.server.redaction.utils;

+import org.apache.commons.lang3.StringUtils;
 import org.junit.Test;

 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

+import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
+
 public class RegExPatternTest {


+    @Test
+    public void testExpand(){
+        String pattern = "(,? [A-Z]\\.?( ?[A-Z]\\.?)?( ?[A-Z]\\.?)?\\b\\.?)";
+        String text = ", G.R., Simoneaux,";
+        Pattern compiledPattern = Pattern.compile(pattern, 0);
+        Matcher matcher = compiledPattern.matcher(text);
+
+        while (matcher.find()) {
+            String match = matcher.group(1);
+            if (StringUtils.isNotBlank(match)) {
+                System.out.println(match);
+            }
+        }
+    }
+
+
+
    @Test
    public void testEmailRegEx(){
        String text = "Address: Schwarzwaldalle " +
@@ -234,4 +234,5 @@ Syngenta AG
 N/A
 No details reported
 Not available
-Test facility
+Test facility
+TBD
@@ -7,6 +7,15 @@ 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 "1: Redact CBI Authors"
    when
        Section(matchesType("CBI_author") || matchesType("recommendation_CBI_author"))
@@ -43,57 +52,63 @@ rule "5: Redact Names and Addresses if no_redaction_indicator and redaction_indi
    when
        Section(matchesType("vertebrate"), matchesType("no_redaction_indicator"), matchesType("redaction_indicator"))
    then
-        section.redact("CBI_address", 6, "Vertebrate and Redaction Indicator found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+        section.redact("CBI_address", 5, "Vertebrate and Redaction Indicator found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
    end

-
-rule "6: Do not redact Names and Addresses if no redaction Indicator is contained"
+rule "6: Redact Authors and Addresses in Reference Table if it is a Vertebrate study"
    when
-        Section(matchesType("vertebrate"), matchesType("published_information"))
+        Section(hasTableHeader("Author(s)") && !hasTableHeader("Vertebrate study Y/N"))
    then
-        section.redactNot("CBI_author", 6, "Vertebrate and Published Information found");
-        section.redactNot("CBI_address", 6, "Vertebrate and Published Information found");
+        section.redactCell("Author(s)", 6, "CBI_author", false, "Author found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
    end


-rule "7: Not redacted because Vertebrate Study = N"
+rule "7: Redact Authors and Addresses in Reference Table if it is a Vertebrate study"
+    when
+        Section(hasTableHeader("Author") && !hasTableHeader("Vertebrate study Y/N"))
+    then
+        section.redactCell("Author", 7, "CBI_author", false, "Author found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+    end
+
+
+rule "8: Not redacted because Vertebrate Study = N"
    when
        Section(rowEquals("Vertebrate study Y/N", "N") || rowEquals("Vertebrate study Y/N", "No"))
    then
-        section.redactCell("Author(s)", 7, "CBI_author", true, "Author found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
-        section.redactNot("CBI_address", 7, "Not redacted because row is not a vertebrate study");
-        section.highlightCell("Vertebrate study Y/N", 7, "hint_only");
+        section.redactCell("Author(s)", 8, "CBI_author", true, "Author found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+        section.redactNot("CBI_address", 8, "Not redacted because row is not a vertebrate study");
+        section.highlightCell("Vertebrate study Y/N", 8, "hint_only");
    end


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


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


-rule "10: Redact sponsor company"
+rule "11: Redact sponsor company"
    when
        Section(searchText.toLowerCase().contains("batches produced at"))
    then
-        section.redactIfPrecededBy("batches produced at", "CBI_sponsor", 10, "Redacted because it represents a sponsor company", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+        section.redactIfPrecededBy("batches produced at", "CBI_sponsor", 11, "Redacted because it represents a sponsor company", "Reg (EC) No 1107/2009 Art. 63 (2g)");
        section.addHintAnnotation("batches produced at", "must_redact");
    end


-rule "11: Redact determination of residues"
+rule "12: Redact determination of residues"
    when
        Section((
            searchText.toLowerCase.contains("determination of residues") ||
@@ -110,8 +125,9 @@ rule "11: Redact determination of residues"
            searchText.toLowerCase.contains("ruminants")
        ))
    then
-        section.redact("CBI_address", 11, "Determination of residues was found.", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+        section.redact("CBI_address", 12, "Determination of residues was found.", "Reg (EC) No 1107/2009 Art. 63 (2g)");
        section.addHintAnnotation("determination of residues", "must_redact");
+        section.addHintAnnotation("determination of total residues", "must_redact");
        section.addHintAnnotation("livestock", "must_redact");
        section.addHintAnnotation("live stock", "must_redact");
        section.addHintAnnotation("tissue", "must_redact");
@@ -124,25 +140,25 @@ rule "11: Redact determination of residues"
    end


-rule "12: Redact if CTL/* or BL/*  was found"
+rule "13: Redact if CTL/* or BL/*  was found"
    when
        Section(searchText.contains("CTL/") || searchText.contains("BL/"))
    then
-        section.redact("CBI_address", 12, "Laboraty for vertebrate studies found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+        section.redact("CBI_address", 13, "Laboraty for vertebrate studies found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
        section.addHintAnnotation("CTL", "must_redact");
        section.addHintAnnotation("BL", "must_redact");
    end


-rule "13: Redact and add recommendation for et al. author"
+rule "14: Redact and add recommendation for et al. author"
    when
        Section(searchText.contains("et al"))
    then
-		section.redactAndRecommendByRegEx("\\b([A-ZÄÖÜ][^\\s\\.,]+( [A-ZÄÖÜ]{1,2}\\.?)?( ?[A-ZÄÖÜ]\\.?)?) et al\\.?", false, 1, "CBI_author", 13, "Author found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redactAndRecommendByRegEx("\\b([A-ZÄÖÜ][^\\s\\.,]+( [A-ZÄÖÜ]{1,2}\\.?)?( ?[A-ZÄÖÜ]\\.?)?) et al\\.?", false, 1, "CBI_author", 14, "Author found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
    end


-rule "14: Add recommendation for Addresses in Test Organism sections"
+rule "15: Add recommendation for Addresses in Test Organism sections"
    when
        Section(searchText.contains("Species:") && searchText.contains("Source:"))
    then
@@ -150,7 +166,7 @@ rule "14: Add recommendation for Addresses in Test Organism sections"
    end


-rule "15: Add recommendation for Addresses in Test Animals sections"
+rule "16: Add recommendation for Addresses in Test Animals sections"
    when
        Section(searchText.contains("Species") && searchText.contains("Source"))
    then
@@ -158,26 +174,34 @@ rule "15: Add recommendation for Addresses in Test Animals sections"
    end


+rule "17: Do not redact Names and Addresses if no redaction Indicator is contained"
+    when
+        Section(matchesType("published_information"))
+    then
+        section.redactNot("CBI_author", 17, "Vertebrate and Published Information found");
+        section.redactNot("CBI_address", 17, "Vertebrate and Published Information found");
+    end
+
 // --------------------------------------- PII rules -------------------------------------------------------------------


-rule "16: Redacted PII Personal Identification Information"
+rule "18: Redacted PII Personal Identification Information"
    when
        Section(matchesType("PII"))
    then
-        section.redact("PII", 16, "PII (Personal Identification Information) found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redact("PII", 18, "PII (Personal Identification Information) found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
    end


-rule "17: Redact Emails by RegEx"
+rule "19: Redact Emails by RegEx"
    when
        Section(searchText.contains("@"))
    then
-        section.redactByRegEx("\\b[A-Z0-9._%+-]+@[A-Z0-9.-]+\\.[A-Z]{2,4}\\b", true, 0, "PII", 17, "PII (Personal Identification Information) found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactByRegEx("\\b[A-Z0-9._%+-]+@[A-Z0-9.-]+\\.[A-Z]{2,4}\\b", true, 0, "PII", 19, "PII (Personal Identification Information) found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
    end


-rule "18: Redact contact information"
+rule "20: Redact contact information"
    when
       Section(text.contains("Contact point:")
       || text.contains("Phone:")
@@ -195,106 +219,106 @@ rule "18: Redact contact information"
       || text.contains("Telephone:")
       || text.contains("European contact:"))
    then
-          section.redactLineAfter("Contact point:", "PII", 18, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-              section.redactLineAfter("Phone:", "PII", 18, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-              section.redactLineAfter("Fax:", "PII", 18, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-              section.redactLineAfter("Tel.:", "PII", 18, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-              section.redactLineAfter("Tel:", "PII", 18, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-              section.redactLineAfter("E-mail:", "PII", 18, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-              section.redactLineAfter("Email:", "PII", 18, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-              section.redactLineAfter("e-mail:", "PII", 18, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-              section.redactLineAfter("E-mail address:", "PII", 18, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-              section.redactLineAfter("Contact:", "PII", 18, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-              section.redactLineAfter("Alternative contact:", "PII", 18, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-              section.redactLineAfter("Telephone number:", "PII", 18, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-              section.redactLineAfter("Telephone No:", "PII", 18, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-              section.redactLineAfter("Fax number:", "PII", 18, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-              section.redactLineAfter("Telephone:", "PII", 18, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-              section.redactBetween("No:", "Fax", "PII", 18, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-              section.redactBetween("Contact:", "Tel.:", "PII", 18, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-              section.redactLineAfter("European contact:",  "PII", 18, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+          section.redactLineAfter("Contact point:", "PII", 20, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+              section.redactLineAfter("Phone:", "PII", 20, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+              section.redactLineAfter("Fax:", "PII", 20, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+              section.redactLineAfter("Tel.:", "PII", 20, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+              section.redactLineAfter("Tel:", "PII", 20, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+              section.redactLineAfter("E-mail:", "PII", 20, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+              section.redactLineAfter("Email:", "PII", 20, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+              section.redactLineAfter("e-mail:", "PII", 20, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+              section.redactLineAfter("E-mail address:", "PII", 20, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+              section.redactLineAfter("Contact:", "PII", 20, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+              section.redactLineAfter("Alternative contact:", "PII", 20, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+              section.redactLineAfter("Telephone number:", "PII", 20, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+              section.redactLineAfter("Telephone No:", "PII", 20, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+              section.redactLineAfter("Fax number:", "PII", 20, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+              section.redactLineAfter("Telephone:", "PII", 20, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+              section.redactBetween("No:", "Fax", "PII", 20, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+              section.redactBetween("Contact:", "Tel.:", "PII", 20, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+              section.redactLineAfter("European contact:",  "PII", 20, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
     end


-rule "19: Redact contact information if applicant is found"
+rule "21: Redact contact information if applicant is found"
    when
        Section(headlineContainsWord("applicant") || text.contains("Applicant") || headlineContainsWord("Primary contact") || headlineContainsWord("Alternative contact") || text.contains("Telephone number:"))
    then
-        section.redactLineAfter("Contact point:", "PII", 19, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-        section.redactLineAfter("Phone:", "PII", 19, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-        section.redactLineAfter("Fax:", "PII", 19, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-        section.redactLineAfter("Tel.:", "PII", 19, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-        section.redactLineAfter("Tel:", "PII", 19, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-        section.redactLineAfter("E-mail:", "PII", 19, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-        section.redactLineAfter("Email:", "PII", 19, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-        section.redactLineAfter("e-mail:", "PII", 19, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-        section.redactLineAfter("E-mail address:", "PII", 19, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-        section.redactLineAfter("Contact:", "PII", 19, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-        section.redactLineAfter("Alternative contact:", "PII", 19, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-        section.redactLineAfter("Telephone number:", "PII", 19, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-        section.redactLineAfter("Telephone No:", "PII", 19, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-        section.redactLineAfter("Fax number:", "PII", 19, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-        section.redactLineAfter("Telephone:", "PII", 19, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-        section.redactBetween("No:", "Fax", "PII", 19, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-        section.redactBetween("Contact:", "Tel.:", "PII", 19, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-        section.redactLineAfter("European contact:",  "PII", 19, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactLineAfter("Contact point:", "PII", 21, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactLineAfter("Phone:", "PII", 21, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactLineAfter("Fax:", "PII", 21, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactLineAfter("Tel.:", "PII", 21, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactLineAfter("Tel:", "PII", 21, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactLineAfter("E-mail:", "PII", 21, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactLineAfter("Email:", "PII", 21, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactLineAfter("e-mail:", "PII", 21, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactLineAfter("E-mail address:", "PII", 21, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactLineAfter("Contact:", "PII", 21, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactLineAfter("Alternative contact:", "PII", 21, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactLineAfter("Telephone number:", "PII", 21, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactLineAfter("Telephone No:", "PII", 21, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactLineAfter("Fax number:", "PII", 21, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactLineAfter("Telephone:", "PII", 21, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactBetween("No:", "Fax", "PII", 21, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactBetween("Contact:", "Tel.:", "PII", 21, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactLineAfter("European contact:",  "PII", 21, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
    end


-rule "20: Redact contact information if Producer is found"
+rule "22: Redact contact information if Producer is found"
    when
        Section(text.toLowerCase().contains("producer of the plant protection") || text.toLowerCase().contains("producer of the active substance") || text.contains("Manufacturer of the active substance") || text.contains("Manufacturer:") || text.contains("Producer or producers of the active substance"))
    then
-        section.redactLineAfter("Contact:", "PII", 20, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-        section.redactLineAfter("Telephone:", "PII", 20, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-        section.redactLineAfter("Phone:", "PII", 20, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-        section.redactLineAfter("Fax:", "PII", 20, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-        section.redactLineAfter("E-mail:", "PII", 20, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-        section.redactLineAfter("Contact:", "PII", 20, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-        section.redactLineAfter("Fax number:", "PII", 20, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-        section.redactLineAfter("Telephone number:", "PII", 20, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-        section.redactLineAfter("Tel:", "PII", 20, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-        section.redactBetween("No:", "Fax", "PII", 20, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactLineAfter("Contact:", "PII", 22, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactLineAfter("Telephone:", "PII", 22, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactLineAfter("Phone:", "PII", 22, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactLineAfter("Fax:", "PII", 22, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactLineAfter("E-mail:", "PII", 22, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactLineAfter("Contact:", "PII", 22, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactLineAfter("Fax number:", "PII", 22, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactLineAfter("Telephone number:", "PII", 22, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactLineAfter("Tel:", "PII", 22, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactBetween("No:", "Fax", "PII", 22, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
    end


-rule "21: Redact AUTHOR(S)"
+rule "23: Redact AUTHOR(S)"
    when
        Section(searchText.contains("AUTHOR(S):"))
    then
-        section.redactLinesBetween("AUTHOR(S):", "COMPLETION DATE:", "PII", 21, true, "AUTHOR(S) was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactLinesBetween("AUTHOR(S):", "COMPLETION DATE:", "PII", 23, true, "AUTHOR(S) was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
    end


-rule "22: Redact PERFORMING LABORATORY"
+rule "24: Redact PERFORMING LABORATORY"
    when
        Section(searchText.contains("PERFORMING LABORATORY:"))
    then
-        section.redactBetween("PERFORMING LABORATORY:", "LABORATORY PROJECT ID:", "PII", 22, true, "PERFORMING LABORATORY was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactBetween("PERFORMING LABORATORY:", "LABORATORY PROJECT ID:", "PII", 24, true, "PERFORMING LABORATORY was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
    end


-rule "23: Redact On behalf of Sequani Ltd.:"
+rule "25: Redact On behalf of Sequani Ltd.:"
    when
        Section(searchText.contains("On behalf of Sequani Ltd.: Name Title"))
    then
-        section.redactBetween("On behalf of Sequani Ltd.: Name Title", "On behalf of", "PII", 23, false , "PII (Personal Identification Information) found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactBetween("On behalf of Sequani Ltd.: Name Title", "On behalf of", "PII", 25, false , "PII (Personal Identification Information) found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
    end


-rule "24: Redact On behalf of Syngenta Ltd.:"
+rule "26: Redact On behalf of Syngenta Ltd.:"
    when
        Section(searchText.contains("On behalf of Syngenta Ltd.: Name Title"))
    then
-        section.redactBetween("On behalf of Syngenta Ltd.: Name Title", "Study dates", "PII", 24, false , "PII (Personal Identification Information) found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactBetween("On behalf of Syngenta Ltd.: Name Title", "Study dates", "PII", 26, false , "PII (Personal Identification Information) found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
    end


 // --------------------------------------- other rules -------------------------------------------------------------------

-rule "25: Redact Purity"
+rule "27: Redact Purity"
    when
        Section(searchText.contains("purity"))
    then
-	    section.redactByRegEx("purity ?:? (([\\d\\.]+)( .{0,4}\\.)? ?%)", true, 1, "purity", 17, "Purity found", "Reg (EC) No 1107/2009 Art. 63 (2a)");
+	    section.redactByRegEx("purity ?:? (([\\d\\.]+)( .{0,4}\\.)? ?%)", true, 1, "purity", 27, "Purity found", "Reg (EC) No 1107/2009 Art. 63 (2a)");
    end
@@ -7,6 +7,15 @@ 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 "1: Redacted because Section contains Vertebrate"
    when
        Section(matchesType("vertebrate"))
Author	SHA1	Message	Date
Dominique Eifländer	fc2ac03691	Fixed table extraction problems	2021-02-03 14:34:29 +01:00
Dominique Eiflaender	7898f6a30f	Pull request #115 : Expand CBI Authors with firstname initials Merge in RED/redaction-service from ExpandAuthors to master * commit '35f3582d0850053c1dc38ef0b149daa47bd9cc56': Expand CBI Authors with firstname initials	2021-02-02 12:35:07 +01:00
Dominique Eifländer	35f3582d08	Expand CBI Authors with firstname initials	2021-02-02 12:20:40 +01:00
Dominique Eiflaender	b4699caaae	Pull request #114 : Fixed position problem for rotated images Merge in RED/redaction-service from rotatedImages to master * commit 'd8e444280b5a025e19785c70c9fcbb11480b5042': Fixed position problem for rotated images	2021-02-01 16:17:19 +01:00
Dominique Eifländer	d8e444280b	Fixed position problem for rotated images	2021-02-01 16:04:45 +01:00
Dominique Eiflaender	ec4db538a7	Pull request #113 : Ignore too small images Merge in RED/redaction-service from IgnoreTooSmall to master * commit '39ca191b9cb5dec5fbb01e8319cbbe361c7cd85e': Ignore too small images	2021-02-01 15:46:57 +01:00
Dominique Eifländer	39ca191b9c	Ignore too small images	2021-02-01 15:14:46 +01:00
Dominique Eiflaender	0cec88f1b4	Pull request #112 : Annotate images Merge in RED/redaction-service from annotateImages to master * commit 'acddfafa5b60d0120a48bdf47fe218bf59e359d2': Annotate images	2021-02-01 14:12:28 +01:00
Dominique Eifländer	acddfafa5b	Annotate images	2021-02-01 13:52:18 +01:00
Dominique Eiflaender	6b68890fcf	Pull request #111 : RED-1019: Fixed returning numberOfPages Merge in RED/redaction-service from RED-1019 to master * commit '1ed99412595b560d92e542d949e52d19d58beb2c': RED-1019: Fixed returning numberOfPages	2021-01-29 13:32:05 +01:00
Dominique Eifländer	1ed9941259	RED-1019: Fixed returning numberOfPages	2021-01-29 13:17:25 +01:00
Timo Bejan	1e7d535a33	Pull request #110 : fixed issue affecting service on restarts Merge in RED/redaction-service from bugfix-annotate to master * commit '1091d6a886243387f23da32d0c678b66b0c21f26': fixed issue affecting service on restarts	2021-01-28 10:17:02 +01:00
Timo	1091d6a886	fixed issue affecting service on restarts	2021-01-28 11:05:01 +02:00
Dominique Eiflaender	d8a1e43991	Pull request #109 : RED-1010: Splittet redaction endpoint to analyis and annotation endpoints Merge in RED/redaction-service from RED-1010 to master * commit 'd739a4f2f5e95d25fc68cda35f1a5cc79b4ded5f': RED-1010: Splittet redaction endpoint to analyis and annotation endpoints	2021-01-27 15:32:24 +01:00
Dominique Eifländer	d739a4f2f5	RED-1010: Splittet redaction endpoint to analyis and annotation endpoints	2021-01-27 15:19:38 +01:00
Dominique Eiflaender	40a9b39688	Pull request #108 : RED-1004: Fixed position problems when mediabox is bigger than cropbox Merge in RED/redaction-service from RED-1004 to master * commit '62b960f2ead02b6f29537447077822c171f65bf8': RED-1004: Fixed position problems when mediabox is bigger than cropbox	2021-01-27 11:47:00 +01:00
Dominique Eifländer	62b960f2ea	RED-1004: Fixed position problems when mediabox is bigger than cropbox	2021-01-27 11:34:17 +01:00
Dominique Eiflaender	0d9e318d25	Pull request #107 : Always check dictionary rank when overriding annotations Merge in RED/redaction-service from checkOverrideRank to master * commit 'a76095c5d62e1d5f39013d77c95328dee9f7fbea': Always check dictionary rank when overriding annotations	2021-01-26 12:16:18 +01:00
Dominique Eifländer	a76095c5d6	Always check dictionary rank when overriding annotations	2021-01-26 12:04:26 +01:00
Dominique Eiflaender	8d1e574dde	Pull request #106 : Added possibility to redact all Author tables Merge in RED/redaction-service from AllAuthorTables to master * commit '43a3d76f1c0ac9e3803cc1e228508b48686e893d': Added possibility to redact all Author tables	2021-01-25 16:11:05 +01:00
Dominique Eifländer	43a3d76f1c	Added possibility to redact all Author tables	2021-01-25 15:59:08 +01:00