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

Pull request #468: RSS-106: Fixed not working redactions over multi pages

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

* commit 'ee5da81299425452171370ab609a0172858c4787':
  RSS-106: Fixed not working redactions over multi pages
This commit is contained in:
Dominique Eiflaender 2022-09-13 08:57:27 +02:00 committed by Philipp Schramm
commit a71a7818c2
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/utils/EntitySearchUtils.java
View File

@ -69,9 +69,26 @@ public class EntitySearchUtils {
List<EntityPositionSequence> positionSequences = text.getSequences(firstEntity.getWord() List<EntityPositionSequence> positionSequences = text.getSequences(firstEntity.getWord()
.trim(), dictionary == null || dictionary.isCaseInsensitiveDictionary(firstEntity.getType()), firstEntity.getTargetSequences()); .trim(), dictionary == null || dictionary.isCaseInsensitiveDictionary(firstEntity.getType()), firstEntity.getTargetSequences());
Map<String, List<EntityPositionSequence>> multipartSequenceParts = new HashMap<>();
Iterator<EntityPositionSequence> itty = positionSequences.iterator();
while (itty.hasNext()){
var positionSequence = itty.next();
if(positionSequence.getId().contains("-")){
multipartSequenceParts.computeIfAbsent(positionSequence.getId().split("-")[0], (x) -> new ArrayList<>()).add(positionSequence);
itty.remove();
}
}
for (int i = 0; i <= orderedEntities.size() - 1; i++) { for (int i = 0; i <= orderedEntities.size() - 1; i++) {
try { try {
orderedEntities.get(i).setPositionSequences(List.of(positionSequences.get(i))); List<EntityPositionSequence> toAdd = new ArrayList<>();
var currentSeq = positionSequences.get(i);
toAdd.add(currentSeq);
if(multipartSequenceParts.containsKey(currentSeq.getId())){
toAdd.addAll(multipartSequenceParts.get(currentSeq.getId()));
}
orderedEntities.get(i).setPositionSequences(toAdd);
} catch (Exception e) { } catch (Exception e) {
log.warn("Mismatch between EntityPositionSequence and found Entity!"); log.warn("Mismatch between EntityPositionSequence and found Entity!");
} }