diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/classification/service/BlockificationService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/classification/service/BlockificationService.java index 1ba8be2f..59012bee 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/classification/service/BlockificationService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/classification/service/BlockificationService.java @@ -29,7 +29,8 @@ public class BlockificationService { static final float THRESHOLD = 1f; - public Page blockify(List textPositions, List horizontalRulingLines, List verticalRulingLines) { + public Page blockify(List textPositions, List horizontalRulingLines, + List verticalRulingLines) { sortRotatedSequences(textPositions); @@ -47,19 +48,15 @@ public class BlockificationService { boolean startFromTop = word.getY1() > maxY + word.getHeight(); boolean splitByX = prev != null && maxX + 50 < word.getX1() && prev.getY1() == word.getY1(); boolean newLineAfterSplit = prev != null && word.getY1() != prev.getY1() && wasSplitted && splitX1 != word.getX1(); - boolean splittedByRuling = isSplittedByRuling(maxX, minY, word.getX1(), word.getY1(), verticalRulingLines) || isSplittedByRuling(minX, - minY, - word.getX1(), - word.getY2(), - horizontalRulingLines) + boolean splittedByRuling = + isSplittedByRuling(maxX, minY, word.getX1(), word.getY1(), verticalRulingLines) || + isSplittedByRuling(minX, minY, word.getX1(), word.getY2(), horizontalRulingLines) - || isSplittedByRuling(maxX, minY, word.getX1(), word.getY1(), horizontalRulingLines) || isSplittedByRuling(minX, - minY, - word.getX1(), - word.getY2(), - verticalRulingLines); + || isSplittedByRuling(maxX, minY, word.getX1(), word.getY1(), horizontalRulingLines) + || isSplittedByRuling(minX, minY, word.getX1(), word.getY2(), verticalRulingLines); + boolean splitByDir = prev != null && !prev.getDir().equals(word.getDir()); - if (prev != null && (lineSeparation || startFromTop || splitByX || newLineAfterSplit || splittedByRuling)) { + if (prev != null && (lineSeparation || startFromTop || splitByX || newLineAfterSplit || splittedByRuling || splitByDir)) { Orientation prevOrientation = null; if (!chunkBlockList1.isEmpty()) { @@ -119,7 +116,8 @@ public class BlockificationService { TextBlock block = (TextBlock) itty.next(); if (previousLeft != null && block.getOrientation().equals(Orientation.LEFT)) { - if (previousLeft.getMinY() > block.getMinY() && block.getMaxY() + block.getMostPopularWordHeight() > previousLeft.getMinY()) { + if (previousLeft.getMinY() > block.getMinY() && block.getMaxY() + block.getMostPopularWordHeight() > previousLeft + .getMinY()) { previousLeft.add(block); itty.remove(); continue; @@ -127,7 +125,8 @@ public class BlockificationService { } if (previousRight != null && block.getOrientation().equals(Orientation.RIGHT)) { - if (previousRight.getMinY() > block.getMinY() && block.getMaxY() + block.getMostPopularWordHeight() > previousRight.getMinY()) { + if (previousRight.getMinY() > block.getMinY() && block.getMaxY() + block.getMostPopularWordHeight() > previousRight + .getMinY()) { previousRight.add(block); itty.remove(); continue; @@ -146,8 +145,10 @@ public class BlockificationService { while (itty.hasNext()) { TextBlock block = (TextBlock) itty.next(); - if (previous != null && previous.getOrientation().equals(Orientation.LEFT) && block.getOrientation().equals(Orientation.LEFT) && equalsWithThreshold(block.getMaxY(), - previous.getMaxY()) || previous != null && previous.getOrientation().equals(Orientation.LEFT) && block.getOrientation() + if (previous != null && previous.getOrientation().equals(Orientation.LEFT) && block.getOrientation() + .equals(Orientation.LEFT) && equalsWithThreshold(block.getMaxY(), previous.getMaxY()) || previous != null && previous + .getOrientation() + .equals(Orientation.LEFT) && block.getOrientation() .equals(Orientation.RIGHT) && equalsWithThreshold(block.getMaxY(), previous.getMaxY())) { previous.add(block); itty.remove(); @@ -186,10 +187,12 @@ public class BlockificationService { styleFrequencyCounter.add(wordBlock.getFontStyle()); if (textBlock == null) { - textBlock = new TextBlock(wordBlock.getX1(), wordBlock.getX2(), wordBlock.getY1(), wordBlock.getY2(), wordBlockList, wordBlock.getRotation()); + textBlock = new TextBlock(wordBlock.getX1(), wordBlock.getX2(), wordBlock.getY1(), wordBlock.getY2(), wordBlockList, wordBlock + .getRotation()); } else { TextBlock spatialEntity = textBlock.union(wordBlock); - textBlock.resize(spatialEntity.getMinX(), spatialEntity.getMinY(), spatialEntity.getWidth(), spatialEntity.getHeight()); + textBlock.resize(spatialEntity.getMinX(), spatialEntity.getMinY(), spatialEntity.getWidth(), spatialEntity + .getHeight()); } } @@ -202,14 +205,19 @@ public class BlockificationService { textBlock.setHighestFontSize(fontSizeFrequencyCounter.getHighest()); } - if (textBlock != null && textBlock.getSequences() != null && textBlock.getSequences().stream().map(t -> round(t.getY1(), 3)).collect(toSet()).size() == 1) { + if (textBlock != null && textBlock.getSequences() != null && textBlock.getSequences() + .stream() + .map(t -> round(t.getY1(), 3)) + .collect(toSet()) + .size() == 1) { textBlock.getSequences().sort(Comparator.comparing(TextPositionSequence::getX1)); } return textBlock; } - private boolean isSplittedByRuling(float previousX2, float previousY1, float currentX1, float currentY1, List rulingLines) { + private boolean isSplittedByRuling(float previousX2, float previousY1, float currentX1, float currentY1, + List rulingLines) { for (Ruling ruling : rulingLines) { if (ruling.intersectsLine(previousX2, previousY1, currentX1, currentY1)) { @@ -220,7 +228,8 @@ public class BlockificationService { } - public Rectangle calculateBodyTextFrame(List pages, FloatFrequencyCounter documentFontSizeCounter, boolean landscape) { + public Rectangle calculateBodyTextFrame(List pages, FloatFrequencyCounter documentFontSizeCounter, + boolean landscape) { float minX = 10000; float maxX = -100; diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/parsing/model/TextPositionSequence.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/parsing/model/TextPositionSequence.java index 0bfc219f..a007385e 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/parsing/model/TextPositionSequence.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/parsing/model/TextPositionSequence.java @@ -147,29 +147,6 @@ public class TextPositionSequence implements CharSequence { } - @JsonIgnore - @JsonAttribute(ignore = true) - public float getX1() { - - if (rotation == 90) { - return textPositions.get(0).getYDirAdj() - getTextHeight(); - } else { - return textPositions.get(0).getXDirAdj(); - } - } - - - @JsonIgnore - @JsonAttribute(ignore = true) - public float getX2() { - - if (rotation == 90) { - return textPositions.get(0).getYDirAdj(); - } else { - return textPositions.get(textPositions.size() - 1).getXDirAdj() + textPositions.get(textPositions.size() - 1).getWidthDirAdj() + HEIGHT_PADDING; - } - } - @JsonIgnore @JsonAttribute(ignore = true) @@ -179,13 +156,72 @@ public class TextPositionSequence implements CharSequence { } + @JsonIgnore + @JsonAttribute(ignore = true) + public float getX1() { + + if (getDir().getDegrees() == 90) { + return textPositions.get(0).getYDirAdj() - getTextHeight(); + } + else if (getDir().getDegrees() == 180) { + return pageWidth - textPositions.get(textPositions.size() - 1).getXDirAdj() - textPositions.get(textPositions.size() - 1).getWidthDirAdj() - HEIGHT_PADDING; + + } + else if (getDir().getDegrees() == 270) { + + return pageWidth - textPositions.get(0).getYDirAdj() ; + } + else { + return textPositions.get(0).getXDirAdj(); + } + } + + + @JsonIgnore + @JsonAttribute(ignore = true) + public float getX2() { + + if (getDir().getDegrees() == 90) { + return textPositions.get(0).getYDirAdj(); + } + + else if (getDir().getDegrees() == 180) { + return pageWidth - textPositions.get(0).getXDirAdj() ; + } + + else if (getDir().getDegrees() == 270) { + return pageWidth - textPositions.get(0).getYDirAdj() + getTextHeight(); + + } + + else { + return textPositions.get(textPositions.size() - 1).getXDirAdj() + textPositions.get(textPositions.size() - 1).getWidthDirAdj() + HEIGHT_PADDING; + } + } + + + + + @JsonIgnore @JsonAttribute(ignore = true) public float getY1() { - if (rotation == 90) { + if (getDir().getDegrees() == 90 ) { return textPositions.get(0).getXDirAdj(); - } else { + } + + else if (getDir().getDegrees() == 180) { + return textPositions.get(0).getYDirAdj() - getTextHeight(); + + } + + + else if (getDir().getDegrees() == 270) { + return pageHeight - textPositions.get(textPositions.size() - 1).getXDirAdj() - getTextHeight() + HEIGHT_PADDING; + + } + else { return pageHeight - textPositions.get(0).getYDirAdj(); } } @@ -195,14 +231,26 @@ public class TextPositionSequence implements CharSequence { @JsonAttribute(ignore = true) public float getY2() { - if (rotation == 90) { + if (getDir().getDegrees() == 90) { return textPositions.get(textPositions.size() - 1).getXDirAdj() + getTextHeight() - HEIGHT_PADDING; - } else { + } + + else if (getDir().getDegrees() == 180 ) { + + return textPositions.get(0).getYDirAdj(); + } + + else if (getDir().getDegrees() == 270 ) { + return pageHeight - textPositions.get(0).getXDirAdj(); + } + + else { return pageHeight - textPositions.get(0).getYDirAdj() + getTextHeight(); } } + @JsonIgnore @JsonAttribute(ignore = true) public float getTextHeight() { diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/visualization/service/PdfVisualisationService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/visualization/service/PdfVisualisationService.java index 3d56bbae..460e17a2 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/visualization/service/PdfVisualisationService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/visualization/service/PdfVisualisationService.java @@ -101,11 +101,27 @@ public class PdfVisualisationService { contentStream.beginText(); contentStream.setNonStrokingColor(Color.BLUE); - contentStream.setFont(PDType1Font.TIMES_ROMAN, 12f); + contentStream.setFont(PDType1Font.TIMES_ROMAN, 2f); + contentStream.newLineAtOffset(textBlock.getMinX(), textBlock.getMaxY() + 10); + contentStream.showText(textBlock.getClassification() + textBlock.getOrientation() + "-->" + textBlock.getSequences().get(0).getDir()); + contentStream.endText(); + contentStream.beginText(); + contentStream.newLineAtOffset(textBlock.getMinX(), textBlock.getMinY()); + contentStream.showText("MinX,MinY"); + contentStream.endText(); + contentStream.beginText(); + contentStream.newLineAtOffset(textBlock.getMaxX(), textBlock.getMinY()); + contentStream.showText("MaxX,MinY"); + contentStream.endText(); + contentStream.beginText(); contentStream.newLineAtOffset(textBlock.getMinX(), textBlock.getMaxY()); + contentStream.showText("MinX,MaxY"); + contentStream.endText(); + contentStream.beginText(); + contentStream.newLineAtOffset(textBlock.getMaxX(), textBlock.getMaxY()); + contentStream.showText("MaxX,MaxY"); - contentStream.showText(textBlock.getClassification() + textBlock.getOrientation()); contentStream.endText(); } diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java index 9396f82a..5a15bc95 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java +++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java @@ -1098,7 +1098,7 @@ public class RedactionIntegrationTest { System.out.println("classificationTest"); - AnalyzeRequest request = prepareStorage("files/Metolachlor/S-Metolachlor_RAR_01_Volume_1_2018-09-06.pdf"); + AnalyzeRequest request = prepareStorage("files/new/RotateTestFile.pdf"); RedactionRequest redactionRequest = RedactionRequest.builder() .dossierId(request.getDossierId()) diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/01 - CGA100251 - Acute Oral Toxicity (Up and Down Procedure) - Rat (1).pdf b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/01 - CGA100251 - Acute Oral Toxicity (Up and Down Procedure) - Rat (1).pdf index 243b10c8..16b2652f 100644 Binary files a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/01 - CGA100251 - Acute Oral Toxicity (Up and Down Procedure) - Rat (1).pdf and b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/01 - CGA100251 - Acute Oral Toxicity (Up and Down Procedure) - Rat (1).pdf differ diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/02 - A22833B - Acute Oral (Up and Down) - Final Report.pdf b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/02 - A22833B - Acute Oral (Up and Down) - Final Report1.pdf similarity index 57% rename from redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/02 - A22833B - Acute Oral (Up and Down) - Final Report.pdf rename to redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/02 - A22833B - Acute Oral (Up and Down) - Final Report1.pdf index 707a7d43..fc9a3581 100644 Binary files a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/02 - A22833B - Acute Oral (Up and Down) - Final Report.pdf and b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/02 - A22833B - Acute Oral (Up and Down) - Final Report1.pdf differ diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/03 - Acute Oral Toxicity Up and Down Procedur.pdf b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/03 - Acute Oral Toxicity Up and Down Procedur.pdf index c379a2c2..ec5b453c 100644 Binary files a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/03 - Acute Oral Toxicity Up and Down Procedur.pdf and b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/03 - Acute Oral Toxicity Up and Down Procedur.pdf differ diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/04 - CGA80154 - Acute Oral Toxicity (Up and Down Procedure) - Rat (1).pdf b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/04 - CGA80154 - Acute Oral Toxicity (Up and Down Procedure) - Rat (1).pdf index 84fb9dd6..f1d5a801 100644 Binary files a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/04 - CGA80154 - Acute Oral Toxicity (Up and Down Procedure) - Rat (1).pdf and b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/04 - CGA80154 - Acute Oral Toxicity (Up and Down Procedure) - Rat (1).pdf differ diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/05 - CGA80154 Acute Oral Toxicity (Up and Down Procedure) - Rat (2).pdf b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/05 - CGA80154 Acute Oral Toxicity (Up and Down Procedure) - Rat (2).pdf index 84fb9dd6..f1d5a801 100644 Binary files a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/05 - CGA80154 Acute Oral Toxicity (Up and Down Procedure) - Rat (2).pdf and b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/05 - CGA80154 Acute Oral Toxicity (Up and Down Procedure) - Rat (2).pdf differ diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/06 - Isopyrazam - Acute Oral Toxicity Rat.pdf b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/06 - Isopyrazam - Acute Oral Toxicity Rat.pdf index 1426f5d3..3e890cb1 100644 Binary files a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/06 - Isopyrazam - Acute Oral Toxicity Rat.pdf and b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/06 - Isopyrazam - Acute Oral Toxicity Rat.pdf differ diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/07 - Acute Oral Toxicity in the Rat- Up and D.pdf b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/07 - Acute Oral Toxicity in the Rat- Up and D.pdf index 08304c5e..2caf5318 100644 Binary files a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/07 - Acute Oral Toxicity in the Rat- Up and D.pdf and b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/07 - Acute Oral Toxicity in the Rat- Up and D.pdf differ diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/08 - Acute Oral Toxicity Up and Down Procedur.pdf b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/08 - Acute Oral Toxicity Up and Down Procedur.pdf index c286235b..5108c818 100644 Binary files a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/08 - Acute Oral Toxicity Up and Down Procedur.pdf and b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/08 - Acute Oral Toxicity Up and Down Procedur.pdf differ diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/09 - CGA100251 - Acute Oral Toxicity (Up and Down Procedure) - Rat.pdf b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/09 - CGA100251 - Acute Oral Toxicity (Up and Down Procedure) - Rat.pdf index 243b10c8..16b2652f 100644 Binary files a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/09 - CGA100251 - Acute Oral Toxicity (Up and Down Procedure) - Rat.pdf and b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/09 - CGA100251 - Acute Oral Toxicity (Up and Down Procedure) - Rat.pdf differ diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/10 - Cyper TC - Acute Oral Toxicity Up and Do.pdf b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/10 - Cyper TC - Acute Oral Toxicity Up and Do.pdf index a722f310..7df5423f 100644 Binary files a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/10 - Cyper TC - Acute Oral Toxicity Up and Do.pdf and b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/10 - Cyper TC - Acute Oral Toxicity Up and Do.pdf differ diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/11 - Glyphosate Technical - Acute Oral Toxicity Study in the Rat (Up and Down Procedure) (1).pdf b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/11 - Glyphosate Technical - Acute Oral Toxicity Study in the Rat (Up and Down Procedure) (1).pdf index c5317f9e..79830e42 100644 Binary files a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/11 - Glyphosate Technical - Acute Oral Toxicity Study in the Rat (Up and Down Procedure) (1).pdf and b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/11 - Glyphosate Technical - Acute Oral Toxicity Study in the Rat (Up and Down Procedure) (1).pdf differ diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/12 - Glyphosate Technical - Acute Oral Toxicity Study in the Rat (Up and Down Procedure) (2).pdf b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/12 - Glyphosate Technical - Acute Oral Toxicity Study in the Rat (Up and Down Procedure) (2).pdf index c5317f9e..79830e42 100644 Binary files a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/12 - Glyphosate Technical - Acute Oral Toxicity Study in the Rat (Up and Down Procedure) (2).pdf and b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/12 - Glyphosate Technical - Acute Oral Toxicity Study in the Rat (Up and Down Procedure) (2).pdf differ diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/13 - Glyphosate Technical - Acute Oral Toxicity Study in the Rat (Up and Down Procedure).pdf b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/13 - Glyphosate Technical - Acute Oral Toxicity Study in the Rat (Up and Down Procedure).pdf index c5317f9e..79830e42 100644 Binary files a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/13 - Glyphosate Technical - Acute Oral Toxicity Study in the Rat (Up and Down Procedure).pdf and b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/13 - Glyphosate Technical - Acute Oral Toxicity Study in the Rat (Up and Down Procedure).pdf differ diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/14 - Paclobutrazol - Acute Oral Up-and-Down Procedure Rats.pdf b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/14 - Paclobutrazol - Acute Oral Up-and-Down Procedure Rats.pdf index 9453789d..b38f3f93 100644 Binary files a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/14 - Paclobutrazol - Acute Oral Up-and-Down Procedure Rats.pdf and b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/14 - Paclobutrazol - Acute Oral Up-and-Down Procedure Rats.pdf differ diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/15 - Pretilachlor - Acute Oral Toxicity (Up and Down Procedure) - Rat.pdf b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/15 - Pretilachlor - Acute Oral Toxicity (Up and Down Procedure) - Rat.pdf index 6eba225e..2abbb072 100644 Binary files a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/15 - Pretilachlor - Acute Oral Toxicity (Up and Down Procedure) - Rat.pdf and b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/15 - Pretilachlor - Acute Oral Toxicity (Up and Down Procedure) - Rat.pdf differ diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/16 - Prevail FT - Acute Oral Toxicity Up and.pdf b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/16 - Prevail FT - Acute Oral Toxicity Up and.pdf index 87d8cec7..90c98f64 100644 Binary files a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/16 - Prevail FT - Acute Oral Toxicity Up and.pdf and b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/16 - Prevail FT - Acute Oral Toxicity Up and.pdf differ diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/17 - R61837 - OECD summary - Acute oral toxicity study in the rat (up and down procedure) (1).pdf b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/17 - R61837 - OECD summary - Acute oral toxicity study in the rat (up and down procedure) (1).pdf index 8f1c2d68..66000b56 100644 Binary files a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/17 - R61837 - OECD summary - Acute oral toxicity study in the rat (up and down procedure) (1).pdf and b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/17 - R61837 - OECD summary - Acute oral toxicity study in the rat (up and down procedure) (1).pdf differ diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/18 - SYN520453 - OECD summary - Acute Oral Toxicity Study in Rats - Up-and-Down-Procedure.pdf b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/18 - SYN520453 - OECD summary - Acute Oral Toxicity Study in Rats - Up-and-Down-Procedure.pdf index 6f40acf0..15f9548f 100644 Binary files a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/18 - SYN520453 - OECD summary - Acute Oral Toxicity Study in Rats - Up-and-Down-Procedure.pdf and b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/18 - SYN520453 - OECD summary - Acute Oral Toxicity Study in Rats - Up-and-Down-Procedure.pdf differ diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/19 - SYN545192 - Acute Oral Toxicity Study in the Rat (Up and Down Procedure).pdf b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/19 - SYN545192 - Acute Oral Toxicity Study in the Rat (Up and Down Procedure).pdf index 7dc98d53..d1f983c2 100644 Binary files a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/19 - SYN545192 - Acute Oral Toxicity Study in the Rat (Up and Down Procedure).pdf and b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/19 - SYN545192 - Acute Oral Toxicity Study in the Rat (Up and Down Procedure).pdf differ diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/20 - SYN550004 - Acute Oral Toxicity (Up & Down Procedure) - Rats.pdf b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/20 - SYN550004 - Acute Oral Toxicity (Up & Down Procedure) - Rats.pdf index 919d4966..1512bbbd 100644 Binary files a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/20 - SYN550004 - Acute Oral Toxicity (Up & Down Procedure) - Rats.pdf and b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/20 - SYN550004 - Acute Oral Toxicity (Up & Down Procedure) - Rats.pdf differ diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/21 - CA6572 - Acute Oral Toxicity - Rats.pdf b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/21 - CA6572 - Acute Oral Toxicity - Rats.pdf index 86317ea9..84051f3f 100644 Binary files a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/21 - CA6572 - Acute Oral Toxicity - Rats.pdf and b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/21 - CA6572 - Acute Oral Toxicity - Rats.pdf differ diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/22 - SYN550023 - Acute Oral - Rat.pdf b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/22 - SYN550023 - Acute Oral - Rat.pdf index 7826b7ca..1957fd98 100644 Binary files a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/22 - SYN550023 - Acute Oral - Rat.pdf and b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/22 - SYN550023 - Acute Oral - Rat.pdf differ diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/23 - SYN549888 - Acute Oral Toxicity - Rats.pdf b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/23 - SYN549888 - Acute Oral Toxicity - Rats.pdf index d696e4b3..be0e9e36 100644 Binary files a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/23 - SYN549888 - Acute Oral Toxicity - Rats.pdf and b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/23 - SYN549888 - Acute Oral Toxicity - Rats.pdf differ diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/24 - SYN549522 - Acute Oral Toxicity - Rats.pdf b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/24 - SYN549522 - Acute Oral Toxicity - Rats.pdf index e0567199..de55e7fb 100644 Binary files a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/24 - SYN549522 - Acute Oral Toxicity - Rats.pdf and b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/24 - SYN549522 - Acute Oral Toxicity - Rats.pdf differ diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/25 - SYN546412 - Acute Oral Toxicity - Rats.pdf b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/25 - SYN546412 - Acute Oral Toxicity - Rats.pdf index 8ed5237c..62ae9d78 100644 Binary files a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/25 - SYN546412 - Acute Oral Toxicity - Rats.pdf and b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/25 - SYN546412 - Acute Oral Toxicity - Rats.pdf differ diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/26 - Sedaxane - Acute Oral Toxicity - Rat.pdf b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/26 - Sedaxane - Acute Oral Toxicity - Rat.pdf index f3c89232..257b61a5 100644 Binary files a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/26 - Sedaxane - Acute Oral Toxicity - Rat.pdf and b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/26 - Sedaxane - Acute Oral Toxicity - Rat.pdf differ diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/27 - Profenofos Technical - Acute Oral Toxici.pdf b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/27 - Profenofos Technical - Acute Oral Toxici.pdf index 7d580f1c..cc7cc2a4 100644 Binary files a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/27 - Profenofos Technical - Acute Oral Toxici.pdf and b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/27 - Profenofos Technical - Acute Oral Toxici.pdf differ diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/28 - Emamectin Technical - Acute Oral Toxicity - Rats.pdf b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/28 - Emamectin Technical - Acute Oral Toxicity - Rats.pdf index ee1dba97..f16f7f8c 100644 Binary files a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/28 - Emamectin Technical - Acute Oral Toxicity - Rats.pdf and b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/28 - Emamectin Technical - Acute Oral Toxicity - Rats.pdf differ diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/29 - Abamectin Technical (MK936C) - Acute Ora.pdf b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/29 - Abamectin Technical (MK936C) - Acute Ora.pdf index 3810f5ba..60929fbe 100644 Binary files a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/29 - Abamectin Technical (MK936C) - Acute Ora.pdf and b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/29 - Abamectin Technical (MK936C) - Acute Ora.pdf differ diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/30 - Dicamba - Acute Oral Toxicity - Rats.pdf b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/30 - Dicamba - Acute Oral Toxicity - Rats.pdf index 9f674b35..b93112f3 100644 Binary files a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/30 - Dicamba - Acute Oral Toxicity - Rats.pdf and b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/30 - Dicamba - Acute Oral Toxicity - Rats.pdf differ diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/31 - CA6375 - Acute Oral Toxicity - Rats.pdf b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/31 - CA6375 - Acute Oral Toxicity - Rats.pdf index 4e578a11..f47d97d9 100644 Binary files a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/31 - CA6375 - Acute Oral Toxicity - Rats.pdf and b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/31 - CA6375 - Acute Oral Toxicity - Rats.pdf differ diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/32 - Emamectin Benzoate Technical - Acute Oral Toxicity - Mouse.pdf b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/32 - Emamectin Benzoate Technical - Acute Oral Toxicity - Mouse.pdf index 29ee151e..886c8a7a 100644 Binary files a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/32 - Emamectin Benzoate Technical - Acute Oral Toxicity - Mouse.pdf and b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/RSS/32 - Emamectin Benzoate Technical - Acute Oral Toxicity - Mouse.pdf differ