From f69331e7d838a71ce9e4f28c890b66cc863d674d Mon Sep 17 00:00:00 2001 From: yhampe Date: Tue, 7 Nov 2023 10:21:19 +0100 Subject: [PATCH] *renamed page to firstPage in DocumentStructure and Table --- .../internal/api/data/redaction/DocumentStructure.java | 2 +- .../layoutparser/processor/model/graph/nodes/Table.java | 2 +- .../processor/services/mapper/PropertiesMapper.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/layoutparser-service/layoutparser-service-internal-api/src/main/java/com/knecon/fforesight/service/layoutparser/internal/api/data/redaction/DocumentStructure.java b/layoutparser-service/layoutparser-service-internal-api/src/main/java/com/knecon/fforesight/service/layoutparser/internal/api/data/redaction/DocumentStructure.java index 22aaf7c..7806960 100644 --- a/layoutparser-service/layoutparser-service-internal-api/src/main/java/com/knecon/fforesight/service/layoutparser/internal/api/data/redaction/DocumentStructure.java +++ b/layoutparser-service/layoutparser-service-internal-api/src/main/java/com/knecon/fforesight/service/layoutparser/internal/api/data/redaction/DocumentStructure.java @@ -29,7 +29,7 @@ public class DocumentStructure { @Schema(description = "Object containing the extra field names, a table has in its properties field.") public static class TableProperties { - public static final String PAGE ="page"; + public static final String FIRST_PAGE ="firstPage"; public static final String NUMBER_OF_ROWS = "numberOfRows"; public static final String NUMBER_OF_COLS = "numberOfCols"; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/nodes/Table.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/nodes/Table.java index b08e2b5..d3c2d66 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/nodes/Table.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/nodes/Table.java @@ -34,7 +34,7 @@ public class Table implements SemanticNode { int numberOfRows; int numberOfCols; - int page; + int firstpage; TextBlock textBlock; @Builder.Default diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/mapper/PropertiesMapper.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/mapper/PropertiesMapper.java index d82a257..3bbe832 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/mapper/PropertiesMapper.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/mapper/PropertiesMapper.java @@ -47,7 +47,7 @@ public class PropertiesMapper { Map properties = new HashMap<>(); Page page = table.getFirstPage(); - properties.put(DocumentStructure.TableProperties.PAGE, String.valueOf(page.getNumber())); + properties.put(DocumentStructure.TableProperties.FIRST_PAGE, String.valueOf(page.getNumber())); properties.put(DocumentStructure.TableProperties.NUMBER_OF_ROWS, String.valueOf(table.getNumberOfRows())); properties.put(DocumentStructure.TableProperties.NUMBER_OF_COLS, String.valueOf(table.getNumberOfCols())); return properties; @@ -73,7 +73,7 @@ public class PropertiesMapper { public static void parseTableProperties(Map properties, Table.TableBuilder builder) { - builder.page(Integer.parseInt(properties.get(DocumentStructure.TableProperties.PAGE))); + builder.firstpage(Integer.parseInt(properties.get(DocumentStructure.TableProperties.FIRST_PAGE))); builder.numberOfRows(Integer.parseInt(properties.get(DocumentStructure.TableProperties.NUMBER_OF_ROWS))); builder.numberOfCols(Integer.parseInt(properties.get(DocumentStructure.TableProperties.NUMBER_OF_COLS))); }