Marmelator/redaction-service
1
0
Fork 0
Code Issues Pull Requests 14 Actions Packages Projects Releases 622 Wiki Activity

Pull request #451: RED-3974: Fixed special case table header with diffent size of columns in rows

Browse Source 
Merge in RED/redaction-service from RED-3974 to master

* commit 'a9ff46a3fd3363b47799e8dfe5dc99575c36a33b':
  RED-3974: Fixed special case table header with diffent size of columns in rows
This commit is contained in:
Dominique Eiflaender 2022-08-11 17:12:07 +02:00
commit 4f66f5acf7
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/SectionTextBuilderService.java
View File

@ -98,9 +98,11 @@ public class SectionTextBuilderService {
areas.add(sectionArea);
if (!cell.isHeaderCell()) {
String headerName = getHeaderName(hasHeader, cell, table.getRows().get(0).get(cellNum));
sectionArea.setHeader(headerName);
tabularData.put(headerName, new CellValue(cell.getTextBlocks(), startOffset));
String headerName = getHeaderName(hasHeader, cell, table.getRows().get(0), row.size(), cellNum);
if(headerName != null) {
sectionArea.setHeader(headerName);
tabularData.put(headerName, new CellValue(cell.getTextBlocks(), startOffset));
}
}
textBlocks.addAll(cell.getTextBlocks());
@ -155,10 +157,17 @@ public class SectionTextBuilderService {
}
private String getHeaderName(boolean hasHeader, Cell currentCell, Cell cellInFirstRow) {
private String getHeaderName(boolean hasHeader, Cell currentCell, List<Cell> firstRow, int currentRowSize, int cellNum) {
return hasHeader ? buildHeaderName(currentCell.getHeaderCells()
.get(currentCell.getHeaderCells().size() - 1)) : buildHeaderName(cellInFirstRow);
if (hasHeader && !currentCell.getHeaderCells().isEmpty()) {
return buildHeaderName(currentCell.getHeaderCells().get(currentCell.getHeaderCells().size() - 1));
}
if (!hasHeader && currentRowSize == firstRow.size()) {
return buildHeaderName(firstRow.get(cellNum));
}
return null;
}