Pull request #49 : RED-373: Fixed multiline annotations view in pdftron

Merge in RED/redaction-service from RED-373-2 to master * commit 'a4e012762e1adda234decc1137f221cfd70498d3': RED-373: Fixed multiline annotations view in pdftron
RED-373: Fixed multiline annotations view in pdftron
2020-10-01 15:31:25 +02:00 · 2020-10-01 15:19:57 +02:00 · 2020-10-01 13:01:24 +02:00 · 2020-10-01 12:48:44 +02:00 · 2020-10-01 12:47:58 +02:00 · 2020-10-01 11:55:38 +02:00
10 changed files with 142 additions and 62 deletions
@@ -22,7 +22,7 @@
    </modules>

    <properties>
-        <pdfbox.version>2.0.16</pdfbox.version>
+        <pdfbox.version>2.0.21</pdfbox.version>
    </properties>


@@ -11,25 +11,6 @@

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

-    <properties>
-        <pdfbox.version>2.0.20</pdfbox.version>
-    </properties>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.apache.pdfbox</groupId>
-                <artifactId>pdfbox</artifactId>
-                <version>${pdfbox.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.pdfbox</groupId>
-                <artifactId>pdfbox-tools</artifactId>
-                <version>${pdfbox.version}</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
    <dependencies>
        <dependency>
            <groupId>com.iqser.red.service</groupId>
@@ -136,9 +136,11 @@ public class SearchableText {

    private List<EntityPositionSequence> buildEntityPositionSequence(List<TextPositionSequence> crossSequenceParts) {

-        String id = IdBuilder.buildId(crossSequenceParts);
+        String plainId = IdBuilder.buildId(crossSequenceParts);
+        String id = plainId;
        List<EntityPositionSequence> result = new ArrayList<>();
        int currentPage = -1;
+        int idDiffentPageSuffix = 1;
        EntityPositionSequence entityPositionSequence = new EntityPositionSequence(id);
        for (TextPositionSequence textPositionSequence : crossSequenceParts) {
            if (currentPage == -1) {
@@ -148,9 +150,13 @@ public class SearchableText {
            } else if (currentPage == textPositionSequence.getPage()) {
                entityPositionSequence.getSequences().add(textPositionSequence);
            } else {
+                id = plainId + "-" + idDiffentPageSuffix;
+                idDiffentPageSuffix++;
                result.add(entityPositionSequence);
                entityPositionSequence = new EntityPositionSequence(id);
                entityPositionSequence.setPageNumber(textPositionSequence.getPage());
+                entityPositionSequence.getSequences().add(textPositionSequence);
+                currentPage = textPositionSequence.getPage();
            }
        }
        result.add(entityPositionSequence);
@@ -44,7 +44,7 @@ public class Section {
    }


-    public boolean contains(String type) {
+    public boolean matchesType(String type) {

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


+    public void redactIfPrecededBy(String prefix, String type, int ruleNumber, String reason) {
+
+        entities.forEach(entity -> {
+            if (entity.getType().equals(type) && searchText.indexOf(prefix + entity.getWord()) != 1) {
+                entity.setRedaction(true);
+                entity.setMatchedRule(ruleNumber);
+                entity.setRedactionReason(reason);
+            }
+        });
+    }
+
+
    public void redactLineAfter(String start, String asType, int ruleNumber, String reason) {

        String[] values = StringUtils.substringsBetween(text, start, "\n");
@@ -141,7 +153,8 @@ public class Section {

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

@@ -197,7 +210,8 @@ public class Section {
        if (value == null) {
            log.warn("Could not find any data for {}.", cellHeader);
        } else {
-            Entity entity = new Entity(value.toString(), type, value.getRowSpanStart(), value.getRowSpanStart() + value.toString()
+            Entity entity = new Entity(value.toString(), type, value.getRowSpanStart(),
+                    value.getRowSpanStart() + value.toString()
                    .length(), headline, sectionNumber);
            entity.setRedaction(redact);
            entity.setMatchedRule(ruleNumber);
@@ -206,7 +220,7 @@ public class Section {
                    .getSequences()); // Make sure no other cells with same content are highlighted

            // HashSet keeps the older value, but we want the new only.
-            if(entities.contains(entity)){
+            if (entities.contains(entity)) {
                entities.remove(entity);
            }
            entities.add(entity);
@@ -111,19 +111,20 @@ public class AnnotationHighlightService {
                }

                if (CollectionUtils.isNotEmpty(entityPositionSequence.getSequences())) {
-                    for (Rectangle rectangle : getRectanglesPerLine(entityPositionSequence.getSequences()
+                    List<Rectangle> rectanglesPerline = getRectanglesPerLine(entityPositionSequence.getSequences()
                            .stream()
                            .flatMap(seq -> seq.getTextPositions().stream())
-                            .collect(Collectors.toList()), page)) {
-                        redactionLogEntry.getPositions().add(rectangle);
-                        annotations.add(createAnnotation(rectangle, entityPositionSequence.getId(),
-                                createAnnotationContent(entity), getColor(entity), !flatRedaction && !isHint(entity)));
-                    }
+                            .collect(Collectors.toList()), page);
+
+                    redactionLogEntry.getPositions().addAll(rectanglesPerline);
+                    annotations.add(createAnnotation(rectanglesPerline, entityPositionSequence.getId(), createAnnotationContent(entity), getColor(entity), !flatRedaction && !isHint(entity)));
                }
+
                redactionLogEntry.setId(entityPositionSequence.getId());
            }
            classifiedDoc.getRedactionLogEntities().add(redactionLogEntry);
        }
+
    }


@@ -176,8 +177,8 @@ public class AnnotationHighlightService {

                foundOnPage = true;

-                PDAnnotationTextMarkup highlight = createAnnotation(rectangle, id,
-                        createAnnotationContent(manualRedactionEntry), getColor(manualRedactionEntry.getType()), true);
+                PDAnnotationTextMarkup highlight = createAnnotation(List.of(rectangle), id, createAnnotationContent(manualRedactionEntry), getColor(manualRedactionEntry
+                        .getType()), true);
                annotations.add(highlight);

                redactionLogEntry.getPositions().add(rectangle);
@@ -221,13 +222,13 @@ public class AnnotationHighlightService {
    }


-    private PDAnnotationTextMarkup createAnnotation(Rectangle rectangle, String id, String content, float[] color,
-                                                    boolean popup) {
+    private PDAnnotationTextMarkup createAnnotation(List<Rectangle> rectangles, String id, String content,
+                                                    float[] color, boolean popup) {

        PDAnnotationTextMarkup annotation = new PDAnnotationTextMarkup(PDAnnotationTextMarkup.SUB_TYPE_HIGHLIGHT);
        annotation.constructAppearances();
-        annotation.setRectangle(toPDRectangle(rectangle));
-        annotation.setQuadPoints(toQuadPoints(rectangle));
+        annotation.setRectangle(toPDRectangle(rectangles));
+        annotation.setQuadPoints(toQuadPoints(rectangles));
        if (popup) {
            annotation.setAnnotationName(id);
            annotation.setTitlePopup(id);
@@ -240,8 +241,7 @@ public class AnnotationHighlightService {

    private String createAnnotationContent(Entity entity) {

-        return "\nRule " + entity.getMatchedRule() + " matched" + "\n\n" + entity.getRedactionReason() + "\n\nIn " +
-                "Section : \"" + entity
+        return "\nRule " + entity.getMatchedRule() + " matched" + "\n\n" + entity.getRedactionReason() + "\n\nIn " + "Section : \"" + entity
                .getHeadline() + "\"";
    }

@@ -252,24 +252,59 @@ public class AnnotationHighlightService {
    }


-    private PDRectangle toPDRectangle(Rectangle rectangle) {
+    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(rectangle.getTopLeft().getX());
-        annotationPosition.setLowerLeftY(rectangle.getTopLeft().getY() + rectangle.getHeight());
-        annotationPosition.setUpperRightX(rectangle.getTopLeft().getX() + rectangle.getWidth());
-        annotationPosition.setUpperRightY(rectangle.getTopLeft().getY());
+        annotationPosition.setLowerLeftX(lowerLeftX);
+        annotationPosition.setLowerLeftY(lowerLeftY);
+        annotationPosition.setUpperRightX(upperRightX);
+        annotationPosition.setUpperRightY(upperRightY);
        return annotationPosition;
    }


-    private float[] toQuadPoints(Rectangle rectangle) {
+    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()
+                .getX() + rectangle.getWidth(), rectangle.getTopLeft().getY(), rectangle.getTopLeft().getX(), rectangle.getTopLeft()
                .getY() + rectangle.getHeight(), rectangle.getTopLeft()
                .getX() + rectangle.getWidth(), rectangle.getTopLeft().getY() + rectangle.getHeight()};
    }
@@ -319,8 +354,7 @@ public class AnnotationHighlightService {
            return;
        }

-        PDPageContentStream contentStream = new PDPageContentStream(document, pdPage,
-                PDPageContentStream.AppendMode.APPEND, true);
+        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++) {
@@ -369,8 +403,7 @@ public class AnnotationHighlightService {
                if (cell != null) {
                    contentStream.setLineWidth(0.5f);
                    contentStream.setStrokingColor(Color.CYAN);
-                    contentStream.addRect((float) cell.getX(), (float) cell.getY(), (float) cell.getWidth(),
-                            (float) cell
+                    contentStream.addRect((float) cell.getX(), (float) cell.getY(), (float) cell.getWidth(), (float) cell
                            .getHeight());
                    contentStream.stroke();
                }
@@ -63,6 +63,7 @@ public class RedactionIntegrationTest {
    private static final String VERTEBRATES_CODE = "vertebrate";
    private static final String ADDRESS_CODE = "address";
    private static final String NAME_CODE = "name";
+    private static final String SPONSOR = "sponsor";
    private static final String NO_REDACTION_INDICATOR = "no_redaction_indicator";
    private static final String REDACTION_INDICATOR = "redaction_indicator";
    private static final String HINT_ONLY = "hint_only";
@@ -117,6 +118,7 @@ public class RedactionIntegrationTest {
        when(dictionaryClient.getDictionaryForType(VERTEBRATES_CODE)).thenReturn(getDictionaryResponse(VERTEBRATES_CODE));
        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE)).thenReturn(getDictionaryResponse(ADDRESS_CODE));
        when(dictionaryClient.getDictionaryForType(NAME_CODE)).thenReturn(getDictionaryResponse(NAME_CODE));
+        when(dictionaryClient.getDictionaryForType(SPONSOR)).thenReturn(getDictionaryResponse(SPONSOR));
        when(dictionaryClient.getDictionaryForType(NO_REDACTION_INDICATOR)).thenReturn(getDictionaryResponse(NO_REDACTION_INDICATOR));
        when(dictionaryClient.getDictionaryForType(REDACTION_INDICATOR)).thenReturn(getDictionaryResponse(REDACTION_INDICATOR));
        when(dictionaryClient.getDictionaryForType(HINT_ONLY)).thenReturn(getDictionaryResponse(HINT_ONLY));
@@ -132,6 +134,11 @@ public class RedactionIntegrationTest {
                        .stream()
                        .map(this::cleanDictionaryEntry)
                        .collect(Collectors.toSet()));
+        dictionary.computeIfAbsent(SPONSOR, v -> new ArrayList<>())
+                .addAll(ResourceLoader.load("dictionaries/sponsor_companies.txt")
+                        .stream()
+                        .map(this::cleanDictionaryEntry)
+                        .collect(Collectors.toSet()));
        dictionary.computeIfAbsent(VERTEBRATES_CODE, v -> new ArrayList<>())
                .addAll(ResourceLoader.load("dictionaries/vertebrates.txt")
                        .stream()
@@ -176,6 +183,7 @@ public class RedactionIntegrationTest {
        typeColorMap.put(VERTEBRATES_CODE, new float[]{0, 1, 0});
        typeColorMap.put(ADDRESS_CODE, new float[]{0, 1, 1});
        typeColorMap.put(NAME_CODE, new float[]{1, 1, 0});
+        typeColorMap.put(SPONSOR, new float[]{.5f, .5f, .5f});
        typeColorMap.put(NO_REDACTION_INDICATOR, new float[]{0.8f, 0, 0.8f});
        typeColorMap.put(REDACTION_INDICATOR, new float[]{1, 0.502f, 0.1f});
        typeColorMap.put(HINT_ONLY, new float[]{0.8f, 1, 0.8f});
@@ -184,6 +192,7 @@ public class RedactionIntegrationTest {
        hintTypeMap.put(VERTEBRATES_CODE, true);
        hintTypeMap.put(ADDRESS_CODE, false);
        hintTypeMap.put(NAME_CODE, false);
+        hintTypeMap.put(SPONSOR, false);
        hintTypeMap.put(NO_REDACTION_INDICATOR, true);
        hintTypeMap.put(REDACTION_INDICATOR, true);
        hintTypeMap.put(HINT_ONLY, true);
@@ -192,6 +201,7 @@ public class RedactionIntegrationTest {
        caseInSensitiveMap.put(VERTEBRATES_CODE, true);
        caseInSensitiveMap.put(ADDRESS_CODE, false);
        caseInSensitiveMap.put(NAME_CODE, false);
+        caseInSensitiveMap.put(SPONSOR, false);
        caseInSensitiveMap.put(NO_REDACTION_INDICATOR, true);
        caseInSensitiveMap.put(REDACTION_INDICATOR, true);
        caseInSensitiveMap.put(HINT_ONLY, true);
@@ -270,7 +280,7 @@ public class RedactionIntegrationTest {

        System.out.println("redactionTest");
        long start = System.currentTimeMillis();
-        ClassPathResource pdfFileResource = new ClassPathResource("files/Fludioxonil/50 Fludioxonil_RAR_01_Volume_1_2018-02-21.pdf");
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Metolachlor/S-Metolachlor_RAR_02_Volume_2_2018-09-06.pdf");

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

        result.getRedactionLog().getRedactionLogEntry().forEach(entry -> {
-            if(!entry.isHint()){
+            if (!entry.isHint()) {
                assertThat(entry.getReason()).isEqualTo("Not redacted because row is not a vertebrate study");
            }
        });
    }


+    @Test
+    public void sponsorCompanyTest() throws IOException {
+
+        long start = System.currentTimeMillis();
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/sponsor_companies.pdf");
+
+        RedactionRequest request = RedactionRequest.builder()
+                .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))
+                .build();
+        request.setFlatRedaction(false);
+
+        RedactionResult result = redactionController.redact(request);
+
+        try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Redacted.pdf")) {
+            fileOutputStream.write(result.getDocument());
+        }
+        long end = System.currentTimeMillis();
+
+        System.out.println("duration: " + (end - start));
+        System.out.println("numberOfPages: " + result.getNumberOfPages());
+    }
+

    private static String loadFromClassPath(String path) {

@@ -1,3 +1,2 @@
-Batches Produced at
 CTL
 determination of residues
@@ -0,0 +1,7 @@
+Monthey Syngenta Crop Protection AG, Basel, Switzerland
+Syngenta Crop Protection, Monthey, Switzerland
+Fine Organics Limited, Middlesbrough, United Kingdom
+Syngenta Monthey Switzerland
+Hunan Haili Chemical Industry Co., Ltd., Hunan, China
+Syngenta, Switzerland
+Syngenta Nantong, China
@@ -7,7 +7,7 @@ global Section section

 rule "1: Redacted because Section contains Vertebrate"
 	when
-		eval(section.contains("vertebrate")==true);
+		Section(matchesType("vertebrate"))
 	then
 		section.redact("name", 1, "Redacted because Section contains Vertebrate");
 		section.redact("address", 1, "Redacted because Section contains Vertebrate");
@@ -16,7 +16,7 @@ rule "1: Redacted because Section contains Vertebrate"

 rule "2: Not Redacted because Section contains no Vertebrate"
 	when
-		eval(section.contains("vertebrate")==false);
+		Section(matchesType("vertebrate"))
 	then
 		section.redactNot("name", 2, "Not Redacted because Section contains no Vertebrate");
 		section.redactNot("address", 2, "Not Redacted because Section contains no Vertebrate");
@@ -25,7 +25,7 @@ rule "2: Not Redacted because Section contains no Vertebrate"

 rule "3: Do not redact Names and Addresses if no redaction Indicator is contained"
 	when
-		eval(section.contains("vertebrate")==true && section.contains("no_redaction_indicator")==true);
+		Section(matchesType("vertebrate"), matchesType("no_redaction_indicator"))
 	then
 		section.redactNot("name", 3, "Vertebrate was found, but also a no redaction indicator");
 		section.redactNot("address", 3, "Vertebrate was found, but also a no redaction indicator");
@@ -34,7 +34,7 @@ rule "3: Do not redact Names and Addresses if no redaction Indicator is containe

 rule "4: Redact Names and Addresses if no_redaction_indicator and redaction_indicator is contained"
 	when
-		eval(section.contains("vertebrate")==true && section.contains("no_redaction_indicator")==true && section.contains("redaction_indicator")==true);
+		Section(matchesType("vertebrate"), matchesType("no_redaction_indicator"), matchesType("redaction_indicator"))
 	then
 		section.redact("name", 4, "Vertebrate was found and no_redaction_indicator and redaction_indicator");
 		section.redact("address", 4, "Vertebrate was found and no_redaction_indicator and redaction_indicator");
@@ -43,15 +43,16 @@ rule "4: Redact Names and Addresses if no_redaction_indicator and redaction_indi

 rule "5: Do not redact in guideline sections"
 	when
-		eval(section.headlineContainsWord("guideline") || section.headlineContainsWord("Guidance"));
+		Section(headlineContainsWord("guideline") || headlineContainsWord("Guidance"))
 	then
 		section.redactNot("name", 5, "Section is a guideline section.");
 		section.redactNot("address", 5, "Section is a guideline section.");
 	end

+
 rule "6: Redact contact information if applicant is found"
 	when
-		eval(section.headlineContainsWord("applicant") || section.getText().contains("Applicant") || section.headlineContainsWord("Primary contact") || section.headlineContainsWord("Alternative contact"));
+		Section(headlineContainsWord("applicant") || text.contains("Applicant") || headlineContainsWord("Primary contact") || headlineContainsWord("Alternative contact"))
 	then
 		section.redactLineAfter("Name:", "address", 6, "Applicant information was found");
 		section.redactBetween("Address:", "Contact", "address", 6, "Applicant information was found");
@@ -78,7 +79,7 @@ rule "6: Redact contact information if applicant is found"

 rule "7: Redact contact information if Producer is found"
 	when
-		eval(section.getText().toLowerCase().contains("producer of the plant protection") || section.getText().toLowerCase().contains("producer of the active substance") || section.getText().contains("Manufacturer of the active substance") || section.getText().contains("Manufacturer:") || section.getText().contains("Producer or producers of the active substance"));
+		Section(text.toLowerCase().contains("producer of the plant protection") || text.toLowerCase().contains("producer of the active substance") || text.contains("Manufacturer of the active substance") || text.contains("Manufacturer:") || text.contains("Producer or producers of the active substance"))
 	then
 		section.redactLineAfter("Name:", "address", 7, "Producer was found");
 		section.redactBetween("Address:", "Contact", "address", 7, "Producer was found");
@@ -109,7 +110,7 @@ rule "8: Not redacted because Vertebrate Study = N"

 rule "9: Redact if must redact entry is found"
 	when
-		eval(section.contains("must_redact")==true);
+		Section(matchesType("must_redact"))
 	then
 		section.redact("name", 9, "must_redact entry was found.");
 		section.redact("address", 9, "must_redact entry was found.");
@@ -124,3 +125,10 @@ rule "10: Redact Authors and Addresses in Reference Table if it is a Vertebrate
        section.redact("address", 10, "Redacted because row is a vertebrate study");
        section.highlightCell("Vertebrate study Y/N", 10, "must_redact");
    end
+
+rule "11: Redact sponsor company"
+    when
+        Section(text.toLowerCase().contains("batches produced at"))
+    then
+        section.redactIfPrecededBy("batches produced at", "sponsor", 11, "Redacted because it represents a sponsor company");
+    end
Author	SHA1	Message	Date
Dominique Eiflaender	0f4838e60d	Pull request #49 : RED-373: Fixed multiline annotations view in pdftron Merge in RED/redaction-service from RED-373-2 to master * commit 'a4e012762e1adda234decc1137f221cfd70498d3': RED-373: Fixed multiline annotations view in pdftron	2020-10-01 15:31:25 +02:00
deiflaender	a4e012762e	RED-373: Fixed multiline annotations view in pdftron	2020-10-01 15:19:57 +02:00
Dominique Eiflaender	0c1d8ba33d	Pull request #48 : RED-372: Suffix cross page annotations with -1, -2, etc., to avoid duplicate annotation ids Merge in RED/redaction-service from RED-372 to master * commit 'ecdfd29803e09ac57cc74b19408db54d9a8247a7': RED-372: Suffix cross page annotations with -1, -2, etc., to avoid duplicate annotation ids	2020-10-01 13:01:24 +02:00
deiflaender	ecdfd29803	RED-372: Suffix cross page annotations with -1, -2, etc., to avoid duplicate annotation ids	2020-10-01 12:48:44 +02:00
Dominique Eiflaender	107dbe1910	Pull request #47 : RED-373: Use a single multiline annotation instead of seperate annotations per line for one Entity Merge in RED/redaction-service from RED-373 to master * commit 'dd02296face3c32bf7675301cf9969103e65f52f': Changed formating RED-373: Use a single multiline annotation instead of seperate annotations per line for one Entity	2020-10-01 12:47:58 +02:00
deiflaender	dd02296fac	Changed formating	2020-10-01 11:55:38 +02:00
Thierry Goeckel	589458a112	Pull request #46 : Add rule redacting sponsor companies if preceded by prefix Merge in RED/redaction-service from RED-301 to master * commit '6a8f3665198ec2d7452ed0dac43b9a7d220c8bc5': Remove entries from must_redact dict, add test and refactor rules Add rule redacting sponsor companies if preceded by prefix	2020-10-01 11:44:41 +02:00
deiflaender	ce22121802	RED-373: Use a single multiline annotation instead of seperate annotations per line for one Entity	2020-10-01 11:15:28 +02:00
Thierry Göckel	6a8f366519	Remove entries from must_redact dict, add test and refactor rules	2020-09-30 16:08:56 +02:00
Thierry Göckel	cec5fd3d5e	Add rule redacting sponsor companies if preceded by prefix	2020-09-30 14:13:17 +02:00
Dominique Eiflaender	99bde2956f	Pull request #45 : RED-277: Upgraded to pdfbox 2.0.21 Merge in RED/redaction-service from RED-277 to master * commit 'ecc303e79e82ed698f1c8bdd37dbd521335428bc': RED-277: Upgraded to pdfbox 2.0.21	2020-09-29 16:17:32 +02:00
deiflaender	ecc303e79e	RED-277: Upgraded to pdfbox 2.0.21	2020-09-29 15:18:58 +02:00
Dominique Eiflaender	384cd1d0dc	Pull request #44 : Fix annotating single letter entities Merge in RED/redaction-service from bugfix/single-letter-annotations to master * commit '8e5ff318106e700e28abd14a0eb1337d3a44c109': Fix annotating single letter entities	2020-09-29 15:17:51 +02:00