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

Merge branch 'RM-76' into 'release/3.222.x'

Browse Source 
RM-76: Ignore excluded page logic in stored redactionLog, always set value in RedactionLogMerge

See merge request redactmanager/redaction-service!221
This commit is contained in:
Dominique Eifländer 2023-12-04 16:40:05 +01:00
commit 237d42fceb
1 changed files with 5 additions and 1 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/service/RedactionLogMergeService.java
View File

@ -109,7 +109,7 @@ public class RedactionLogMergeService {
var skippedImportedRedactions = new HashSet<>();
log.info("Merging Redaction log with manual redactions");
if (manualRedactions != null) {
if (manualRedactions != null) { // This is never null! Could be removed
var manualRedactionLogEntries = addManualAddEntries(sectionGrid,
manualRedactions.getEntriesToAdd(),
@ -136,8 +136,12 @@ public class RedactionLogMergeService {
entry.getPositions().forEach(pos -> {
if (!entry.isLocalManualRedaction() && excludedPages.contains(pos.getPage())) {
entry.setExcluded(true);
} else {
entry.setExcluded(false); // This is a workaround, because in the analysis exlcuded is also set, but should not, because it triggers no reanalyis
}
});
} else {
entry.setExcluded(false); // This is a workaround, because in the analysis exlcuded is also set, but should not, because it triggers no reanalyis
}
}