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

Pull request #32: Remove '-' in headernames

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

* commit '272c7cc2287b146664b8bb277c3731262ac78a19':
  Remove '-' in headernames
This commit is contained in:
Thierry Goeckel 2020-08-24 16:15:44 +02:00
commit 6483e637c6
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/Section.java
View File

@ -37,7 +37,8 @@ public class Section {
public boolean rowEquals(String headerName, String value){ public boolean rowEquals(String headerName, String value){
String cleanHeaderName = headerName.replaceAll("\n", "") String cleanHeaderName = headerName.replaceAll("\n", "")
.replaceAll(" ", ""); .replaceAll(" ", "")
.replaceAll("-", "");
return tabularData != null && tabularData.containsKey(cleanHeaderName) && tabularData.get(cleanHeaderName).getText().equals(value); return tabularData != null && tabularData.containsKey(cleanHeaderName) && tabularData.get(cleanHeaderName).getText().equals(value);
} }
@ -173,7 +174,8 @@ public class Section {
public void highlightCell(String cellHeader, int ruleNumber, String type) { public void highlightCell(String cellHeader, int ruleNumber, String type) {
String cleanHeaderName = cellHeader.replaceAll("\n", "") String cleanHeaderName = cellHeader.replaceAll("\n", "")
.replaceAll(" ", ""); .replaceAll(" ", "")
.replaceAll("-", "");
TextBlock value = tabularData.get(cleanHeaderName); TextBlock value = tabularData.get(cleanHeaderName);
if (value == null) { if (value == null) {

3
redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/EntityRedactionService.java
View File

@ -65,7 +65,8 @@ public class EntityRedactionService {
headerCell.getTextBlocks().forEach(textBlock -> headerBuilder.append(textBlock.getText())); headerCell.getTextBlocks().forEach(textBlock -> headerBuilder.append(textBlock.getText()));
String headerName = headerBuilder.toString() String headerName = headerBuilder.toString()
.replaceAll("\n", "") .replaceAll("\n", "")
.replaceAll(" ", ""); .replaceAll(" ", "")
.replaceAll("-", "");
tabularData.put(headerName, cell.getTextBlocks().get(0)); tabularData.put(headerName, cell.getTextBlocks().get(0));
}); });
for (TextBlock textBlock : cell.getTextBlocks()) { for (TextBlock textBlock : cell.getTextBlocks()) {