Merge branch 'RED-8006' into 'master'

Resolve RED-8006

Closes RED-8006

See merge request redactmanager/redaction-service!219

.gitlab-ci.yml

@@ -12,7 +12,7 @@ deploy:
   script:
     - echo "Building with gradle version ${BUILDVERSION}"
     - gradle -Pversion=${BUILDVERSION} publish
-    - gradle bootBuildImage --cleanCache --publishImage -PbuildbootDockerHostNetwork=true -Pversion=${BUILDVERSION}
+    - gradle bootBuildImage --publishImage -PbuildbootDockerHostNetwork=true -Pversion=${BUILDVERSION}
     - echo "BUILDVERSION=$BUILDVERSION" >> version.env
   artifacts:
     reports:

redaction-service-v1/redaction-service-api-v1/build.gradle.kts

@@ -7,7 +7,7 @@ description = "redaction-service-api-v1"
 
 dependencies {
     implementation("org.springframework:spring-web:6.0.12")
-    implementation("com.iqser.red.service:persistence-service-internal-api-v1:2.207.0")
+    implementation("com.iqser.red.service:persistence-service-internal-api-v1:2.240.0")
 }
 
 publishing {

redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/UnprocessedManualEntity.java

@@ -25,6 +25,7 @@ public class UnprocessedManualEntity {
     private int endOffset;
     private String closestHeadline;
     private String section;
+    private String legalBasis;
     private float[] color;
     private List<Integer> containingNodeId;
     @Builder.Default

redaction-service-v1/redaction-service-server-v1/build.gradle.kts

@@ -12,11 +12,11 @@ plugins {
 description = "redaction-service-server-v1"
 
 
-val layoutParserVersion = "0.74.0"
+val layoutParserVersion = "0.75.0"
 val jacksonVersion = "2.15.2"
 val droolsVersion = "9.44.0.Final"
 val pdfBoxVersion = "3.0.0"
-val persistenceServiceVersion = "2.231.0"
+val persistenceServiceVersion = "2.242.0"
 
 configurations {
     all {
@@ -51,6 +51,7 @@ dependencies {
     implementation("org.springframework.cloud:spring-cloud-starter-openfeign:4.0.4")
     implementation("org.springframework.boot:spring-boot-starter-amqp:3.1.4")
 
+    testImplementation(project(":rules-management"))
     testImplementation("org.apache.pdfbox:pdfbox:${pdfBoxVersion}")
     testImplementation("org.apache.pdfbox:pdfbox-tools:${pdfBoxVersion}")
 
@@ -75,7 +76,7 @@ tasks.named<BootBuildImage>("bootBuildImage") {
     environment.put("BPE_DELIM_JAVA_TOOL_OPTIONS", " ")
     environment.put("BPE_APPEND_JAVA_TOOL_OPTIONS", "-Dfile.encoding=UTF-8")
 
-    imageName.set("nexus.knecon.com:5001/red/${project.name}:${project.version}")
+    imageName.set("nexus.knecon.com:5001/red/${project.name}")// must build image with same name always, otherwise the builder will not know which image to use as cache. DO NOT CHANGE!
     if (project.hasProperty("buildbootDockerHostNetwork")) {
         network.set("host")
     }
@@ -91,5 +92,8 @@ tasks.named<BootBuildImage>("bootBuildImage") {
             email.set(providers.gradleProperty("mavenEmail").getOrNull())
             url.set("https://nexus.knecon.com:5001/")
         }
+
+        val dockerTag = "nexus.knecon.com:5001/red/${project.name}:${project.version}"
+        tags.set(listOf(dockerTag))
     }
 }

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/ManualEntity.java

@@ -56,7 +56,8 @@ public class ManualEntity implements IEntity {
                 .reason(manualRedactionEntry.getReason())
                 .legalBasis(manualRedactionEntry.getLegalBasis())
                 .type(manualRedactionEntry.getType())
-                .section(manualRedactionEntry.getSection()).entityType(hint ? EntityType.HINT : EntityType.ENTITY)
+                .section(manualRedactionEntry.getSection())
+                .entityType(hint ? EntityType.HINT : EntityType.ENTITY)
                 .applied(true)
                 .isDictionaryEntry(false)
                 .isDossierDictionaryEntry(false)

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/MigrationEntity.java

@@ -159,7 +159,7 @@ public final class MigrationEntity {
         entityLogEntry.setColor(redactionLogEntry.getColor());
         entityLogEntry.setReference(migrateSetOfIds(redactionLogEntry.getReference(), oldToNewIdMapping));
         entityLogEntry.setImportedRedactionIntersections(migrateSetOfIds(redactionLogEntry.getImportedRedactionIntersections(), oldToNewIdMapping));
-        entityLogEntry.setEngines(redactionLogEntry.getEngines().stream().map(this::toEntityLogEngine).collect(Collectors.toSet()));
+        entityLogEntry.setEngines(getMigratedEngines(redactionLogEntry));
         if (redactionLogEntry.getLegalBasis() != null) {
             entityLogEntry.setLegalBasis(redactionLogEntry.getLegalBasis());
         }
@@ -168,6 +168,15 @@ public final class MigrationEntity {
     }
 
 
+    private static Set<com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.Engine> getMigratedEngines(RedactionLogEntry entry) {
+
+        if (entry.getEngines() == null) {
+            return Collections.emptySet();
+        }
+        return entry.getEngines().stream().map(MigrationEntity::toEntityLogEngine).collect(Collectors.toSet());
+    }
+
+
     private Set<String> migrateSetOfIds(Set<String> ids, Map<String, String> oldToNewIdMapping) {
 
         if (ids == null) {
@@ -177,7 +186,7 @@ public final class MigrationEntity {
     }
 
 
-    private com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.Engine toEntityLogEngine(Engine engine) {
+    private static com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.Engine toEntityLogEngine(Engine engine) {
 
         return switch (engine) {
             case DICTIONARY -> com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.Engine.DICTIONARY;
@@ -203,7 +212,8 @@ public final class MigrationEntity {
                 .closestHeadline(image.getHeadline().getTextBlock().getSearchText())
                 .section(image.getManualOverwrite().getSection().orElse(image.getParent().toString()))
                 .imageHasTransparency(image.isTransparent())
-                .state(buildEntryState(image)).entryType(redactionLogEntry.isHint() ? EntryType.IMAGE_HINT : EntryType.IMAGE)
+                .state(buildEntryState(image))
+                .entryType(redactionLogEntry.isHint() ? EntryType.IMAGE_HINT : EntryType.IMAGE)
                 .build();
 
     }

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/component/Entity.java

@@ -80,7 +80,9 @@ public class Entity {
                 .legalBasis(e.getLegalBasis())
                 .imported(e.isImported())
                 .section(e.getSection())
-                .color(e.getColor()).positions(e.getPositions()).containingNode(document.getDocumentTree().getEntryById(e.getContainingNodeId()).getNode())
+                .color(e.getColor())
+                .positions(e.getPositions())
+                .containingNode(document.getDocumentTree().getEntryById(e.getContainingNodeId()).getNode())
                 .textBefore(e.getTextBefore())
                 .textAfter(e.getTextAfter())
                 .startOffset(e.getStartOffset())

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/dictionary/Dictionary.java

@@ -2,23 +2,23 @@ package com.iqser.red.service.redaction.v1.server.model.dictionary;
 
 import static java.lang.String.format;
 
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import org.apache.commons.lang3.StringUtils;
 
-import com.iqser.red.service.redaction.v1.server.utils.exception.NotFoundException;
 import com.iqser.red.service.redaction.v1.server.model.document.entity.MatchedRule;
 import com.iqser.red.service.redaction.v1.server.model.document.entity.TextEntity;
 import com.iqser.red.service.redaction.v1.server.utils.Patterns;
+import com.iqser.red.service.redaction.v1.server.utils.exception.NotFoundException;
 
 import lombok.Data;
 import lombok.Getter;
@@ -107,11 +107,21 @@ public class Dictionary {
         if (StringUtils.isEmpty(value)) {
             throw new IllegalArgumentException(format("%s is not a valid dictionary entry", value));
         }
+        boolean isCaseInsensitive = localAccessMap.get(type).isCaseInsensitive();
         Set<MatchedRule> matchedRulesSet = new HashSet<>(matchedRules);
-        localAccessMap.get(type).getLocalEntriesWithMatchedRules().merge(value.trim(), matchedRulesSet, (set1, set2) -> Stream.concat(set1.stream(), set2.stream()).collect(Collectors.toSet()));
+
+        String cleanedValue = value;
+        if (isCaseInsensitive) {
+            cleanedValue = cleanedValue.toLowerCase(Locale.US);
+        }
+        localAccessMap.get(type)
+                .getLocalEntriesWithMatchedRules()
+                .merge(cleanedValue.trim(), matchedRulesSet, (set1, set2) -> Stream.concat(set1.stream(), set2.stream()).collect(Collectors.toSet()));
         if (alsoAddLastname) {
-            String lastname = value.split(" ")[0];
-            localAccessMap.get(type).getLocalEntriesWithMatchedRules().merge(lastname, matchedRulesSet, (set1, set2) -> Stream.concat(set1.stream(), set2.stream()).collect(Collectors.toSet()));
+            String lastname = cleanedValue.split(" ")[0];
+            localAccessMap.get(type)
+                    .getLocalEntriesWithMatchedRules()
+                    .merge(lastname, matchedRulesSet, (set1, set2) -> Stream.concat(set1.stream(), set2.stream()).collect(Collectors.toSet()));
         }
     }
 
@@ -130,16 +140,20 @@ public class Dictionary {
 
     public void addMultipleAuthorsAsRecommendation(TextEntity textEntity) {
 
-        String cleanedWord = textEntity.getValue().replaceAll(",", " ").replaceAll("  ", " ").trim() + " ";
-        Pattern pattern = Patterns.AUTHOR_TABLE_SPLITTER;
-        Matcher matcher = pattern.matcher(cleanedWord);
+        splitIntoAuthorNames(textEntity).forEach(authorName -> addLocalDictionaryEntry(textEntity.getType(), authorName, textEntity.getMatchedRuleList(), true));
 
-        while (matcher.find()) {
-            String match = matcher.group().trim();
-            if (match.length() >= 3) {
-                addLocalDictionaryEntry(textEntity.getType(), match, textEntity.getMatchedRuleList(), true);
-            }
+    }
+
+
+    public static List<String> splitIntoAuthorNames(TextEntity textEntity) {
+
+        List<String> splitAuthorNames;
+        if (textEntity.getValue().contains(",")) {
+            splitAuthorNames = Arrays.asList(textEntity.getValue().split(","));
+        } else {
+            splitAuthorNames = Arrays.asList(textEntity.getValueWithLineBreaks().split("\n"));
         }
+        return splitAuthorNames.stream().map(String::trim).filter(authorName -> Patterns.AUTHOR_NAME_PATTERN.matcher(authorName).matches()).toList();
     }
 
 }

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/dictionary/DictionaryModel.java

@@ -2,6 +2,8 @@ package com.iqser.red.service.redaction.v1.server.model.dictionary;
 
 import java.io.Serializable;
 import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -109,4 +111,11 @@ public class DictionaryModel implements Serializable {
         return falseRecommendationsSearch;
     }
 
+    public Set<MatchedRule> getMatchedRulesForLocalDictionaryEntry(String value) {
+        var cleanedValue = isCaseInsensitive() ? value.toLowerCase(Locale.US) : value;
+
+        return localEntriesWithMatchedRules.get(cleanedValue);
+
+    }
+
 }

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/entity/ManualChangeOverwrite.java

@@ -7,6 +7,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
+import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.ManualRedactions;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.BaseAnnotation;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.IdRemoval;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualForceRedaction;
@@ -82,7 +83,18 @@ public class ManualChangeOverwrite {
 
             if (manualChange instanceof IdRemoval) {
                 applied = false;
-                ignored = true;
+                if (sortedManualChanges.get(0) instanceof ManualRedactionEntry) { // set to removed if it's a Manual Redaction
+                    removed = true;
+                } else {
+                    ignored = true;
+                }
+            }
+
+            if(manualChange instanceof ManualRedactionEntry manualRedactionEntry){
+                removed = false;
+                ignored = false;
+                applied = true;
+                legalBasis = manualRedactionEntry.getLegalBasis();
             }
 
             if (manualChange instanceof ManualForceRedaction manualForceRedaction) {

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/entity/MatchedRule.java

@@ -31,11 +31,11 @@ public final class MatchedRule implements Comparable<MatchedRule> {
     String reason = "";
     @Builder.Default
     String legalBasis = "";
-    boolean applied;
     boolean writeValueWithLineBreaks;
+    boolean applied;
     boolean removed;
     boolean ignored;
-    boolean resized;
+
     @Builder.Default
     Set<TextEntity> references = Collections.emptySet();
 
@@ -46,6 +46,20 @@ public final class MatchedRule implements Comparable<MatchedRule> {
     }
 
 
+    public MatchedRule asSkippedIfApplied() {
+
+        if (!this.isApplied()) {
+            return this;
+        }
+        return MatchedRule.builder().ruleIdentifier(getRuleIdentifier())
+                .writeValueWithLineBreaks(this.isWriteValueWithLineBreaks())
+                .legalBasis(this.getLegalBasis())
+                .reason(this.getReason())
+                .references(this.getReferences())
+                .build();
+    }
+
+
     @Override
     public int compareTo(MatchedRule matchedRule) {
 

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/nodes/SemanticNode.java

@@ -86,6 +86,12 @@ public interface SemanticNode {
     }
 
 
+    /**
+     * Checks if the given page number exists in the list of pages.
+     *
+     * @param pageNumber the page number to be checked
+     * @return true if the page number exists, otherwise false
+     */
     default boolean onPage(int pageNumber) {
 
         return getPages().stream().anyMatch(page -> page.getNumber() == pageNumber);

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/nodes/Table.java

@@ -172,6 +172,18 @@ public class Table implements SemanticNode {
         return streamChildrenOfType(NodeType.TABLE_CELL).map(node -> (TableCell) node);
     }
 
+    /**
+     * Streams all TableCells that contain at least one entity of a given type in this Table row-wise.
+     *
+     * @param type The type of the entity
+     * @return Stream of filtered TableCells
+     */
+    public Stream<TableCell> streamTableCellsWhichContainType(String type) {
+
+        return streamTableCells()
+                .filter(tableCell -> tableCell.getEntities().stream().filter(TextEntity::active).anyMatch(entity -> entity.getType().equals(type)));
+    }
+
 
     /**
      * Streams all TableCells in this Table which have the provided header row-wise.

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/drools/BasicRule.java

@@ -1,5 +1,6 @@
 package com.iqser.red.service.redaction.v1.server.model.drools;
 
+import org.drools.drl.ast.descr.AttributeDescr;
 import org.drools.drl.ast.descr.RuleDescr;
 
 import lombok.AccessLevel;
@@ -18,6 +19,7 @@ public class BasicRule {
     RuleIdentifier identifier;
     String name;
     String code;
+    String agendaGroup;
     int line;
 
 
@@ -26,7 +28,8 @@ public class BasicRule {
         RuleIdentifier identifier = RuleIdentifier.fromName(rule.getName());
         String nameWithoutIdentifier = rule.getName().replace(identifier + ":", "");
         String code = rulesString.substring(rule.getStartCharacter(), rule.getEndCharacter());
-        return new BasicRule(identifier, nameWithoutIdentifier, code, rule.getLine());
+        String agendaGroup = rule.getAttributes().getOrDefault("agenda-group", new AttributeDescr("agenda-group", "DEFAULT")).getValue();
+        return new BasicRule(identifier, nameWithoutIdentifier, code, agendaGroup, rule.getLine());
     }
 
 

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/drools/RuleFileBluePrint.java

@@ -1,10 +1,12 @@
 package com.iqser.red.service.redaction.v1.server.model.drools;
 
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -39,6 +41,12 @@ public final class RuleFileBluePrint {
     }
 
 
+    public Set<String> getImportSplitByKeyword() {
+
+        return Arrays.stream(imports.replaceAll("\n", "").split("import")).map(String::trim).collect(Collectors.toSet());
+    }
+
+
     public List<BasicRule> findRulesByIdentifier(RuleIdentifier ruleIdentifier) {
 
         if (Objects.isNull(ruleIdentifier.unit())) {

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/AnalyzeService.java

@@ -113,7 +113,8 @@ public class AnalyzeService {
                     entityLogCreatorService.updateVersionsAndReturnChanges(previousEntityLog,
                             dictionaryIncrement.getDictionaryVersion(),
                             analyzeRequest.getDossierTemplateId(),
-                            false), document,
+                            false),
+                    document,
                     previousRedactionLog,
                     document.getNumberOfPages(),
                     dictionaryIncrement.getDictionaryVersion(),
@@ -209,7 +210,11 @@ public class AnalyzeService {
                 dictionary.getVersion(),
                 kieWrapperEntityRules.rulesVersion());
 
-        return finalizeAnalysis(analyzeRequest, startTime, kieWrapperComponentRules, new EntityLogChanges(entityLog, false), document,
+        return finalizeAnalysis(analyzeRequest,
+                startTime,
+                kieWrapperComponentRules,
+                new EntityLogChanges(entityLog, false),
+                document,
                 redactionLog,
                 document.getNumberOfPages(),
                 dictionary.getVersion(),
@@ -226,7 +231,8 @@ public class AnalyzeService {
                                                     Set<Integer> sectionsToReanalyseIds) {
 
         List<RedactionLogEntry> newRedactionLogEntries = redactionLogCreatorService.createRedactionLog(document,
-                analyzeRequest.getDossierTemplateId(), notFoundManualRedactionEntries);
+                analyzeRequest.getDossierTemplateId(),
+                notFoundManualRedactionEntries);
 
         var importedRedactionFilteredEntries = importedRedactionService.processImportedRedactions(analyzeRequest.getDossierTemplateId(),
                 analyzeRequest.getDossierId(),
@@ -236,12 +242,18 @@ public class AnalyzeService {
 
         previousRedactionLog.getRedactionLogEntry()
                 .removeIf(entry -> sectionsToReanalyseIds.contains(entry.getSectionNumber()) && !entry.getType().equals(ImportedRedactionService.IMPORTED_REDACTION_TYPE));
+
         previousRedactionLog.getRedactionLogEntry().addAll(importedRedactionFilteredEntries);
+
         return previousRedactionLog;
     }
 
 
-    private AnalyzeResult finalizeAnalysis(AnalyzeRequest analyzeRequest, long startTime, KieWrapper kieWrapperComponentRules, EntityLogChanges entityLogChanges, Document document,
+    private AnalyzeResult finalizeAnalysis(AnalyzeRequest analyzeRequest,
+                                           long startTime,
+                                           KieWrapper kieWrapperComponentRules,
+                                           EntityLogChanges entityLogChanges,
+                                           Document document,
                                            RedactionLog redactionLog,
                                            int numberOfPages,
                                            DictionaryVersion dictionaryVersion,
@@ -284,7 +296,9 @@ public class AnalyzeService {
     }
 
 
-    private void computeComponentsWhenRulesArePresent(AnalyzeRequest analyzeRequest, KieWrapper kieWrapperComponentRules, Document document,
+    private void computeComponentsWhenRulesArePresent(AnalyzeRequest analyzeRequest,
+                                                      KieWrapper kieWrapperComponentRules,
+                                                      Document document,
                                                       Set<FileAttribute> addedFileAttributes,
                                                       EntityLogChanges entityLogChanges,
                                                       DictionaryVersion dictionaryVersion) {
@@ -293,7 +307,9 @@ public class AnalyzeService {
             return;
         }
 
-        List<Component> components = componentDroolsExecutionService.executeRules(kieWrapperComponentRules.container(), entityLogChanges.getEntityLog(), document,
+        List<Component> components = componentDroolsExecutionService.executeRules(kieWrapperComponentRules.container(),
+                entityLogChanges.getEntityLog(),
+                document,
                 addedFileAttributes.stream().toList());
         log.info("Finished component rule execution for file {} in dossier {}", analyzeRequest.getFileId(), analyzeRequest.getDossierId());
 
@@ -377,7 +393,8 @@ public class AnalyzeService {
                                             KieWrapper wrapper) {
 
         List<RedactionLogEntry> redactionLogEntries = redactionLogCreatorService.createRedactionLog(document,
-                analyzeRequest.getDossierTemplateId(), notFoundManualRedactionEntries);
+                analyzeRequest.getDossierTemplateId(),
+                notFoundManualRedactionEntries);
 
         List<LegalBasis> legalBasis = legalBasisClient.getLegalBasisMapping(analyzeRequest.getDossierTemplateId());
         RedactionLog redactionLog = new RedactionLog(redactionServiceSettings.getAnalysisVersion(),

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/EntityLogCreatorService.java

@@ -121,10 +121,11 @@ public class EntityLogCreatorService {
 
         List<EntityLogEntry> newEntityLogEntries = createEntityLogEntries(document, analyzeRequest.getDossierTemplateId(), notFoundManualRedactionEntries);
         Set<String> newEntityIds = newEntityLogEntries.stream().map(EntityLogEntry::getId).collect(Collectors.toSet());
+
         List<EntityLogEntry> previousEntriesFromReAnalyzedSections = previousEntityLog.getEntityLogEntry()
                 .stream()
-                .filter(entry -> (newEntityIds.contains(entry.getId()) || sectionsToReanalyseIds.contains(entry.getContainingNodeId().get(0))) && !entry.getType()
-                        .equals(ImportedRedactionService.IMPORTED_REDACTION_TYPE))
+                .filter(entry -> !entry.getType()
+                        .equals(ImportedRedactionService.IMPORTED_REDACTION_TYPE) && (newEntityIds.contains(entry.getId()) || entry.getContainingNodeId().isEmpty() || sectionsToReanalyseIds.contains(entry.getContainingNodeId().get(0))))
                 .toList();
         previousEntityLog.getEntityLogEntry().removeAll(previousEntriesFromReAnalyzedSections);
 
@@ -150,6 +151,7 @@ public class EntityLogCreatorService {
         Set<String> processedIds = new HashSet<>();
         document.getEntities()
                 .stream()
+                .filter(entity -> !entity.getValue().isEmpty())
                 .filter(EntityLogCreatorService::notFalsePositiveOrFalseRecommendation)
                 .filter(entity -> !entity.removed())
                 .forEach(entityNode -> entries.addAll(toEntityLogEntries(entityNode, dossierTemplateId, processedIds)));

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/ImportedRedactionService.java

@@ -1,19 +1,24 @@
 package com.iqser.red.service.redaction.v1.server.service;
 
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
+import java.util.stream.Collectors;
 
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.imported.ImportedRedaction;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.imported.ImportedRedactions;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Point;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Rectangle;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.RedactionLogEntry;
 import org.springframework.stereotype.Service;
 
 import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntityLogEntry;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntryState;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntryType;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.Position;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Point;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Rectangle;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.RedactionLogEntry;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.imported.ImportedRedaction;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.imported.ImportedRedactions;
+
+
 import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
 
 import io.micrometer.core.annotation.Timed;
@@ -85,7 +90,7 @@ public class ImportedRedactionService {
                         .type(IMPORTED_REDACTION_TYPE)
                         .imported(true)
                         .redacted(true)
-                        .positions(importedRedaction.getPositions())
+                        .positions(importedRedaction.getPositions().stream().map(this::normalize).collect(Collectors.toList()))
                         .color(getColor(IMPORTED_REDACTION_TYPE, dossierTemplateId))
                         .build();
 
@@ -106,8 +111,10 @@ public class ImportedRedactionService {
                         .type(IMPORTED_REDACTION_TYPE).entryType(EntryType.ENTITY)
                         .imported(true)
                         .state(EntryState.APPLIED)
-                        .positions(toPositions(importedRedaction.getPositions()))
+                        .positions(importedRedaction.getPositions())
                         .color(getColor(IMPORTED_REDACTION_TYPE, dossierTemplateId))
+                        .containingNodeId(Collections.emptyList())
+                        .value("")
                         .build();
 
                 entityLogEntries.add(redactionLogEntry);
@@ -138,7 +145,7 @@ public class ImportedRedactionService {
             if (importedRedactions.getImportedRedactions().containsKey(rectangle.getPage())) {
                 var importedRedactionsOnPage = importedRedactions.getImportedRedactions().get(rectangle.getPage());
                 for (ImportedRedaction importedRedaction : importedRedactionsOnPage) {
-                    for (Rectangle importedRedactionPosition : importedRedaction.getPositions()) {
+                    for (Position importedRedactionPosition : importedRedaction.getPositions()) {
                         if (rectOverlap(normalizedRectangle, normalize(importedRedactionPosition))) {
                             if (redactionLogEntry.getImportedRedactionIntersections() == null) {
                                 redactionLogEntry.setImportedRedactionIntersections(new HashSet<>());
@@ -159,7 +166,7 @@ public class ImportedRedactionService {
             if (importedRedactions.getImportedRedactions().containsKey(rectangle.getPageNumber())) {
                 var importedRedactionsOnPage = importedRedactions.getImportedRedactions().get(rectangle.getPageNumber());
                 for (ImportedRedaction importedRedaction : importedRedactionsOnPage) {
-                    for (Rectangle importedRedactionPosition : importedRedaction.getPositions()) {
+                    for (Position importedRedactionPosition : importedRedaction.getPositions()) {
                         if (rectOverlap(normalizedRectangle, normalize(importedRedactionPosition))) {
                             if (redactionLogEntry.getImportedRedactionIntersections() == null) {
                                 redactionLogEntry.setImportedRedactionIntersections(new HashSet<>());

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/RedactionChangeLogService.java

@@ -13,6 +13,7 @@ import org.springframework.stereotype.Service;
 
 import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Change;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.ChangeType;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.ManualRedactionType;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.RedactionLog;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.RedactionLogChanges;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.RedactionLogEntry;
@@ -102,7 +103,7 @@ public class RedactionChangeLogService {
 
         Set<RedactionLogEntry> currentExistingEntries = currentRedactionLog.getRedactionLogEntry()
                 .stream()
-                .filter(entry -> entry.getChanges().isEmpty() || !entry.lastChangeIsRemoved())
+                .filter(entry -> (entry.getChanges().isEmpty() || !entry.lastChangeIsRemoved()) && !isLastManualChangeRemove(entry))
                 .collect(Collectors.toSet());
 
         previouslyExistingEntries.forEach(currentExistingEntries::remove);
@@ -113,4 +114,12 @@ public class RedactionChangeLogService {
         return addedIds;
     }
 
+
+    private static boolean isLastManualChangeRemove(RedactionLogEntry redactionLogEntry){
+        if(redactionLogEntry.getManualChanges() == null || redactionLogEntry.getManualChanges().isEmpty()){
+            return false;
+        }
+        return redactionLogEntry.getManualChanges().get(redactionLogEntry.getManualChanges().size() -1).getManualRedactionType() == ManualRedactionType.REMOVE_LOCALLY;
+    }
+
 }

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/RedactionLogCreatorService.java

@@ -47,8 +47,12 @@ public class RedactionLogCreatorService {
 
         List<RedactionLogEntry> entries = new ArrayList<>();
         Set<String> processIds = new HashSet<>();
-        document.getEntities().stream().filter(RedactionLogCreatorService::notFalsePositiveOrFalseRecommendation)
-                .filter(IEntity::active).forEach(entityNode -> entries.addAll(toRedactionLogEntries(entityNode, dossierTemplateId, processIds)));
+        document.getEntities()
+                .stream()
+                .filter(entity -> !entity.getValue().isEmpty())
+                .filter(RedactionLogCreatorService::notFalsePositiveOrFalseRecommendation)
+                .filter(IEntity::active)
+                .forEach(entityNode -> entries.addAll(toRedactionLogEntries(entityNode, dossierTemplateId, processIds)));
         document.streamAllImages().filter(image -> !image.removed()).forEach(imageNode -> entries.add(createRedactionLogEntry(imageNode, dossierTemplateId)));
         notFoundManualRedactionEntries.forEach(entityIdentifier -> entries.add(createRedactionLogEntry(entityIdentifier, dossierTemplateId)));
         return entries;
@@ -95,7 +99,8 @@ public class RedactionLogCreatorService {
         entity.references().stream().filter(TextEntity::active).forEach(ref -> ref.getPositionsOnPagePerPage().forEach(pos -> referenceIds.add(pos.getId())));
         int sectionNumber = entity.getDeepestFullyContainingNode().getTreeId().isEmpty() ? 0 : entity.getDeepestFullyContainingNode().getTreeId().get(0);
         boolean isHint = isHint(entity.getEntityType());
-        return RedactionLogEntry.builder().color(getColor(entity.getType(), dossierTemplateId, entity.applied(), isHint))
+        return RedactionLogEntry.builder()
+                .color(getColor(entity.getType(), dossierTemplateId, entity.applied(), isHint))
                 .reason(entity.buildReasonWithManualChangeDescriptions())
                 .legalBasis(entity.legalBasis())
                 .value(entity.getManualOverwrite().getValue().orElse(entity.getMatchedRule().isWriteValueWithLineBreaks() ? entity.getValueWithLineBreaks() : entity.getValue()))
@@ -185,7 +190,9 @@ public class RedactionLogCreatorService {
 
         String imageType = image.getImageType().equals(ImageType.OTHER) ? "image" : image.getImageType().toString().toLowerCase(Locale.ENGLISH);
         boolean isHint = dictionaryService.isHint(imageType, dossierTemplateId);
-        return RedactionLogEntry.builder().id(image.getId()).color(getColor(imageType, dossierTemplateId, image.applied(), isHint))
+        return RedactionLogEntry.builder()
+                .id(image.getId())
+                .color(getColor(imageType, dossierTemplateId, image.applied(), isHint))
                 .isImage(true)
                 .value(image.value())
                 .type(imageType)
@@ -235,8 +242,14 @@ public class RedactionLogCreatorService {
                 .isDossierDictionaryEntry(manualEntity.isDossierDictionaryEntry())
                 .textAfter("")
                 .textBefore("")
-                .startOffset(-1).endOffset(-1).positions(manualEntity.getManualOverwrite().getPositions().orElse(manualEntity.getEntityPosition())
-                        .stream().map(entityPosition -> toRedactionLogRectangle(entityPosition.rectangle2D(), entityPosition.pageNumber())).toList())
+                .startOffset(-1)
+                .endOffset(-1)
+                .positions(manualEntity.getManualOverwrite()
+                        .getPositions()
+                        .orElse(manualEntity.getEntityPosition())
+                        .stream()
+                        .map(entityPosition -> toRedactionLogRectangle(entityPosition.rectangle2D(), entityPosition.pageNumber()))
+                        .toList())
                 .engines(Collections.emptySet())
                 .reference(Collections.emptySet())
                 .manualChanges(mapManualChanges(manualEntity.getManualOverwrite(), isHint))

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/UnprocessedChangesService.java

@@ -35,6 +35,10 @@ public class UnprocessedChangesService {
 
     public List<UnprocessedManualEntity> addInformationToUnprocessedManualEntities(String fileId, String dossierId, String dossierTemplateId, ManualRedactions manualRedactions) {
 
+        // FIXME, because of the color if you start redaction-service a no processing is performed, a nullpointer will be throw when getting color.
+        // The entire concept needs to be rethought, because it is bullshit.
+        dictionaryService.updateDictionary(dossierTemplateId, dossierId);
+
         Document document = DocumentGraphMapper.toDocumentGraph(redactionStorageService.getDocumentData(dossierId, fileId));
         List<UnprocessedManualEntity> unprocessedManualEntities = new ArrayList<>();
         Set<String> annotationIds = manualRedactions.getEntriesToAdd().stream().map(ManualRedactionEntry::getAnnotationId).collect(Collectors.toSet());
@@ -61,22 +65,31 @@ public class UnprocessedChangesService {
                         .textAfter(textEntity.getTextAfter())
                         .section(textEntity.getManualOverwrite().getSection().orElse(textEntity.getDeepestFullyContainingNode().toString()))
                         .positions(positions)
+                        .legalBasis(textEntity.legalBasis())
                         .build());
             }
 
         });
 
-        notFoundManualEntities.forEach(manualEntity -> unprocessedManualEntities.add(UnprocessedManualEntity.builder()
-                .annotationId(manualEntity.getId())
-                .color(getColor(manualEntity.getType(), dossierTemplateId, manualEntity.applied(), manualEntity.getEntityType().equals(EntityType.HINT)))
-                .closestHeadline("")
-                .startOffset(-1)
-                .endOffset(-1)
-                .containingNodeId(Collections.emptyList())
-                .textAfter("")
-                .textBefore("")
-                .section("")
-                .build()));
+        notFoundManualEntities.forEach(manualEntity -> {
+            unprocessedManualEntities.add(UnprocessedManualEntity.builder()
+                    .annotationId(manualEntity.getId())
+                    .color(getColor(manualEntity.getType(), dossierTemplateId, manualEntity.applied(), manualEntity.getEntityType().equals(EntityType.HINT)))
+                    .closestHeadline("")
+                    .startOffset(-1)
+                    .endOffset(-1)
+                    .containingNodeId(Collections.emptyList())
+                    .textAfter("")
+                    .textBefore("")
+                    .section("")
+                    .positions(manualEntity.getManualOverwrite()
+                            .getPositions()
+                            .orElse(manualEntity.getEntityPosition())
+                            .stream()
+                            .map(entityPosition -> new Position(entityPosition.rectangle2D(), entityPosition.pageNumber()))
+                            .toList())
+                    .build());
+        });
 
         return unprocessedManualEntities;
     }

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/document/ComponentCreationService.java

@@ -19,6 +19,7 @@ import org.kie.api.runtime.KieSession;
 
 import com.iqser.red.service.redaction.v1.server.model.component.Component;
 import com.iqser.red.service.redaction.v1.server.model.component.Entity;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.Paragraph;
 import com.iqser.red.service.redaction.v1.server.model.document.nodes.SemanticNode;
 import com.iqser.red.service.redaction.v1.server.model.document.nodes.Table;
 import com.iqser.red.service.redaction.v1.server.model.document.nodes.TableCell;
@@ -102,7 +103,11 @@ public class ComponentCreationService {
 
         referencedEntities.addAll(references);
 
-        kieSession.insert(Component.builder().matchedRule(RuleIdentifier.fromString(ruleIdentifier)).name(name).value(value).valueDescription(valueDescription)
+        kieSession.insert(Component.builder()
+                .matchedRule(RuleIdentifier.fromString(ruleIdentifier))
+                .name(name)
+                .value(value)
+                .valueDescription(valueDescription)
                 .references(new LinkedList<>(references))
                 .build());
     }
@@ -293,6 +298,30 @@ public class ComponentCreationService {
     }
 
 
+    /**
+     * Counts the distinct rows where any of the provided entities occur and creates a component for each distinct table with its respective row count.
+     *
+     * @param ruleIdentifier the identifier of the rule
+     * @param name           the name of the record
+     * @param entities       the collection of entities to count row values from
+     */
+    public void rowValueCount(String ruleIdentifier, String name, Collection<Entity> entities) {
+
+        entities.stream().collect(Collectors.groupingBy(this::getFirstTable)).forEach((optionalTable, groupedEntities) -> {
+
+            if (optionalTable.isEmpty()) {
+                return;
+            }
+
+            long count = groupedEntities.stream()
+                    .collect(Collectors.groupingBy(entity -> getFirstTableCell(entity).map(TableCell::getRow).orElse(-1)))
+                    .size();
+
+            create(ruleIdentifier, name, String.valueOf(count), "Count rows with values in the entity references in same table", entities);
+        });
+    }
+
+
     /**
      * Creates a component for each sentence in the collection of entities.
      *
@@ -354,7 +383,9 @@ public class ComponentCreationService {
      */
     public void createComponentsForUnMappedEntities(String ruleIdentifier, Collection<Entity> entities) {
 
-        entities.stream().filter(entity -> !referencedEntities.contains(entity)).sorted(EntityComparators.first())
+        entities.stream()
+                .filter(entity -> !referencedEntities.contains(entity))
+                .sorted(EntityComparators.first())
                 .forEach(entity -> create(ruleIdentifier, entity.getType(), entity.getValue(), "Unmapped Entity", List.of(entity)));
     }
 
@@ -429,7 +460,8 @@ public class ComponentCreationService {
                     .sorted(Comparator.comparingInt(Map.Entry::getKey))
                     .map(Map.Entry::getValue)
                     .forEach(entitiesInSameRow -> create(ruleIdentifier,
-                            name, entitiesInSameRow.stream().sorted(EntityComparators.first()).map(Entity::getValue).collect(Collectors.joining(", ")),
+                            name,
+                            entitiesInSameRow.stream().sorted(EntityComparators.first()).map(Entity::getValue).collect(Collectors.joining(", ")),
                             valueDescription,
                             entitiesInSameRow));
         });
@@ -450,6 +482,20 @@ public class ComponentCreationService {
     }
 
 
+    private Optional<TableCell> getFirstTableCell(Entity entity) {
+
+        SemanticNode node = entity.getContainingNode();
+        while (!(node instanceof TableCell)) {
+            if (!node.hasParent()) {
+                return Optional.empty();
+            }
+            node = node.getParent();
+        }
+
+        return Optional.of((TableCell) node);
+    }
+
+
     /**
      * Creates a new component with the given rule identifier, name, value, and value description.
      * If the component is part of a table, it also takes a list of entities that belong to the same table row.
@@ -474,7 +520,9 @@ public class ComponentCreationService {
      */
     public void create(String ruleIdentifier, String name, String value) {
 
-        kieSession.insert(Component.builder().matchedRule(RuleIdentifier.fromString(ruleIdentifier)).name(name)
+        kieSession.insert(Component.builder()
+                .matchedRule(RuleIdentifier.fromString(ruleIdentifier))
+                .name(name)
                 .value(value)
                 .valueDescription("")
                 .references(Collections.emptyList())

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/document/ManualEntityCreationService.java

@@ -7,15 +7,14 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualRedactionEntry;
 import com.iqser.red.service.redaction.v1.server.model.ManualEntity;
-import com.iqser.red.service.redaction.v1.server.model.RectangleWithPage;
 import com.iqser.red.service.redaction.v1.server.model.document.TextRange;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.EntityType;
 import com.iqser.red.service.redaction.v1.server.model.document.entity.PositionOnPage;
 import com.iqser.red.service.redaction.v1.server.model.document.entity.TextEntity;
 import com.iqser.red.service.redaction.v1.server.model.document.nodes.SemanticNode;
@@ -52,8 +51,13 @@ public class ManualEntityCreationService {
         List<ManualEntity> manualEntities = manualRedactionEntries.stream()
                 .filter(manualRedactionEntry -> !(manualRedactionEntry.isAddToDictionary() || manualRedactionEntry.isAddToDossierDictionary()))
                 .map(manualRedactionEntry -> ManualEntity.fromManualRedactionEntry(manualRedactionEntry,
-                        dictionaryService.isHint(manualRedactionEntry.getType(), dossierTemplateId)))
-                .peek(manualEntity -> manualEntity.apply("MAN.5.0", "manual entries are applied by default", manualEntity.getLegalBasis()))
+                        dictionaryService.isHint(manualRedactionEntry.getType(), dossierTemplateId))).peek(manualEntity -> {
+                    if (manualEntity.getEntityType().equals(EntityType.HINT)) {
+                        manualEntity.skip("MAN.5.1", "manual hint is skipped by default");
+                    } else {
+                        manualEntity.apply("MAN.5.0", "manual entries are applied by default", manualEntity.getLegalBasis());
+                    }
+                })
                 .toList();
 
         return toTextEntity(manualEntities, node);
@@ -77,6 +81,7 @@ public class ManualEntityCreationService {
         return notFoundManualEntities;
     }
 
+
     /**
      * Deletes the temp Entity and creates a RedactionEntity with correct values, based on the given parameters.
      *

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/drools/DroolsSyntaxValidationService.java

@@ -1,18 +1,21 @@
 package com.iqser.red.service.redaction.v1.server.service.drools;
 
 import java.util.List;
+import java.util.Set;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
+import org.drools.drl.parser.DroolsParserException;
 import org.kie.api.builder.KieBuilder;
 import org.kie.api.builder.Message;
 import org.springframework.stereotype.Service;
 
+import com.google.common.collect.Sets;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.RuleFileType;
 import com.iqser.red.service.redaction.v1.model.DroolsSyntaxErrorMessage;
 import com.iqser.red.service.redaction.v1.model.DroolsSyntaxValidation;
 import com.iqser.red.service.redaction.v1.model.RuleValidationModel;
 import com.iqser.red.service.redaction.v1.server.model.drools.BasicQuery;
-import com.iqser.red.service.redaction.v1.server.model.drools.BasicRule;
 import com.iqser.red.service.redaction.v1.server.model.drools.RuleFileBluePrint;
 import com.iqser.red.service.redaction.v1.server.storage.RuleManagementResources;
 
@@ -22,6 +25,8 @@ import lombok.SneakyThrows;
 @Service
 @RequiredArgsConstructor
 public class DroolsSyntaxValidationService {
+    
+    private static final Pattern allowedImportsPattern = Pattern.compile("^(?:import\\s+static\\s+)?(?:import\\s+)?(?:com\\.knecon\\.fforesight|com\\.iqser\\.red)\\..*;$");
 
     private final KieContainerCreationService kieContainerCreationService;
 
@@ -29,14 +34,20 @@ public class DroolsSyntaxValidationService {
     @SneakyThrows
     public DroolsSyntaxValidation testRules(RuleValidationModel rules) {
 
-        DroolsSyntaxValidation customDroolsSyntaxValidation = buildCustomDroolsSyntaxValidation(rules.getRulesString(), RuleFileType.valueOf(rules.getRuleFileType()));
+        DroolsSyntaxValidation customDroolsSyntaxValidation;
+        try {
+            customDroolsSyntaxValidation = buildCustomDroolsSyntaxValidation(rules.getRulesString(), RuleFileType.valueOf(rules.getRuleFileType()));
+        } catch (DroolsParserException e) {
+            // this means the parser could not parse the file at all. In this case use drools compiler only as it will return useful error messages.
+            customDroolsSyntaxValidation = new DroolsSyntaxValidation();
+        }
         DroolsSyntaxValidation droolsCompilerSyntaxValidation = buildDroolsCompilerSyntaxValidation(rules);
         droolsCompilerSyntaxValidation.getDroolsSyntaxErrorMessages().addAll(customDroolsSyntaxValidation.getDroolsSyntaxErrorMessages());
         return droolsCompilerSyntaxValidation;
     }
 
 
-    private DroolsSyntaxValidation buildCustomDroolsSyntaxValidation(String ruleString, RuleFileType ruleFileType) {
+    private DroolsSyntaxValidation buildCustomDroolsSyntaxValidation(String ruleString, RuleFileType ruleFileType) throws DroolsParserException {
 
         RuleFileBluePrint ruleFileBluePrint = RuleFileParser.buildBluePrintFromRulesString(ruleString);
         DroolsSyntaxValidation customSyntaxValidation = ruleFileBluePrint.getDroolsSyntaxValidation();
@@ -46,7 +57,7 @@ public class DroolsSyntaxValidationService {
             case COMPONENT -> RuleFileParser.buildBluePrintFromRulesString(RuleManagementResources.getBaseComponentRuleFileString());
         };
 
-        if (!ruleFileBluePrint.getImports().equals(baseRuleFileBluePrint.getImports())) {
+        if (!importsAreValid(baseRuleFileBluePrint, ruleFileBluePrint)) {
             customSyntaxValidation.getDroolsSyntaxErrorMessages()
                     .add(DroolsSyntaxErrorMessage.builder()
                             .line(ruleFileBluePrint.getImportLine())
@@ -56,8 +67,10 @@ public class DroolsSyntaxValidationService {
         }
         if (!ruleFileBluePrint.getGlobals().equals(baseRuleFileBluePrint.getGlobals())) {
             customSyntaxValidation.getDroolsSyntaxErrorMessages()
-                    .add(DroolsSyntaxErrorMessage.builder().line(ruleFileBluePrint.getGlobalsLine())
-                            .column(0).message(String.format("Changing the globals is not allowed! Must be: %n%s", baseRuleFileBluePrint.getGlobals()))
+                    .add(DroolsSyntaxErrorMessage.builder()
+                            .line(ruleFileBluePrint.getGlobalsLine())
+                            .column(0)
+                            .message(String.format("Changing the globals is not allowed! Must be: %n%s", baseRuleFileBluePrint.getGlobals()))
                             .build());
         }
         baseRuleFileBluePrint.getQueries().forEach(basicQuery -> {
@@ -70,23 +83,33 @@ public class DroolsSyntaxValidationService {
                                 .build());
             }
         });
-        baseRuleFileBluePrint.streamAllRules().forEach(basicRule -> {
-            if (!validateRuleIsPresent(basicRule, ruleFileBluePrint)) {
-                customSyntaxValidation.getDroolsSyntaxErrorMessages()
-                        .add(DroolsSyntaxErrorMessage.builder()
-                                .line(basicRule.getLine())
-                                .column(0)
-                                .message(String.format("Changing or removing the rule %s is not allowed! Must be: %n%s", basicRule.getName(), basicRule.getCode()))
+        if (ruleFileType.equals(RuleFileType.ENTITY)) {
+            String requiredAgendaGroup = "LOCAL_DICTIONARY_ADDS";
+            if (!validateAgendaGroupIsPresent(ruleFileBluePrint, requiredAgendaGroup)) {
+                customSyntaxValidation.getDroolsSyntaxErrorMessages().add(DroolsSyntaxErrorMessage.builder().line(0)
+                                .column(0).message(String.format("At least one rule with Agenda-Group '%s' required!", requiredAgendaGroup))
                                 .build());
             }
-        });
+        }
         return customSyntaxValidation;
     }
 
 
-    private static boolean validateRuleIsPresent(BasicRule basicRule, RuleFileBluePrint ruleFileBluePrint) {
+    private boolean validateAgendaGroupIsPresent(RuleFileBluePrint ruleFileBluePrint, String agendaGroupName) {
 
-        return ruleFileBluePrint.findRulesByIdentifier(basicRule.getIdentifier()).stream().anyMatch(otherRule -> otherRule.getCode().equals(basicRule.getCode()));
+        return ruleFileBluePrint.streamAllRules().anyMatch(basicRule -> basicRule.getAgendaGroup().equals(agendaGroupName));
+    }
+
+
+    private boolean importsAreValid(RuleFileBluePrint baseRuleFileBluePrint, RuleFileBluePrint ruleFileBluePrint) {
+
+        // imports may shrink, but not add anything new!
+        Set<String> baseImports = baseRuleFileBluePrint.getImportSplitByKeyword();
+        Set<String> imports = ruleFileBluePrint.getImportSplitByKeyword();
+
+        Set<String> additionalImports = Sets.difference(imports, baseImports);
+
+        return additionalImports.stream().allMatch(additionalImport -> allowedImportsPattern.matcher(additionalImport).matches());
     }
 
 
@@ -101,7 +124,9 @@ public class DroolsSyntaxValidationService {
         var versionId = System.currentTimeMillis();
         var testRules = "test-rules";
         KieBuilder kieBuilder = kieContainerCreationService.registerNewKieContainerVersion(testRules,
-                versionId, rules.getRulesString(), RuleFileType.valueOf(rules.getRuleFileType()));
+                versionId,
+                rules.getRulesString(),
+                RuleFileType.valueOf(rules.getRuleFileType()));
         return buildDroolsCompilerSyntaxValidation(kieBuilder);
     }
 

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/storage/RedactionStorageService.java

@@ -3,6 +3,9 @@ package com.iqser.red.service.redaction.v1.server.storage;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStream;
+import java.util.stream.Collectors;
+
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.imported.ImportedRedactions;
 
 import org.springframework.stereotype.Service;
 
@@ -10,7 +13,6 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog
 import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntityLog;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.FileType;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.RedactionLog;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.imported.ImportedRedactions;
 import com.iqser.red.service.redaction.v1.server.client.model.NerEntitiesModel;
 import com.iqser.red.service.redaction.v1.server.model.document.DocumentData;
 import com.iqser.red.service.redaction.v1.server.utils.exception.NotFoundException;
@@ -90,7 +92,11 @@ public class RedactionStorageService {
     public RedactionLog getRedactionLog(String dossierId, String fileId) {
 
         try {
-            return storageService.readJSONObject(TenantContext.getTenantId(), StorageIdUtils.getStorageId(dossierId, fileId, FileType.REDACTION_LOG), RedactionLog.class);
+            RedactionLog redactionLog = storageService.readJSONObject(TenantContext.getTenantId(),
+                    StorageIdUtils.getStorageId(dossierId, fileId, FileType.REDACTION_LOG),
+                    RedactionLog.class);
+            redactionLog.setRedactionLogEntry(redactionLog.getRedactionLogEntry().stream().filter(entry -> !entry.getValue().isEmpty()).collect(Collectors.toList()));
+            return redactionLog;
         } catch (StorageObjectDoesNotExist e) {
             log.debug("RedactionLog not available.");
             return null;
@@ -98,13 +104,16 @@ public class RedactionStorageService {
 
     }
 
+
     @Timed("redactmanager_getRedactionLog")
     public EntityLog getEntityLog(String dossierId, String fileId) {
 
         try {
-            return storageService.readJSONObject(TenantContext.getTenantId(), StorageIdUtils.getStorageId(dossierId, fileId, FileType.ENTITY_LOG), EntityLog.class);
+            EntityLog entityLog = storageService.readJSONObject(TenantContext.getTenantId(), StorageIdUtils.getStorageId(dossierId, fileId, FileType.ENTITY_LOG), EntityLog.class);
+            entityLog.setEntityLogEntry(entityLog.getEntityLogEntry().stream().filter(entry -> !entry.getValue().isEmpty()).collect(Collectors.toList()));
+            return entityLog;
         } catch (StorageObjectDoesNotExist e) {
-            log.debug("RedactionLog not available.");
+            log.debug("EntityLog not available.");
             return null;
         }
 
@@ -116,10 +125,18 @@ public class RedactionStorageService {
 
         try {
             return DocumentData.builder()
-                    .documentStructure(storageService.readJSONObject(TenantContext.getTenantId(), StorageIdUtils.getStorageId(dossierId, fileId, FileType.DOCUMENT_STRUCTURE), DocumentStructure.class))
-                    .documentTextData(storageService.readJSONObject(TenantContext.getTenantId(), StorageIdUtils.getStorageId(dossierId, fileId, FileType.DOCUMENT_TEXT), DocumentTextData[].class))
-                    .documentPositionData(storageService.readJSONObject(TenantContext.getTenantId(), StorageIdUtils.getStorageId(dossierId, fileId, FileType.DOCUMENT_POSITION), DocumentPositionData[].class))
-                    .documentPages(storageService.readJSONObject(TenantContext.getTenantId(), StorageIdUtils.getStorageId(dossierId, fileId, FileType.DOCUMENT_PAGES), DocumentPage[].class))
+                    .documentStructure(storageService.readJSONObject(TenantContext.getTenantId(),
+                            StorageIdUtils.getStorageId(dossierId, fileId, FileType.DOCUMENT_STRUCTURE),
+                            DocumentStructure.class))
+                    .documentTextData(storageService.readJSONObject(TenantContext.getTenantId(),
+                            StorageIdUtils.getStorageId(dossierId, fileId, FileType.DOCUMENT_TEXT),
+                            DocumentTextData[].class))
+                    .documentPositionData(storageService.readJSONObject(TenantContext.getTenantId(),
+                            StorageIdUtils.getStorageId(dossierId, fileId, FileType.DOCUMENT_POSITION),
+                            DocumentPositionData[].class))
+                    .documentPages(storageService.readJSONObject(TenantContext.getTenantId(),
+                            StorageIdUtils.getStorageId(dossierId, fileId, FileType.DOCUMENT_PAGES),
+                            DocumentPage[].class))
                     .build();
         } catch (StorageObjectDoesNotExist e) {
             log.debug("DocumentData not available.");

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/utils/Patterns.java

@@ -11,8 +11,7 @@ public final class Patterns {
 
     public static final Map<String, Pattern> patternCache = new HashMap<>();
 
-    public static final Pattern AUTHOR_TABLE_SPLITTER = Pattern.compile(
-            "(((((di)|(van)) )|[A-Z]’)?[A-ZÄÖÜ][\\wäöüéèê]{2,500}( ?[A-ZÄÖÜ]{1,2}\\.){1,3})|(((((di)|(van)) )|[A-Z]’)?[A-ZÄÖÜ][\\wäöüéèê]{2,500}( ?[A-ZÄÖÜ]{1,2} ){1,3})");
+    public static final Pattern AUTHOR_NAME_PATTERN = Pattern.compile("^(?!\\w*[.]$)\\p{Lu}\\p{L}*[.\\p{L}\\s]*$");
 
 
     public Pattern getCompiledPattern(String pattern, boolean caseInsensitive) {

redaction-service-v1/redaction-service-server-v1/src/main/resources/application-dev.yaml

@@ -1,5 +1,5 @@
 server:
-  port: 8083
+  port: 8077
 
 persistence-service.url: "http://localhost:8085"
 tenant-user-management-service.url: "http://localhost:8091/internal"

redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/AnalysisTest.java

@@ -43,33 +43,30 @@ import com.knecon.fforesight.tenantcommons.TenantContext;
 @Import(AnalysisTest.RedactionIntegrationTestConfiguration.class)
 public class AnalysisTest extends AbstractRedactionIntegrationTest {
 
-    private static final String RULES = loadFromClassPath("drools/table_demo.drl");
-    private static final String COMPONENT_RULES = loadFromClassPath("drools/table_demo_components.drl");
+    private static final String RULES = loadFromClassPath("drools/test_rules.drl");
+    private static final String COMPONENT_RULES = loadFromClassPath("drools/test_components.drl");
 
 
     @Test
     @Disabled
-    public void analyzeTableDemoFile() {
+    public void analyzeTableDemoFile() throws IOException {
 
-        AnalyzeRequest request = uploadFileToStorage("files/TableDemo/Table_examples.pdf");
+        AnalyzeRequest request = uploadFileToStorage("files/Metolachlor/S-Metolachlor_RAR_01_Volume_1_2018-09-06.pdf");
 
         System.out.println("Start Full integration test");
         analyzeDocumentStructure(LayoutParsingType.DOCUMINE, request);
         System.out.println("Finished structure analysis");
         AnalyzeResult result = analyzeService.analyze(request);
         System.out.println("Finished analysis");
-//        var redactionLog = redactionStorageService.getRedactionLog(TEST_DOSSIER_ID, TEST_FILE_ID);
-//        var componentLog = redactionStorageService.getComponentLog(TEST_DOSSIER_ID, TEST_FILE_ID);
+        var entityLog = redactionStorageService.getEntityLog(TEST_DOSSIER_ID, TEST_FILE_ID);
+        var componentLog = redactionStorageService.getComponentLog(TEST_DOSSIER_ID, TEST_FILE_ID);
         AnnotateResponse annotateResponse = annotationService.annotate(AnnotateRequest.builder().dossierId(TEST_DOSSIER_ID).fileId(TEST_FILE_ID).build());
 
         String outputFileName = OsUtils.getTemporaryDirectory() + "/Documine.pdf";
 
         try (FileOutputStream fileOutputStream = new FileOutputStream(outputFileName)) {
             fileOutputStream.write(annotateResponse.getDocument());
-        } catch (IOException e) {
-            throw new RuntimeException(e);
         }
-
     }
 
 

redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/DocumineFloraTest.java

@@ -6,6 +6,8 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.List;
 
+import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.FileType;
+import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -19,6 +21,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.FilterType;
 import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.Primary;
+import org.springframework.core.io.ClassPathResource;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import com.iqser.red.commons.jackson.ObjectMapperFactory;
@@ -50,7 +53,11 @@ public class DocumineFloraTest extends AbstractRedactionIntegrationTest {
 //    @Disabled
     public void titleExtraction() throws IOException {
 
-        AnalyzeRequest request = uploadFileToStorage("files/Documine/Flora/402Study-ocred.pdf");
+        AnalyzeRequest request = uploadFileToStorage("files/ImportedRedactions/18 Chlorothalonil RAR 08 Volume 3CA B 6a Oct 2017.pdf");
+
+        ClassPathResource importedRedactionClasspathResource = new ClassPathResource("files/ImportedRedactions/18 Chlorothalonil RAR 08 Volume 3CA B 6a Oct 2017.IMPORTED_REDACTIONS.json");
+        storageService.storeObject(TenantContext.getTenantId(), RedactionStorageService.StorageIdUtils.getStorageId(TEST_DOSSIER_ID, TEST_FILE_ID, FileType.IMPORTED_REDACTIONS), importedRedactionClasspathResource.getInputStream());
+
 
 //        AnalyzeRequest request = prepareStorage("files/Documine/Flora/ProblemDocs/SOLICITA_VICTRATO-GOLD-II_Item 21_Mutacao_Genica (1).pdf",
 //                "files/Documine/Flora/ProblemDocs/SOLICITA_VICTRATO-GOLD-II_Item 21_Mutacao_Genica (1).TABLES.json");

redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/MigrationIntegrationTest.java

@@ -4,8 +4,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.nio.file.Path;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -13,6 +15,7 @@ import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,6 +28,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntityLog;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntityLogEntry;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.Position;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.migration.MigratedIds;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.FileType;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Rectangle;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.RedactionLog;
@@ -39,6 +43,7 @@ import com.iqser.red.service.redaction.v1.server.service.RedactionLogToEntityLog
 
 import lombok.SneakyThrows;
 
+@Disabled
 @ExtendWith(SpringExtension.class)
 @SpringBootTest(classes = Application.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @Import(MigrationIntegrationTest.TestConfiguration.class)
@@ -51,6 +56,22 @@ public class MigrationIntegrationTest extends BuildDocumentIntegrationTest {
     ObjectMapper mapper;
 
 
+    @Test
+    @SneakyThrows
+    public void testSave() {
+
+        MigratedIds ids = new MigratedIds(new LinkedList<>());
+        ids.addMapping("123", "321");
+        ids.addMapping("123", "321");
+        ids.addMapping("123", "321");
+        ids.addMapping("123", "321");
+        ids.addMapping("123", "321");
+
+        mapper.writeValue(new FileOutputStream("/tmp/testIds.json"), ids);
+        var ids2 = mapper.readValue(new FileInputStream("/tmp/testIds.json"), MigratedIds.class);
+        assert ids2.getMappings().size() == 5;
+    }
+
     @Test
     @SneakyThrows
     public void testMigration() {

redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionAcceptanceTest.java

@@ -1,5 +1,6 @@
 package com.iqser.red.service.redaction.v1.server;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.when;
 
@@ -103,6 +104,25 @@ public class RedactionAcceptanceTest extends AbstractRedactionIntegrationTest {
     }
 
 
+    @Test
+    public void authorNameSplittingTest() {
+
+        AnalyzeRequest request = uploadFileToStorage("files/Minimal Examples/tableWithAuthors.pdf");
+
+        analyzeDocumentStructure(LayoutParsingType.REDACT_MANAGER, request);
+        AnalyzeResult result = analyzeService.analyze(request);
+
+        var entityLog = redactionStorageService.getEntityLog(TEST_DOSSIER_ID, TEST_FILE_ID);
+
+        var recommendations = entityLog.getEntityLogEntry()
+                .stream()
+                .filter(entityLogEntry -> entityLogEntry.getEntryType().equals(EntryType.RECOMMENDATION))
+                .map(EntityLogEntry::getValue)
+                .toList();
+
+        assertThat(recommendations).containsExactlyInAnyOrder("Michael N.", "Funnarie B.", "Feuer A.");
+    }
+
     @Test
     public void acceptanceTests() throws IOException {
 
@@ -148,7 +168,8 @@ public class RedactionAcceptanceTest extends AbstractRedactionIntegrationTest {
         return redactionLog.getEntityLogEntry()
                 .stream()
                 .filter(entry -> entry.getType().equals(type))
-                .filter(entry -> entry.getValue().equals(value)).filter(entry -> entry.getContainingNodeId().get(0).equals(sectionNumber.get(0)));
+                .filter(entry -> entry.getValue().equals(value))
+                .filter(entry -> entry.getContainingNodeId().get(0).equals(sectionNumber.get(0)));
     }
 
 

redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java

@@ -263,6 +263,34 @@ public class RedactionIntegrationTest extends AbstractRedactionIntegrationTest {
     }
 
 
+    @Test
+    public void importedRedactionsTest() throws IOException {
+
+        ClassPathResource importedRedactionClasspathResource = new ClassPathResource(
+                "files/ImportedRedactions/18 Chlorothalonil RAR 08 Volume 3CA B 6a Oct 2017.IMPORTED_REDACTIONS.json");
+        storageService.storeObject(TenantContext.getTenantId(),
+                RedactionStorageService.StorageIdUtils.getStorageId(TEST_DOSSIER_ID, TEST_FILE_ID, FileType.IMPORTED_REDACTIONS),
+                importedRedactionClasspathResource.getInputStream());
+
+        AnalyzeRequest request = uploadFileToStorage("files/ImportedRedactions/18 Chlorothalonil RAR 08 Volume 3CA B 6a Oct 2017.pdf");
+        System.out.println("Start Full integration test");
+        analyzeDocumentStructure(LayoutParsingType.REDACT_MANAGER, request);
+        System.out.println("Finished structure analysis");
+        AnalyzeResult result = analyzeService.analyze(request);
+        System.out.println("Finished analysis");
+        var entityLog = redactionStorageService.getEntityLog(TEST_DOSSIER_ID, TEST_FILE_ID);
+
+        AnnotateResponse annotateResponse = annotationService.annotate(AnnotateRequest.builder().dossierId(TEST_DOSSIER_ID).fileId(TEST_FILE_ID).build());
+
+        String outputFileName = OsUtils.getTemporaryDirectory() + "/Annotated.pdf";
+
+        try (FileOutputStream fileOutputStream = new FileOutputStream(outputFileName)) {
+            fileOutputStream.write(annotateResponse.getDocument());
+        }
+
+    }
+
+
     @Test
     public void titleExtraction() throws IOException {
 
@@ -942,7 +970,11 @@ public class RedactionIntegrationTest extends AbstractRedactionIntegrationTest {
 
         redactionLog.getEntityLogEntry().forEach(entry -> {
             if (!entry.getEntryType().equals(EntryType.HINT)) {
-                assertThat(entry.getReason()).isEqualTo("Not redacted because it's row does not belong to a vertebrate study");
+                if (entry.getType().equals("CBI_author")) {
+                    assertThat(entry.getReason()).isEqualTo("Not redacted because it's row does not belong to a vertebrate study");
+                } else if (entry.getType().equals("CBI_address")) {
+                    assertThat(entry.getReason()).isEqualTo("No vertebrate found");
+                }
             }
         });
     }
@@ -1084,6 +1116,7 @@ public class RedactionIntegrationTest extends AbstractRedactionIntegrationTest {
 
 
     @Test
+    @Disabled
     public void testImportedRedactions() throws IOException {
 
         String outputFileName = OsUtils.getTemporaryDirectory() + "/ImportedRedactions.pdf";

redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/drools/files/management/services/DroolsSyntaxValidationServiceTest.java

@@ -58,6 +58,50 @@ class DroolsSyntaxValidationServiceTest {
     }
 
 
+    @Test
+    @SneakyThrows
+    void testRulesWithRemovedImportsAndChangedName() {
+
+        DroolsSyntaxValidationService droolsSyntaxValidationService = new DroolsSyntaxValidationService(new KieContainerCreationService(rulesClient));
+        var rulesFile = new ClassPathResource("drools/rules.drl");
+
+        String rulesString = new String(rulesFile.getInputStream().readAllBytes());
+        rulesString = rulesString.replaceAll("import com.iqser.red.service.redaction.v1.server.model.document.nodes.TableCell;", "");
+        rulesString = rulesString.replaceAll("rule \"LDS.0.0: Run local dictionary search\"", "rule \"LDS.0.0: run local dictionary search\"");
+        DroolsSyntaxValidation droolsSyntaxValidation = droolsSyntaxValidationService.testRules(new RuleValidationModel(RuleFileType.ENTITY.name(), rulesString));
+        droolsSyntaxValidation.getDroolsSyntaxErrorMessages().forEach(System.out::println);
+        assertTrue(droolsSyntaxValidation.isCompiled());
+    }
+
+    @Test
+    @SneakyThrows
+    void testRulesWithAddedImports() {
+
+        DroolsSyntaxValidationService droolsSyntaxValidationService = new DroolsSyntaxValidationService(new KieContainerCreationService(rulesClient));
+        var rulesFile = new ClassPathResource("drools/rules.drl");
+
+        String rulesString = new String(rulesFile.getInputStream().readAllBytes());
+        rulesString = rulesString.replaceAll("import com.iqser.red.service.redaction.v1.server.model.document.nodes.TableCell;", "import com.iqser.red.service.redaction.v1.server.model.document.nodes.TableCell;\nimport com.iqser.red.service.redaction.v1.server.service.document.EntityComparators;");
+        DroolsSyntaxValidation droolsSyntaxValidation = droolsSyntaxValidationService.testRules(new RuleValidationModel(RuleFileType.ENTITY.name(), rulesString));
+        droolsSyntaxValidation.getDroolsSyntaxErrorMessages().forEach(System.out::println);
+        assertTrue(droolsSyntaxValidation.isCompiled());
+    }
+
+    @Test
+    @SneakyThrows
+    void testRulesWithUnallowedAddedImports() {
+
+        DroolsSyntaxValidationService droolsSyntaxValidationService = new DroolsSyntaxValidationService(new KieContainerCreationService(rulesClient));
+        var rulesFile = new ClassPathResource("drools/rules.drl");
+
+        String rulesString = new String(rulesFile.getInputStream().readAllBytes());
+        rulesString = rulesString.replaceAll("import com.iqser.red.service.redaction.v1.server.model.document.nodes.TableCell;", "import com.iqser.red.service.redaction.v1.server.model.document.nodes.TableCell;\nimport com.google.common.collect.Sets;");
+        DroolsSyntaxValidation droolsSyntaxValidation = droolsSyntaxValidationService.testRules(new RuleValidationModel(RuleFileType.ENTITY.name(), rulesString));
+        droolsSyntaxValidation.getDroolsSyntaxErrorMessages().forEach(System.out::println);
+        assertFalse(droolsSyntaxValidation.isCompiled());
+    }
+
+
     @Test
     @SneakyThrows
     void testAllRules() {
@@ -156,7 +200,8 @@ class DroolsSyntaxValidationServiceTest {
         var rulesFile = new ClassPathResource("drools/rules.drl");
 
         String rulesString = new String(rulesFile.getInputStream().readAllBytes());
-        String corruptedRules = rulesString.replaceAll("import com.iqser.red.service.redaction.v1.server.model.document.nodes.ImageType;", "");
+        String corruptedRules = rulesString.replaceAll("import com.iqser.red.service.redaction.v1.server.model.document.nodes.ImageType;",
+                "import com.iqser.red.service.redaction.v1.server.model.document.nodes.ImageType;\nimport com.iqser.red.service.redaction.v1.server.model.document.nodes.SomethingElse;");
 
         DroolsSyntaxValidation droolsSyntaxValidation = droolsSyntaxValidationService.testRules(new RuleValidationModel(RuleFileType.ENTITY.name(), corruptedRules));
         assertFalse(droolsSyntaxValidation.isCompiled());

redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/drools/files/management/services/DroolsUpToDateTest.java

@@ -0,0 +1,53 @@
+package com.iqser.red.service.redaction.v1.server.drools.files.management.services;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.wildfly.common.Assert.assertTrue;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.core.io.ClassPathResource;
+
+import com.knecon.fforesight.utility.rules.management.factory.RuleFileParser;
+import com.knecon.fforesight.utility.rules.management.models.BasicRule;
+import com.knecon.fforesight.utility.rules.management.models.RuleFileBluePrint;
+import com.knecon.fforesight.utility.rules.management.utils.RuleFileIO;
+
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class DroolsUpToDateTest {
+
+    @Test
+    @SneakyThrows
+    public void assertAllRuleFilesAreUpToDate() {
+
+        Path droolsPath = new ClassPathResource("drools").getFile().toPath();
+        Files.walk(droolsPath).filter(DroolsUpToDateTest::isEntityRuleFile).forEach(this::validateFile);
+    }
+
+
+    private static boolean isEntityRuleFile(Path droolsFile) {
+
+        String fileName = droolsFile.getFileName().toString();
+        return fileName.endsWith(".drl") && !fileName.endsWith("_components.drl") && !fileName.endsWith("_OLD.drl");
+    }
+
+
+    private void validateFile(Path path) {
+
+        log.info(path.toFile().getAbsolutePath());
+        RuleFileBluePrint allRules = RuleFileParser.buildBluePrintFromAllRuleFiles();
+        RuleFileBluePrint thisRules = RuleFileParser.buildBluePrintFromRulesString(RuleFileIO.getRulesString(path.toFile().getAbsolutePath()));
+        assertTrue(allRules.getAllRuleIdentifiers().containsAll(thisRules.getAllRuleIdentifiers()));
+        for (BasicRule rule : thisRules.getAllRules()) {
+            List<BasicRule> updatedRule = allRules.findRuleByIdentifier(rule.identifier());
+            assert updatedRule.size() == 1;
+            assertEquals(updatedRule.get(0), rule);
+        }
+    }
+
+}

redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/manualchanges/ManualChangesEnd2EndTest.java

@@ -17,6 +17,7 @@ import java.util.Set;
 import java.util.UUID;
 
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,6 +72,7 @@ import com.knecon.fforesight.tenantcommons.TenantContext;
 
 import lombok.SneakyThrows;
 
+@Disabled // TODO: only disabled due to OOM in gradle testRunner in GitLab, find a solution!
 @ExtendWith(SpringExtension.class)
 @SpringBootTest(classes = Application.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @Import(ManualChangesEnd2EndTest.TestConfiguration.class)

redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/manualchanges/ManualChangesIntegrationTest.java

@@ -11,81 +11,21 @@ import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.kie.api.KieServices;
-import org.kie.api.builder.KieBuilder;
-import org.kie.api.builder.KieFileSystem;
-import org.kie.api.builder.KieModule;
-import org.kie.api.runtime.KieContainer;
-import org.kie.api.runtime.KieSession;
-import org.kie.internal.io.ResourceFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.AnnotationStatus;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.Rectangle;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.IdRemoval;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualForceRedaction;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualResizeRedaction;
-import com.iqser.red.service.redaction.v1.server.document.graph.BuildDocumentIntegrationTest;
 import com.iqser.red.service.redaction.v1.server.model.document.entity.EntityType;
 import com.iqser.red.service.redaction.v1.server.model.document.entity.PositionOnPage;
 import com.iqser.red.service.redaction.v1.server.model.document.entity.TextEntity;
 import com.iqser.red.service.redaction.v1.server.model.document.nodes.Document;
 import com.iqser.red.service.redaction.v1.server.model.document.nodes.Paragraph;
-import com.iqser.red.service.redaction.v1.server.service.ManualChangesApplicationService;
-import com.iqser.red.service.redaction.v1.server.service.document.EntityCreationService;
-import com.iqser.red.service.redaction.v1.server.service.document.EntityEnrichmentService;
-
-@Import(ManualChangesIntegrationTest.TestConfiguration.class)
-public class ManualChangesIntegrationTest extends BuildDocumentIntegrationTest {
-
-    private static final String RULES = "drools/manual_redaction_rules.drl";
-
-    @Autowired
-    private EntityEnrichmentService entityEnrichmentService;
-    private EntityCreationService entityCreationService;
-    private KieSession kieSession;
-
-    @Qualifier("kieContainer")
-    @Autowired
-    private KieContainer kieContainer;
-
-    @Configuration
-    @Import(BuildDocumentIntegrationTest.TestConfiguration.class)
-    public static class TestConfiguration {
-
-        @Bean
-        public KieContainer kieContainer() {
-
-            KieServices kieServices = KieServices.Factory.get();
-
-            KieFileSystem kieFileSystem = kieServices.newKieFileSystem();
-            kieFileSystem.write(ResourceFactory.newClassPathResource(RULES));
-            KieBuilder kieBuilder = kieServices.newKieBuilder(kieFileSystem);
-            kieBuilder.buildAll();
-            KieModule kieModule = kieBuilder.getKieModule();
-
-            return kieServices.newKieContainer(kieModule.getReleaseId());
-        }
-
-    }
-
-
-    @BeforeEach
-    public void createServices() {
-
-        kieSession = kieContainer.newKieSession();
-        entityCreationService = new EntityCreationService(entityEnrichmentService, kieSession);
-        ManualChangesApplicationService manualChangesApplicationService = new ManualChangesApplicationService(entityCreationService);
-        kieSession.setGlobal("manualChangesApplicationService", manualChangesApplicationService);
-        kieSession.setGlobal("entityCreationService", entityCreationService);
-    }
+import com.iqser.red.service.redaction.v1.server.rules.RulesIntegrationTest;
 
+public class ManualChangesIntegrationTest extends RulesIntegrationTest {
 
     @Test
     public void manualResizeRedactionTest() {
@@ -108,11 +48,7 @@ public class ManualChangesIntegrationTest extends BuildDocumentIntegrationTest {
                 .updateDictionary(false)
                 .build();
 
-        kieSession.insert(document);
-        document.streamAllSubNodes().forEach(kieSession::insert);
-        kieSession.insert(manualResizeRedaction);
-        kieSession.fireAllRules();
-        kieSession.dispose();
+        doAnalysis(document, List.of(manualResizeRedaction));
 
         assertEquals(biggerEntity.getTextRange(), entity.getTextRange());
         assertEquals(biggerEntity.getDeepestFullyContainingNode(), entity.getDeepestFullyContainingNode());
@@ -141,11 +77,7 @@ public class ManualChangesIntegrationTest extends BuildDocumentIntegrationTest {
                 .requestDate(OffsetDateTime.now())
                 .build();
 
-        kieSession.insert(manualForceRedaction);
-        kieSession.insert(document);
-        document.streamAllSubNodes().forEach(kieSession::insert);
-        kieSession.fireAllRules();
-        kieSession.dispose();
+        doAnalysis(document, List.of(manualForceRedaction));
 
         assertEquals(Paragraph.class, entity.getDeepestFullyContainingNode().getClass());
         assertFalse(entity.getIntersectingNodes().isEmpty());
@@ -170,11 +102,7 @@ public class ManualChangesIntegrationTest extends BuildDocumentIntegrationTest {
         String initialId = entity.getPositionsOnPagePerPage().get(0).getId();
         IdRemoval idRemoval = IdRemoval.builder().annotationId(initialId).status(AnnotationStatus.APPROVED).requestDate(OffsetDateTime.now()).build();
 
-        kieSession.insert(document);
-        document.streamAllSubNodes().forEach(kieSession::insert);
-        kieSession.insert(idRemoval);
-        kieSession.fireAllRules();
-        kieSession.dispose();
+        doAnalysis(document, List.of(idRemoval));
 
         assertEquals("David Ksenia", entity.getValue());
         assertEquals(initialId, entity.getPositionsOnPagePerPage().get(0).getId());
@@ -199,12 +127,7 @@ public class ManualChangesIntegrationTest extends BuildDocumentIntegrationTest {
                 .requestDate(OffsetDateTime.now())
                 .build();
 
-        kieSession.insert(document);
-        document.streamAllSubNodes().forEach(kieSession::insert);
-        kieSession.insert(idRemoval);
-        kieSession.insert(manualForceRedaction);
-        kieSession.fireAllRules();
-        kieSession.dispose();
+        doAnalysis(document, List.of(manualForceRedaction));
 
         assertEquals(Paragraph.class, entity.getDeepestFullyContainingNode().getClass());
         assertFalse(entity.getIntersectingNodes().isEmpty());
@@ -227,11 +150,7 @@ public class ManualChangesIntegrationTest extends BuildDocumentIntegrationTest {
         String initialId = entity.getPositionsOnPagePerPage().get(0).getId();
         IdRemoval idRemoval = IdRemoval.builder().annotationId(initialId).status(AnnotationStatus.REQUESTED).build();
 
-        kieSession.insert(idRemoval);
-        kieSession.insert(document);
-        document.streamAllSubNodes().forEach(kieSession::insert);
-        kieSession.fireAllRules();
-        kieSession.dispose();
+        doAnalysis(document, List.of(idRemoval));
 
         assertEquals(Paragraph.class, entity.getDeepestFullyContainingNode().getClass());
         assertFalse(entity.getIntersectingNodes().isEmpty());

redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/manualchanges/ManualEntityTest.java

@@ -7,6 +7,7 @@ import static org.wildfly.common.Assert.assertFalse;
 import static org.wildfly.common.Assert.assertTrue;
 
 import java.awt.geom.Rectangle2D;
+import java.time.OffsetDateTime;
 import java.util.List;
 import java.util.Set;
 
@@ -19,12 +20,14 @@ import org.springframework.boot.test.mock.mockito.MockBean;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.AnalyzeRequest;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntityLogEntry;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.Rectangle;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.IdRemoval;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualRedactionEntry;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Point;
 import com.iqser.red.service.redaction.v1.server.document.graph.BuildDocumentIntegrationTest;
 import com.iqser.red.service.redaction.v1.server.model.ManualEntity;
 import com.iqser.red.service.redaction.v1.server.model.dictionary.DictionaryVersion;
 import com.iqser.red.service.redaction.v1.server.model.document.entity.EntityType;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.IEntity;
 import com.iqser.red.service.redaction.v1.server.model.document.entity.TextEntity;
 import com.iqser.red.service.redaction.v1.server.model.document.nodes.Document;
 import com.iqser.red.service.redaction.v1.server.service.DictionaryService;
@@ -35,7 +38,7 @@ import com.iqser.red.service.redaction.v1.server.service.document.ManualEntityCr
 
 import lombok.SneakyThrows;
 
-public class ManualEntityCreationServiceTest extends BuildDocumentIntegrationTest {
+public class ManualEntityTest extends BuildDocumentIntegrationTest {
 
     @Autowired
     private EntityEnrichmentService entityEnrichmentService;
@@ -63,39 +66,7 @@ public class ManualEntityCreationServiceTest extends BuildDocumentIntegrationTes
     @SneakyThrows
     public void manualAddRedactionTest() {
 
-        Document document = buildGraph("files/new/VV-919901.pdf");
-        EntityCreationService entityCreationService = new EntityCreationService(entityEnrichmentService);
-
-        List<TextEntity> tempEntities = entityCreationService.byString("To: Syngenta Ltd.", "temp", EntityType.ENTITY, document).toList();
-        assertFalse(tempEntities.isEmpty());
-        var tempEntity = tempEntities.get(0);
-        List<Rectangle> positions = tempEntity.getPositionsOnPagePerPage()
-                .stream()
-                .flatMap(redactionPosition -> redactionPosition.getRectanglePerLine()
-                        .stream()
-                        .map(rectangle2D -> toAnnotationRectangle(rectangle2D, redactionPosition.getPage().getNumber())))
-                .toList();
-
-        ManualRedactionEntry manualRedactionEntry = ManualRedactionEntry.builder()
-                .type("manual")
-                .value(tempEntity.getValue())
-                .reason("reason")
-                .legalBasis("n-a")
-                .section(tempEntity.getDeepestFullyContainingNode().toString())
-                .rectangle(true)
-                .positions(positions)
-                .textAfter("")
-                .textBefore("")
-                .build();
-
-        tempEntity.removeFromGraph();
-        assertTrue(document.getEntities().isEmpty());
-
-        List<ManualEntity> notFoundManualEntities = manualEntityCreationService.createRedactionEntitiesIfFoundAndReturnNotFoundEntries(Set.of(manualRedactionEntry),
-                document,
-                TEST_DOSSIER_TEMPLATE_ID);
-        assertTrue(notFoundManualEntities.isEmpty());
-        assertEquals(1, document.getEntities().size());
+        createFoundManualRedaction();
     }
 
 
@@ -103,6 +74,34 @@ public class ManualEntityCreationServiceTest extends BuildDocumentIntegrationTes
     @SneakyThrows
     public void manualAddRedactionFailingTest() {
 
+        createNotFoundManualRedaction();
+    }
+
+
+    @Test
+    @SneakyThrows
+    public void testFoundManualAddRedactionAndRemovedHasStateRemoved() {
+
+        DocumentAndEntity context = createFoundManualRedaction();
+        IdRemoval removal = IdRemoval.builder().requestDate(OffsetDateTime.now()).build();
+        context.entity().getManualOverwrite().addChange(removal);
+        assertTrue(context.entity().removed());
+    }
+
+
+    @Test
+    @SneakyThrows
+    public void testNotFoundManualAddRedactionAndRemovedHasStateRemoved() {
+
+        DocumentAndEntity context = createNotFoundManualRedaction();
+        IdRemoval removal = IdRemoval.builder().requestDate(OffsetDateTime.now()).build();
+        context.entity().getManualOverwrite().addChange(removal);
+        assertTrue(context.entity().removed());
+    }
+
+
+    private DocumentAndEntity createNotFoundManualRedaction() {
+
         Document document = buildGraph("files/new/VV-919901.pdf");
         // This is important due to PDFTron Web Viewer reordering the content, such that this string is selectable.
         String value = "To: Syngenta Ltd. Jealott’s Hill";
@@ -115,6 +114,7 @@ public class ManualEntityCreationServiceTest extends BuildDocumentIntegrationTes
                 .section("n-a")
                 .rectangle(true)
                 .positions(List.of(new Rectangle(new Point(90, 262), 11, 88, 1), new Rectangle(new Point(90, 247), 11, 131, 1)))
+                .requestDate(OffsetDateTime.now())
                 .textAfter("")
                 .textBefore("")
                 .build();
@@ -136,6 +136,47 @@ public class ManualEntityCreationServiceTest extends BuildDocumentIntegrationTes
         assertEquals(1, redactionLogEntries.size());
         assertEquals(value, redactionLogEntries.get(0).getValue());
         assertEquals(type, redactionLogEntries.get(0).getType());
+        return new DocumentAndEntity(document, notFoundManualEntities.get(0));
+    }
+
+
+    private DocumentAndEntity createFoundManualRedaction() {
+
+        Document document = buildGraph("files/new/VV-919901.pdf");
+        EntityCreationService entityCreationService = new EntityCreationService(entityEnrichmentService);
+
+        List<TextEntity> tempEntities = entityCreationService.byString("To: Syngenta Ltd.", "temp", EntityType.ENTITY, document).toList();
+        assertFalse(tempEntities.isEmpty());
+        var tempEntity = tempEntities.get(0);
+        List<Rectangle> positions = tempEntity.getPositionsOnPagePerPage()
+                .stream()
+                .flatMap(redactionPosition -> redactionPosition.getRectanglePerLine()
+                        .stream()
+                        .map(rectangle2D -> toAnnotationRectangle(rectangle2D, redactionPosition.getPage().getNumber())))
+                .toList();
+
+        ManualRedactionEntry manualRedactionEntry = ManualRedactionEntry.builder()
+                .type("manual")
+                .value(tempEntity.getValue())
+                .reason("reason")
+                .legalBasis("n-a")
+                .section(tempEntity.getDeepestFullyContainingNode().toString())
+                .rectangle(true)
+                .positions(positions)
+                .requestDate(OffsetDateTime.now())
+                .textAfter("")
+                .textBefore("")
+                .build();
+
+        tempEntity.removeFromGraph();
+        assertTrue(document.getEntities().isEmpty());
+
+        List<ManualEntity> notFoundManualEntities = manualEntityCreationService.createRedactionEntitiesIfFoundAndReturnNotFoundEntries(Set.of(manualRedactionEntry),
+                document,
+                TEST_DOSSIER_TEMPLATE_ID);
+        assertTrue(notFoundManualEntities.isEmpty());
+        assertEquals(1, document.getEntities().size());
+        return new DocumentAndEntity(document, document.getEntities().stream().findFirst().get());
     }
 
 
@@ -147,4 +188,9 @@ public class ManualEntityCreationServiceTest extends BuildDocumentIntegrationTes
                 pageNumber);
     }
 
+
+    private record DocumentAndEntity(Document document, IEntity entity) {
+
+    }
+
 }

redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/rules/Cbi11Test.java

@@ -0,0 +1,36 @@
+package com.iqser.red.service.redaction.v1.server.rules;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.wildfly.common.Assert.assertFalse;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import com.iqser.red.service.redaction.v1.server.model.dictionary.Dictionary;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.Document;
+import com.iqser.red.service.redaction.v1.server.utils.Patterns;
+
+public class Cbi11Test extends RulesIntegrationTest {
+
+    @Test
+    public void multiAuthorNameSplittingTest() {
+
+        Document document = buildGraph("files/Minimal Examples/multipleAuthorsInTable.pdf");
+
+        doAnalysis(document, Collections.emptyList());
+
+        List<String> authorNames = document.getEntities().stream().map(Dictionary::splitIntoAuthorNames).flatMap(Collection::stream).toList();
+
+        assertThat(authorNames).containsExactlyInAnyOrder("Cargile", "N.L.", "Ross", "J.A.", "Egli", "Ramsteiner");
+    }
+
+    @Test
+    public void testAndIsNotAnAuthorName() {
+
+        assertFalse(Patterns.AUTHOR_NAME_PATTERN.matcher("and").matches());
+    }
+
+}

redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/rules/RulesIntegrationTest.java

@@ -0,0 +1,80 @@
+package com.iqser.red.service.redaction.v1.server.rules;
+
+import java.util.Collection;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.kie.api.KieServices;
+import org.kie.api.builder.KieBuilder;
+import org.kie.api.builder.KieFileSystem;
+import org.kie.api.builder.KieModule;
+import org.kie.api.runtime.KieContainer;
+import org.kie.api.runtime.KieSession;
+import org.kie.internal.io.ResourceFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+import com.iqser.red.service.redaction.v1.server.document.graph.BuildDocumentIntegrationTest;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.Document;
+import com.iqser.red.service.redaction.v1.server.service.ManualChangesApplicationService;
+import com.iqser.red.service.redaction.v1.server.service.document.EntityCreationService;
+import com.iqser.red.service.redaction.v1.server.service.document.EntityEnrichmentService;
+
+public class RulesIntegrationTest extends BuildDocumentIntegrationTest {
+
+    protected static final String RULES = "drools/rules.drl";
+
+    @Autowired
+    protected EntityEnrichmentService entityEnrichmentService;
+    protected EntityCreationService entityCreationService;
+    protected KieSession kieSession;
+
+    @Qualifier("kieContainer")
+    @Autowired
+    private KieContainer kieContainer;
+
+
+    protected void doAnalysis(Document document, Collection<Object> objectToInsert) {
+
+        kieSession.insert(document);
+        document.streamAllSubNodes().forEach(kieSession::insert);
+        objectToInsert.forEach(kieSession::insert);
+        kieSession.fireAllRules();
+        kieSession.dispose();
+    }
+
+
+    @Configuration
+    @Import(BuildDocumentIntegrationTest.TestConfiguration.class)
+    public static class TestConfiguration {
+
+        @Bean
+        public KieContainer kieContainer() {
+
+            KieServices kieServices = KieServices.Factory.get();
+
+            KieFileSystem kieFileSystem = kieServices.newKieFileSystem();
+            kieFileSystem.write(ResourceFactory.newClassPathResource(RULES));
+            KieBuilder kieBuilder = kieServices.newKieBuilder(kieFileSystem);
+            kieBuilder.buildAll();
+            KieModule kieModule = kieBuilder.getKieModule();
+
+            return kieServices.newKieContainer(kieModule.getReleaseId());
+        }
+
+    }
+
+
+    @BeforeEach
+    public void createServices() {
+
+        kieSession = kieContainer.newKieSession();
+        entityCreationService = new EntityCreationService(entityEnrichmentService, kieSession);
+        ManualChangesApplicationService manualChangesApplicationService = new ManualChangesApplicationService(entityCreationService);
+        kieSession.setGlobal("manualChangesApplicationService", manualChangesApplicationService);
+        kieSession.setGlobal("entityCreationService", entityCreationService);
+    }
+
+}

redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/service/document/UnprocessedChangesServiceTest.java

@@ -167,6 +167,10 @@ public class UnprocessedChangesServiceTest extends AbstractRedactionIntegrationT
         assertEquals(unprocessedNotFoundManualEntity.getColor()[0], 0f);
         assertEquals(unprocessedNotFoundManualEntity.getColor()[1], 0f);
         assertEquals(unprocessedNotFoundManualEntity.getColor()[2], 0f);
-        assertTrue(unprocessedNotFoundManualEntity.getPositions().isEmpty());
+        assertEquals(unprocessedNotFoundManualEntity.getPositions().get(0).getPageNumber(), 1);
+        assertEquals(unprocessedNotFoundManualEntity.getPositions().get(0).getRectangle()[0], 1f);
+        assertEquals(unprocessedNotFoundManualEntity.getPositions().get(0).getRectangle()[1], 1f);
+        assertEquals(unprocessedNotFoundManualEntity.getPositions().get(0).getRectangle()[2], 1f);
+        assertEquals(unprocessedNotFoundManualEntity.getPositions().get(0).getRectangle()[3], 1f);
     }
 }

redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/acceptance_rules.drl

@@ -82,45 +82,45 @@ rule "SYN.1.0: Recommend CTL/BL laboratory that start with BL or CTL"
 //------------------------------------ CBI rules ------------------------------------
 
 // Rule unit: CBI.0
-rule "CBI.0.0: Redact CBI Authors (Non Vertebrate Study)"
+rule "CBI.0.0: Redact CBI Authors (non vertebrate Study)"
     when
-        not FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        not FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $entity: TextEntity(type == "CBI_author", dictionaryEntry)
     then
-        $entity.apply("CBI.0.0", "Author found", "Article 39(e)(3) of Regulation (EC) No 178/2002");
+        $entity.redact("CBI.0.0", "Author found", "Article 39(e)(3) of Regulation (EC) No 178/2002");
     end
 
-rule "CBI.0.1: Redact CBI Authors (Vertebrate Study)"
+rule "CBI.0.1: Redact CBI Authors (vertebrate Study)"
     when
-        FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $entity: TextEntity(type == "CBI_author", dictionaryEntry)
     then
-        $entity.apply("CBI.0.1", "Author found", "Article 39(e)(2) of Regulation (EC) No 178/2002");
+        $entity.redact("CBI.0.1", "Author found", "Article 39(e)(2) of Regulation (EC) No 178/2002");
     end
 
 
 // Rule unit: CBI.1
-rule "CBI.1.0: Don't redact CBI Address (Non Vertebrate Study)"
+rule "CBI.1.0: Do not redact CBI Address (non vertebrate Study)"
     when
-        not FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        not FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $entity: TextEntity(type == "CBI_address", dictionaryEntry)
     then
         $entity.skip("CBI.1.0", "Address found for Non Vertebrate Study");
     end
 
-rule "CBI.1.1: Redact CBI Address (Vertebrate Study)"
+rule "CBI.1.1: Redact CBI Address (vertebrate Study)"
     when
-        FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $entity: TextEntity(type == "CBI_address", dictionaryEntry)
     then
-        $entity.apply("CBI.1.1", "Address found", "Article 39(e)(2) of Regulation (EC) No 178/2002");
+        $entity.redact("CBI.1.1", "Address found", "Article 39(e)(2) of Regulation (EC) No 178/2002");
     end
 
 
 // Rule unit: CBI.2
-rule "CBI.2.0: Don't redact genitive CBI_author"
+rule "CBI.2.0: Do not redact genitive CBI Author"
     when
-        $entity: TextEntity(type == "CBI_author", anyMatch(textAfter, "['’’'ʼˈ´`‘′ʻ’']s"), applied())
+        $entity: TextEntity(type == "CBI_author", anyMatch(textAfter, "['’’'ʼˈ´`‘′ʻ’']s"))
     then
         entityCreationService.byTextRange($entity.getTextRange(), "CBI_author", EntityType.FALSE_POSITIVE, document)
         .ifPresent(falsePositive -> falsePositive.skip("CBI.2.0", "Genitive Author found"));
@@ -128,7 +128,7 @@ rule "CBI.2.0: Don't redact genitive CBI_author"
 
 
 // Rule unit: CBI.7
-rule "CBI.7.0: Do not redact Names and Addresses if published information found in section without tables"
+rule "CBI.7.0: Do not redact Names and Addresses if published information found in Section without tables"
     when
         $section: Section(!hasTables(),
                           hasEntitiesOfType("published_information"),
@@ -146,73 +146,68 @@ rule "CBI.7.0: Do not redact Names and Addresses if published information found
 
 rule "CBI.7.1: Do not redact Names and Addresses if published information found in same table row"
     when
-        $table: Table(hasEntitiesOfType("published_information"),
-                     (hasEntitiesOfType("CBI_author") || hasEntitiesOfType("CBI_address")))
+        $table: Table(hasEntitiesOfType("published_information"), hasEntitiesOfType("CBI_author") || hasEntitiesOfType("CBI_address"))
+        $cellsWithPublishedInformation: TableCell() from $table.streamTableCellsWhichContainType("published_information").toList()
+        $tableCell: TableCell(row == $cellsWithPublishedInformation.row) from $table.streamTableCells().toList()
+        $authorOrAddress: TextEntity(type == "CBI_author" || type == "CBI_address", active()) from $tableCell.getEntities()
     then
-        $table.streamEntitiesWhereRowContainsEntitiesOfType(List.of("CBI_author", "CBI_address"))
-            .forEach(redactionEntity -> {
-                redactionEntity.skipWithReferences(
-                        "CBI.7.1",
-                        "Published Information found in row",
-                        $table.getEntitiesOfTypeInSameRow("published_information", redactionEntity)
-                );
-            });
+        $authorOrAddress.skipWithReferences("CBI.7.1", "Published Information found in row", $table.getEntitiesOfTypeInSameRow("published_information", $authorOrAddress));
     end
 
 
 // Rule unit: CBI.9
-rule "CBI.9.0: Redact all Cell's with Header Author(s) as CBI_author (non vertebrate study)"
+rule "CBI.9.0: Redact all cells with Header Author(s) as CBI_author (non vertebrate study)"
     agenda-group "LOCAL_DICTIONARY_ADDS"
     when
-        not FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        not FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $table: Table(hasHeader("Author(s)"))
     then
         $table.streamTableCellsWithHeader("Author(s)")
             .map(tableCell -> entityCreationService.bySemanticNode(tableCell, "CBI_author", EntityType.ENTITY))
             .filter(Optional::isPresent)
             .map(Optional::get)
-            .forEach(redactionEntity -> redactionEntity.apply("CBI.9.0", "Author(s) found", "Article 39(e)(3) of Regulation (EC) No 178/2002"));
+            .forEach(redactionEntity -> redactionEntity.redact("CBI.9.0", "Author(s) found", "Article 39(e)(3) of Regulation (EC) No 178/2002"));
     end
 
-rule "CBI.9.1: Redact all Cell's with Header Author as CBI_author (non vertebrate study)"
+rule "CBI.9.1: Redact all cells with Header Author as CBI_author (non vertebrate study)"
     agenda-group "LOCAL_DICTIONARY_ADDS"
     when
-        not FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        not FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $table: Table(hasHeader("Author"))
     then
         $table.streamTableCellsWithHeader("Author")
             .map(tableCell -> entityCreationService.bySemanticNode(tableCell, "CBI_author", EntityType.ENTITY))
             .filter(Optional::isPresent)
             .map(Optional::get)
-            .forEach(redactionEntity -> redactionEntity.apply("CBI.9.1", "Author found", "Article 39(e)(3) of Regulation (EC) No 178/2002"));
+            .forEach(redactionEntity -> redactionEntity.redact("CBI.9.1", "Author found", "Article 39(e)(3) of Regulation (EC) No 178/2002"));
     end
 
 
 // Rule unit: CBI.10
-rule "CBI.10.0: Redact all Cell's with Header Author(s) as CBI_author (vertebrate study)"
+rule "CBI.10.0: Redact all cells with Header Author(s) as CBI_author (vertebrate study)"
     agenda-group "LOCAL_DICTIONARY_ADDS"
     when
-        FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $table: Table(hasHeader("Author(s)"))
     then
         $table.streamTableCellsWithHeader("Author(s)")
             .map(tableCell -> entityCreationService.bySemanticNode(tableCell, "CBI_author", EntityType.ENTITY))
             .filter(Optional::isPresent)
             .map(Optional::get)
-            .forEach(redactionEntity -> redactionEntity.apply("CBI.10.0", "Author(s) found", "Article 39(e)(2) of Regulation (EC) No 178/2002"));
+            .forEach(redactionEntity -> redactionEntity.redact("CBI.10.0", "Author(s) found", "Article 39(e)(2) of Regulation (EC) No 178/2002"));
     end
 
-rule "CBI.10.1: Redact all Cell's with Header Author as CBI_author (vertebrate study)"
+rule "CBI.10.1: Redact all cells with Header Author as CBI_author (vertebrate study)"
     agenda-group "LOCAL_DICTIONARY_ADDS"
     when
-        FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $table: Table(hasHeader("Author"))
     then
         $table.streamTableCellsWithHeader("Author")
             .map(tableCell -> entityCreationService.bySemanticNode(tableCell, "CBI_author", EntityType.ENTITY))
             .filter(Optional::isPresent)
             .map(Optional::get)
-            .forEach(redactionEntity -> redactionEntity.apply("CBI.10.1", "Author found", "Article 39(e)(2) of Regulation (EC) No 178/2002"));
+            .forEach(redactionEntity -> redactionEntity.redact("CBI.10.1", "Author found", "Article 39(e)(2) of Regulation (EC) No 178/2002"));
     end
 
 
@@ -223,33 +218,33 @@ rule "CBI.11.0: Recommend all CBI_author entities in Table with Vertebrate Study
     when
         $table: Table(hasHeader("Author(s)") && hasHeader("Vertebrate Study Y/N"))
     then
-        $table.getEntitiesOfType("CBI_author").forEach(entity -> dictionary.addMultipleAuthorsAsRecommendation(entity));
+        $table.getEntitiesOfType("CBI_author").stream().filter(IEntity::applied).forEach(entity -> dictionary.addMultipleAuthorsAsRecommendation(entity));
     end
 
 
 // Rule unit: CBI.16
-rule "CBI.16.0: Add CBI_author with \"et al.\" Regex (non vertebrate study)"
+rule "CBI.16.0: Add CBI_author with \"et al.\" RegEx (non vertebrate study)"
     agenda-group "LOCAL_DICTIONARY_ADDS"
     when
-        not FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        not FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $section: Section(containsString("et al."))
     then
         entityCreationService.byRegex("\\b([A-ZÄÖÜ][^\\s\\.,]+( [A-ZÄÖÜ]{1,2}\\.?)?( ?[A-ZÄÖÜ]\\.?)?) et al\\.?", "CBI_author", EntityType.ENTITY, 1, $section)
             .forEach(entity -> {
-                entity.apply("CBI.16.0", "Author found by \"et al\" regex", "Article 39(e)(3) of Regulation (EC) No 178/2002");
+                entity.redact("CBI.16.0", "Author found by \"et al\" regex", "Article 39(e)(3) of Regulation (EC) No 178/2002");
                 dictionary.recommendEverywhere(entity);
             });
     end
 
-rule "CBI.16.1: Add CBI_author with \"et al.\" Regex (vertebrate study)"
+rule "CBI.16.1: Add CBI_author with \"et al.\" RegEx (vertebrate study)"
     agenda-group "LOCAL_DICTIONARY_ADDS"
     when
-        FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $section: Section(containsString("et al."))
     then
         entityCreationService.byRegex("\\b([A-ZÄÖÜ][^\\s\\.,]+( [A-ZÄÖÜ]{1,2}\\.?)?( ?[A-ZÄÖÜ]\\.?)?) et al\\.?", "CBI_author", EntityType.ENTITY, 1, $section)
             .forEach(entity -> {
-                entity.apply("CBI.16.1", "Author found by \"et al\" regex", "Article 39(e)(2) of Regulation (EC) No 178/2002");
+                entity.redact("CBI.16.1", "Author found by \"et al\" regex", "Article 39(e)(2) of Regulation (EC) No 178/2002");
                 dictionary.recommendEverywhere(entity);
             });
     end
@@ -277,7 +272,7 @@ rule "CBI.17.1: Add recommendation for Addresses in Test Organism sections, with
 rule "CBI.20.0: Redact between \"PERFORMING LABORATORY\" and \"LABORATORY PROJECT ID:\" (non vertebrate study)"
     agenda-group "LOCAL_DICTIONARY_ADDS"
     when
-        not FileAttribute(label == "Vertebrate Study", value == "Yes")
+        not FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $section: Section(!hasTables(), containsString("PERFORMING LABORATORY:"), containsString("LABORATORY PROJECT ID:"))
     then
         entityCreationService.betweenStrings("PERFORMING LABORATORY:", "LABORATORY PROJECT ID:", "CBI_address", EntityType.ENTITY, $section)
@@ -290,12 +285,12 @@ rule "CBI.20.0: Redact between \"PERFORMING LABORATORY\" and \"LABORATORY PROJEC
 rule "CBI.20.1: Redact between \"PERFORMING LABORATORY\" and \"LABORATORY PROJECT ID:\" (vertebrate study)"
     agenda-group "LOCAL_DICTIONARY_ADDS"
     when
-        FileAttribute(label == "Vertebrate Study", value == "Yes")
+        FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $section: Section(!hasTables(), containsString("PERFORMING LABORATORY:"), containsString("LABORATORY PROJECT ID:"))
     then
          entityCreationService.betweenStrings("PERFORMING LABORATORY:", "LABORATORY PROJECT ID:", "CBI_address", EntityType.ENTITY, $section)
          .forEach(laboratoryEntity -> {
-             laboratoryEntity.apply("CBI.20.1", "PERFORMING LABORATORY was found", "Article 39(e)(2) of Regulation (EC) No 178/2002");
+             laboratoryEntity.redact("CBI.20.1", "PERFORMING LABORATORY was found", "Article 39(e)(2) of Regulation (EC) No 178/2002");
              dictionary.recommendEverywhere(laboratoryEntity);
          });
     end
@@ -306,45 +301,45 @@ rule "CBI.20.1: Redact between \"PERFORMING LABORATORY\" and \"LABORATORY PROJEC
 // Rule unit: PII.0
 rule "PII.0.0: Redact all PII (non vertebrate study)"
     when
-        not FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        not FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $pii: TextEntity(type == "PII", dictionaryEntry)
     then
-        $pii.apply("PII.0.0", "Personal Information found", "Article 39(e)(3) of Regulation (EC) No 178/2002");
+        $pii.redact("PII.0.0", "Personal Information found", "Article 39(e)(3) of Regulation (EC) No 178/2002");
     end
 
 rule "PII.0.1: Redact all PII (vertebrate study)"
     when
-        FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $pii: TextEntity(type == "PII", dictionaryEntry)
     then
-        $pii.apply("PII.0.1", "Personal Information found", "Article 39(e)(2) of Regulation (EC) No 178/2002");
+        $pii.redact("PII.0.1", "Personal Information found", "Article 39(e)(2) of Regulation (EC) No 178/2002");
     end
 
 
 // Rule unit: PII.1
 rule "PII.1.0: Redact Emails by RegEx (Non vertebrate study)"
     when
-        not FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        not FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $section: Section(containsString("@"))
     then
         entityCreationService.byRegex("\\b([A-Za-z0-9._%+\\-]+@[A-Za-z0-9.\\-]+\\.[A-Za-z\\-]{1,23}[A-Za-z])\\b", "PII", EntityType.ENTITY, 1, $section)
-            .forEach(emailEntity -> emailEntity.apply("PII.1.0", "Found by Email Regex", "Article 39(e)(3) of Regulation (EC) No 178/2002"));
+            .forEach(emailEntity -> emailEntity.redact("PII.1.0", "Found by Email Regex", "Article 39(e)(3) of Regulation (EC) No 178/2002"));
     end
 
 rule "PII.1.1: Redact Emails by RegEx (vertebrate study)"
     when
-        FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $section: Section(containsString("@"))
     then
         entityCreationService.byRegex("\\b([A-Za-z0-9._%+\\-]+@[A-Za-z0-9.\\-]+\\.[A-Za-z\\-]{1,23}[A-Za-z])\\b", "PII", EntityType.ENTITY, 1, $section)
-            .forEach(emailEntity -> emailEntity.apply("PII.1.1", "Found by Email Regex", "Article 39(e)(3) of Regulation (EC) No 178/2002"));
+            .forEach(emailEntity -> emailEntity.redact("PII.1.1", "Found by Email Regex", "Article 39(e)(2) of Regulation (EC) No 178/2002"));
     end
 
 
 // Rule unit: PII.2
 rule "PII.2.0: Redact Phone and Fax by RegEx (non vertebrate study)"
     when
-        not FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        not FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $section: Section(containsString("Contact") ||
                               containsString("Telephone") ||
                               containsString("Phone") ||
@@ -357,12 +352,12 @@ rule "PII.2.0: Redact Phone and Fax by RegEx (non vertebrate study)"
                               containsString("Fer"))
     then
         entityCreationService.byRegexIgnoreCase("\\b(contact|telephone|phone|ph\\.|fax|tel|ter|mobile|fel|fer)[a-zA-Z\\s]{0,10}[:.\\s]{0,3}([\\+\\d\\(][\\s\\d\\(\\)\\-\\/\\.]{4,100}\\d)\\b", "PII", EntityType.ENTITY, 2, $section)
-            .forEach(contactEntity -> contactEntity.apply("PII.2.0", "Found by Phone and Fax Regex", "Article 39(e)(3) of Regulation (EC) No 178/2002"));
+            .forEach(contactEntity -> contactEntity.redact("PII.2.0", "Found by Phone and Fax Regex", "Article 39(e)(3) of Regulation (EC) No 178/2002"));
     end
 
 rule "PII.2.1: Redact Phone and Fax by RegEx (vertebrate study)"
     when
-        FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $section: Section(containsString("Contact") ||
                               containsString("Telephone") ||
                               containsString("Phone") ||
@@ -375,45 +370,27 @@ rule "PII.2.1: Redact Phone and Fax by RegEx (vertebrate study)"
                               containsString("Fer"))
     then
         entityCreationService.byRegexIgnoreCase("\\b(contact|telephone|phone|ph\\.|fax|tel|ter|mobile|fel|fer)[a-zA-Z\\s]{0,10}[:.\\s]{0,3}([\\+\\d\\(][\\s\\d\\(\\)\\-\\/\\.]{4,100}\\d)\\b", "PII", EntityType.ENTITY, 2, $section)
-            .forEach(contactEntity -> contactEntity.apply("PII.2.1", "Found by Phone and Fax Regex", "Article 39(e)(2) of Regulation (EC) No 178/2002"));
+            .forEach(contactEntity -> contactEntity.redact("PII.2.1", "Found by Phone and Fax Regex", "Article 39(e)(2) of Regulation (EC) No 178/2002"));
     end
 
 
 // Rule unit: PII.9
-rule "PII.9.0: Redact between \"AUTHOR(S)\" and \"COMPLETION DATE\" (non vertebrate study)"
+rule "PII.9.0: Redact between \"AUTHOR(S)\" and \"(STUDY) COMPLETION DATE\" (non vertebrate study)"
     when
-        not FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
-        $section: Section(!hasTables(), containsString("AUTHOR(S):"), containsString("COMPLETION DATE:"), !containsString("STUDY COMPLETION DATE:"))
+        not FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
+        $document: Document(containsStringIgnoreCase("AUTHOR(S)"), containsAnyStringIgnoreCase("COMPLETION DATE", "STUDY COMPLETION DATE"))
     then
-        entityCreationService.betweenStrings("AUTHOR(S):", "COMPLETION DATE:", "PII", EntityType.ENTITY, $section)
-         .forEach(authorEntity -> authorEntity.apply("PII.9.0", "AUTHOR(S) was found", "Article 39(e)(3) of Regulation (EC) No 178/2002"));
+        entityCreationService.shortestBetweenAnyStringIgnoreCase(List.of("AUTHOR(S)", "AUTHOR(S):"), List.of("COMPLETION DATE", "COMPLETION DATE:", "STUDY COMPLETION DATE", "STUDY COMPLETION DATE:"), "PII", EntityType.ENTITY, $document)
+         .forEach(authorEntity -> authorEntity.redact("PII.9.0", "AUTHOR(S) was found", "Article 39(e)(3) of Regulation (EC) No 178/2002"));
     end
 
-rule "PII.9.1: Redact between \"AUTHOR(S)\" and \"STUDY COMPLETION DATE\" (non vertebrate study)"
+rule "PII.9.1: Redact between \"AUTHOR(S)\" and \"(STUDY) COMPLETION DATE\" (vertebrate study)"
     when
-        FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
-        $section: Section(!hasTables(), containsString("AUTHOR(S):"), containsString("COMPLETION DATE:"), !containsString("STUDY COMPLETION DATE:"))
+        FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
+        $document: Document(containsStringIgnoreCase("AUTHOR(S)"), containsAnyStringIgnoreCase("COMPLETION DATE", "STUDY COMPLETION DATE"))
     then
-        entityCreationService.betweenStrings("AUTHOR(S):", "COMPLETION DATE:", "PII", EntityType.ENTITY, $section)
-         .forEach(authorEntity -> authorEntity.apply("PII.9.1", "AUTHOR(S) was found", "Article 39(e)(2) of Regulation (EC) No 178/2002"));
-    end
-
-rule "PII.9.2: Redact between \"AUTHOR(S)\" and \"COMPLETION DATE\" (non vertebrate study)"
-    when
-        not FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
-        $section: Section(!hasTables(), containsString("AUTHOR(S):"), containsString("STUDY COMPLETION DATE:"))
-    then
-        entityCreationService.betweenStrings("AUTHOR(S):", "STUDY COMPLETION DATE:", "PII", EntityType.ENTITY, $section)
-         .forEach(authorEntity -> authorEntity.apply("PII.9.2", "AUTHOR(S) was found", "Article 39(e)(3) of Regulation (EC) No 178/2002"));
-    end
-
-rule "PII.9.3: Redact between \"AUTHOR(S)\" and \"STUDY COMPLETION DATE\" (vertebrate study)"
-    when
-        FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
-        $section: Section(!hasTables(), containsString("AUTHOR(S):"), containsString("STUDY COMPLETION DATE:"))
-    then
-        entityCreationService.betweenStrings("AUTHOR(S):", "STUDY COMPLETION DATE:", "PII", EntityType.ENTITY, $section)
-         .forEach(authorEntity -> authorEntity.apply("PII.9.3", "AUTHOR(S) was found", "Article 39(e)(2) of Regulation (EC) No 178/2002"));
+        entityCreationService.shortestBetweenAnyStringIgnoreCase(List.of("AUTHOR(S)", "AUTHOR(S):"), List.of("COMPLETION DATE", "COMPLETION DATE:", "STUDY COMPLETION DATE", "STUDY COMPLETION DATE:"), "PII", EntityType.ENTITY, $document)
+        .forEach(authorEntity -> authorEntity.redact("PII.9.1", "AUTHOR(S) was found", "Article 39(e)(2) of Regulation (EC) No 178/2002"));
     end
 
 
@@ -432,28 +409,36 @@ rule "ETC.0.0: Purity Hint"
 // Rule unit: ETC.2
 rule "ETC.2.0: Redact signatures (non vertebrate study)"
     when
-        not FileAttribute(label == "Vertebrate Study", value == "Yes")
+        not FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $signature: Image(imageType == ImageType.SIGNATURE)
     then
-        $signature.apply("ETC.2.0", "Signature Found", "Article 39(e)(3) of Regulation (EC) No 178/2002");
+        $signature.redact("ETC.2.0", "Signature Found", "Article 39(e)(3) of Regulation (EC) No 178/2002");
+    end
+
+rule "ETC.2.1: Redact signatures (vertebrate study)"
+    when
+        FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
+        $signature: Image(imageType == ImageType.SIGNATURE)
+    then
+        $signature.redact("ETC.2.1", "Signature Found", "Article 39(e)(2) of Regulation (EC) No 178/2002");
     end
 
 
 // Rule unit: ETC.3
-rule "ETC.3.0: Redact logos (vertebrate study)"
+rule "ETC.3.0: Skip logos (non vertebrate study)"
     when
-        not FileAttribute(label == "Vertebrate Study", value == "Yes")
+        not FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $logo: Image(imageType == ImageType.LOGO)
     then
-        $logo.apply("ETC.3.0", "Logo Found", "Article 39(e)(3) of Regulation (EC) No 178/2002");
+        $logo.skip("ETC.3.0", "Logo Found");
     end
 
-rule "ETC.3.1: Redact logos (non vertebrate study)"
+rule "ETC.3.1: Redact logos (vertebrate study)"
     when
-        FileAttribute(label == "Vertebrate Study", value == "Yes")
+        FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $logo: Image(imageType == ImageType.LOGO)
     then
-        $logo.apply("ETC.3.1", "Logo Found", "Article 39(e)(2) of Regulation (EC) No 178/2002");
+        $logo.redact("ETC.3.1", "Logo Found", "Article 39(e)(2) of Regulation (EC) No 178/2002");
     end
 
 
@@ -471,7 +456,7 @@ rule "ETC.5.0: Ignore dossier_redaction entries if confidentiality is not 'confi
 //------------------------------------ AI rules ------------------------------------
 
 // Rule unit: AI.0
-rule "AI.0.0: add all NER Entities of type CBI_author"
+rule "AI.0.0: Add all NER Entities of type CBI_author"
     salience 999
     when
         nerEntities: NerEntities(hasEntitiesOfType("CBI_author"))
@@ -482,7 +467,7 @@ rule "AI.0.0: add all NER Entities of type CBI_author"
 
 
 // Rule unit: AI.1
-rule "AI.1.0: combine and add NER Entities as CBI_address"
+rule "AI.1.0: Combine and add NER Entities as CBI_address"
     salience 999
     when
         nerEntities: NerEntities(hasEntitiesOfType("ORG") || hasEntitiesOfType("STREET") || hasEntitiesOfType("CITY"))
@@ -491,7 +476,7 @@ rule "AI.1.0: combine and add NER Entities as CBI_address"
     end
 
 
-//------------------------------------ Manual redaction rules ------------------------------------
+//------------------------------------ Manual changes rules ------------------------------------
 
 // Rule unit: MAN.0
 rule "MAN.0.0: Apply manual resize redaction"
@@ -525,7 +510,7 @@ rule "MAN.0.1: Apply manual resize redaction"
 rule "MAN.1.0: Apply id removals that are valid and not in forced redactions to Entity"
     salience 128
     when
-        $idRemoval: IdRemoval($id: annotationId, status == AnnotationStatus.APPROVED)
+        $idRemoval: IdRemoval($id: annotationId, !removeFromDictionary, !removeFromAllDossiers, status == AnnotationStatus.APPROVED)
         $entityToBeRemoved: TextEntity(matchesAnnotationId($id))
     then
         $entityToBeRemoved.getManualOverwrite().addChange($idRemoval);
@@ -636,7 +621,7 @@ rule "MAN.4.1: Apply legal basis change"
 //------------------------------------ Entity merging rules ------------------------------------
 
 // Rule unit: X.0
-rule "X.0.0: remove Entity contained by Entity of same type"
+rule "X.0.0: Remove Entity contained by Entity of same type"
     salience 65
     when
         $larger: TextEntity($type: type, $entityType: entityType, active())
@@ -648,7 +633,7 @@ rule "X.0.0: remove Entity contained by Entity of same type"
 
 
 // Rule unit: X.1
-rule "X.1.0: merge intersecting Entities of same type"
+rule "X.1.0: Merge intersecting Entities of same type"
     salience 64
     when
         $first: TextEntity($type: type, $entityType: entityType, !resized(), active())
@@ -664,7 +649,7 @@ rule "X.1.0: merge intersecting Entities of same type"
 
 
 // Rule unit: X.2
-rule "X.2.0: remove Entity of type ENTITY when contained by FALSE_POSITIVE"
+rule "X.2.0: Remove Entity of type ENTITY when contained by FALSE_POSITIVE"
     salience 64
     when
         $falsePositive: TextEntity($type: type, entityType == EntityType.FALSE_POSITIVE, active())
@@ -677,7 +662,7 @@ rule "X.2.0: remove Entity of type ENTITY when contained by FALSE_POSITIVE"
 
 
 // Rule unit: X.3
-rule "X.3.0: remove Entity of type RECOMMENDATION when contained by FALSE_RECOMMENDATION"
+rule "X.3.0: Remove Entity of type RECOMMENDATION when contained by FALSE_RECOMMENDATION"
     salience 64
     when
         $falseRecommendation: TextEntity($type: type, entityType == EntityType.FALSE_RECOMMENDATION, active())
@@ -689,7 +674,7 @@ rule "X.3.0: remove Entity of type RECOMMENDATION when contained by FALSE_RECOMM
 
 
 // Rule unit: X.4
-rule "X.4.0: remove Entity of type RECOMMENDATION when intersected by ENTITY with same type"
+rule "X.4.0: Remove Entity of type RECOMMENDATION when intersected by ENTITY with same type"
     salience 256
     when
         $entity: TextEntity($type: type, (entityType == EntityType.ENTITY || entityType == EntityType.HINT), active())
@@ -702,7 +687,7 @@ rule "X.4.0: remove Entity of type RECOMMENDATION when intersected by ENTITY wit
 
 
 // Rule unit: X.5
-rule "X.5.0: remove Entity of type RECOMMENDATION when contained by ENTITY"
+rule "X.5.0: Remove Entity of type RECOMMENDATION when contained by ENTITY"
     salience 256
     when
         $entity: TextEntity((entityType == EntityType.ENTITY || entityType == EntityType.HINT), active())
@@ -714,7 +699,7 @@ rule "X.5.0: remove Entity of type RECOMMENDATION when contained by ENTITY"
 
 
 // Rule unit: X.6
-rule "X.6.0: remove Entity of lower rank, when contained by by entity of type ENTITY"
+rule "X.6.0: Remove Entity of lower rank, when contained by by entity of type ENTITY"
     salience 32
     when
         $higherRank: TextEntity($type: type, (entityType == EntityType.ENTITY || entityType == EntityType.HINT), active())
@@ -729,7 +714,7 @@ rule "X.6.1: remove Entity of higher rank, when intersected by entity of type EN
     salience 32
     when
         $higherRank: TextEntity($type: type, $value: value, (entityType == EntityType.ENTITY || entityType == EntityType.HINT), active())
-        $lowerRank: TextEntity(intersects($higherRank), type != $type, dictionary.getDictionaryRank(type) < dictionary.getDictionaryRank($type), !hasManualChanges(), active(), $lowerRank.getValue().length() > $value.length())
+        $lowerRank: TextEntity(intersects($higherRank), type != $type, (entityType == EntityType.ENTITY || entityType == EntityType.HINT), dictionary.getDictionaryRank(type) < dictionary.getDictionaryRank($type), !hasManualChanges(), active(), $lowerRank.getValue().length() > $value.length())
     then
         $higherRank.getIntersectingNodes().forEach(node -> update(node));
         $higherRank.remove("X.6.1", "remove Entity of higher rank, when intersected by entity of type ENTITY and length of lower rank Entity is bigger than the higher rank Entity");
@@ -740,7 +725,7 @@ rule "X.6.1: remove Entity of higher rank, when intersected by entity of type EN
 //------------------------------------ File attributes rules ------------------------------------
 
 // Rule unit: FA.1
-rule "FA.1.0: remove duplicate FileAttributes"
+rule "FA.1.0: Remove duplicate FileAttributes"
     salience 64
     when
         $fileAttribute: FileAttribute($label: label, $value: value)
@@ -761,7 +746,7 @@ rule "LDS.0.0: Run local dictionary search"
     then
         entityCreationService.bySearchImplementation($dictionaryModel.getLocalSearch(), $dictionaryModel.getType(), EntityType.RECOMMENDATION, document)
             .forEach(entity ->  {
-                Collection<MatchedRule> matchedRules = $dictionaryModel.getLocalEntriesWithMatchedRules().get(entity.getValue());
-                entity.addMatchedRules(matchedRules);
+                Collection<MatchedRule> matchedRules = $dictionaryModel.getMatchedRulesForLocalDictionaryEntry(entity.getValue());
+                matchedRules.forEach(matchedRule -> entity.addMatchedRule(matchedRule.asSkippedIfApplied()));
             });
     end

redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/adama-pilot.drl

@@ -1,916 +0,0 @@
-package drools
-
-import static java.lang.String.format;
-import static com.iqser.red.service.redaction.v1.server.utils.RedactionSearchUtility.anyMatch;
-import static com.iqser.red.service.redaction.v1.server.utils.RedactionSearchUtility.exactMatch;
-
-import java.util.List;
-import java.util.LinkedList;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.Collection;
-import java.util.stream.Stream;
-import java.util.Optional;
-
-import com.iqser.red.service.redaction.v1.server.model.document.*;
-import com.iqser.red.service.redaction.v1.server.model.document.TextRange;
-import com.iqser.red.service.redaction.v1.server.model.document.entity.*;
-import com.iqser.red.service.redaction.v1.server.model.document.entity.EntityType;
-import com.iqser.red.service.redaction.v1.server.model.document.entity.MatchedRule;
-import com.iqser.red.service.redaction.v1.server.model.document.entity.TextEntity
-import com.iqser.red.service.redaction.v1.server.model.document.entity.MatchedRule
-import com.iqser.red.service.redaction.v1.server.model.document.nodes.*;
-import com.iqser.red.service.redaction.v1.server.model.document.nodes.Section;
-import com.iqser.red.service.redaction.v1.server.model.document.nodes.Table;
-import com.iqser.red.service.redaction.v1.server.model.document.nodes.SemanticNode;
-import com.iqser.red.service.redaction.v1.server.model.document.nodes.Document;
-import com.iqser.red.service.redaction.v1.server.model.document.nodes.Paragraph;
-import com.iqser.red.service.redaction.v1.server.model.document.nodes.Image;
-import com.iqser.red.service.redaction.v1.server.model.document.nodes.ImageType;
-import com.iqser.red.service.redaction.v1.server.model.document.nodes.Page;
-import com.iqser.red.service.redaction.v1.server.model.document.nodes.Headline;
-import com.iqser.red.service.redaction.v1.server.model.document.nodes.SectionIdentifier;
-import com.iqser.red.service.redaction.v1.server.model.document.nodes.Footer;
-import com.iqser.red.service.redaction.v1.server.model.document.nodes.Header;
-import com.iqser.red.service.redaction.v1.server.model.document.nodes.NodeType;
-import com.iqser.red.service.redaction.v1.server.model.document.textblock.*;
-import com.iqser.red.service.redaction.v1.server.model.document.textblock.TextBlock;
-import com.iqser.red.service.redaction.v1.server.model.document.textblock.TextBlockCollector;
-import com.iqser.red.service.redaction.v1.server.model.document.textblock.AtomicTextBlock;
-import com.iqser.red.service.redaction.v1.server.model.document.textblock.ConcatenatedTextBlock;
-import com.iqser.red.service.redaction.v1.server.model.NerEntities;
-import com.iqser.red.service.redaction.v1.server.model.dictionary.Dictionary;
-import com.iqser.red.service.redaction.v1.server.model.dictionary.DictionaryModel;
-import com.iqser.red.service.redaction.v1.server.service.document.EntityCreationService;
-import com.iqser.red.service.redaction.v1.server.service.ManualChangesApplicationService;
-import com.iqser.red.service.redaction.v1.server.utils.RedactionSearchUtility;
-
-import com.iqser.red.service.persistence.service.v1.api.shared.model.FileAttribute;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.Engine;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualResizeRedaction;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.IdRemoval;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualForceRedaction;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualRecategorization;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualLegalBasisChange;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.AnnotationStatus;
-
-global Document document
-global EntityCreationService entityCreationService
-global ManualChangesApplicationService manualChangesApplicationService
-global Dictionary dictionary
-
-//------------------------------------ queries ------------------------------------
-
-query "getFileAttributes"
-    $fileAttribute: FileAttribute()
-    end
-
-//---------------------------------------------------------------------------
-
-rule "H.0.0 retract table of contents page"
-    when
-        $page: Page(getMainBodyTextBlock().getSearchText().contains("........") || (getMainBodyTextBlock().getSearchText().contains("APPENDICES") && getMainBodyTextBlock().getSearchText().contains("TABLES")))
-        $node: SemanticNode(onPage($page.getNumber()), !onPage($page.getNumber() -1), getType() != NodeType.IMAGE)
-    then
-        retract($node);
-    end
-
-
-rule "H.0.0: Ignore Table of Contents"
-    salience 10
-    when
-        $tocHeadline: Headline(containsString("CONTENTS"))
-        $page: Page() from $tocHeadline.getParent().getPages()
-        $node: SemanticNode(this != $tocHeadline, getType() != NodeType.IMAGE, onPage($page.getNumber()), !onPage($page.getNumber() -1))
-    then
-        retract($node);
-    end
-
-//---------------------- CUSTOMER RULES -----------------------------------------------------
-
-rule "DOC.1.0: Adama number"
-    when
-       $paragraph: Paragraph(
-            containsString("R-")
-            && onPage(1)
-        )
-    then
-        entityCreationService
-            .byRegex(
-                "0?0?R\\-[l\\d]{3,5}\\p{Lu}?",
-                "adama_number",
-                EntityType.ENTITY,
-                $paragraph)
-            .findFirst()
-            .ifPresent(entity -> {
-                entity.apply("DOC.1.0", "Adama number found");
-                insert(FileAttribute.builder().label("Adama").value(entity.getValue()).build());
-            });
-    end
-
-rule "DOC.2.0: Study number by keyword"
-    when
-        $studyNumberKeyword: String() from List.of(
-            "BioChem project number:",
-            "DTI Report.",
-            "Final Report N°",
-            "LPT Report No.",
-            "Project identity",
-            "Project No.:",
-            "Protocol No.",
-            "PTRL Report No.",
-            "SLI Report #",
-            "SLI Study #",
-            "Specht Analytical Study Plan",
-            "SPL PROJECT NUMBER:",
-            "Study code:",
-            "Study N°",
-            "Study-No.",
-            "Study No:",
-            "Study number:",
-            "Study Number"
-            )
-        $excludeKeyWords: String() from List.of(
-            "Sponsors study number"
-        )
-        $paragraph: Paragraph(
-            containsStringIgnoreCase($studyNumberKeyword)
-            && !containsStringIgnoreCase($excludeKeyWords)
-            && onPage(1)
-        )
-    then
-        entityCreationService
-            .lineAfterStringIgnoreCase($studyNumberKeyword,"study_number",EntityType.ENTITY,$paragraph)
-            .findFirst()
-            .ifPresent(entity ->
-                {
-                    entity.apply("DOC.2.0", "Study number found");
-                    insert(FileAttribute.builder().label("Study").value(entity.getValue()).build());
-                }
-            );
-    end
-
-rule "DOC.2.1: Study number in header"
-    when
-        $studyNumberKeyword: String() from List.of(
-            "Final Report"
-            )
-        $header: Header(
-            containsStringIgnoreCase($studyNumberKeyword)
-            && onPage(2)
-        )
-    then
-        entityCreationService
-            .lineAfterStringIgnoreCase($studyNumberKeyword,"study_number",EntityType.ENTITY,$header)
-            .findFirst()
-            .ifPresent(entity ->
-                {
-                    entity.apply("DOC.2.1", "Study number found");
-                    insert(FileAttribute.builder().label("Study").value(entity.getValue()).build());
-                }
-            );
-    end
-
-rule "DOC.2.2: Project Number with Section Title"
-    when
-        $title: String() from List.of(
-            "LABORATORY PROJECT ID."
-        )
-        $paragraph: Paragraph(
-            containsStringIgnoreCase($title)
-            && onPage(1)
-        )
-    then
-        entityCreationService.semanticNodeAfterString(
-            $paragraph,
-            "LABORATORY PROJECT ID.",
-            "study_number",
-            EntityType.ENTITY
-            )
-            .ifPresent(
-                entity -> entity.apply("DOC.2.2","Study number by title found.")
-            );
-    end
-
-
-rule "DOC.3.0: Batch Material Number"
-    when
-        $hlKeyword: String() from List.of(
-            "formulation",
-            "formulation:",
-            "test item",
-            "test substance",
-            "test material"
-        )
-        $hlNoKeyword: String() from List.of(
-            "Preparation"
-        )
-        $headline: Headline(
-            containsStringIgnoreCase($hlKeyword)
-            && !containsStringIgnoreCase($hlNoKeyword)
-        )
-        $batchKeyword: String() from List.of(
-            "Batch number",
-            "Batch number:",
-            "Batch number* :",
-            "batch no",
-            "Batch no.",
-            "Lot.n.:"
-            )
-        $section: Section(
-            containsStringIgnoreCase($batchKeyword)
-            && (
-                getHeadline() == $headline
-                || (
-                    containsStringIgnoreCase($hlKeyword)
-                    && !containsStringIgnoreCase($hlNoKeyword)
-                )
-            )
-        )
-    then
-        entityCreationService
-            .lineAfterStringIgnoreCase($batchKeyword,"batch_material_number",EntityType.ENTITY,$section)
-            .forEach(
-                entity -> {
-                    entity.apply("DOC.3.0","Batch number found.");
-                    insert(FileAttribute.builder().label("Batch No").value(entity.getValue()).build());
-                }
-            );
-    end
-
-rule "DOC.4.0: study title as headline"
-    when
-        $hlKeyword: String() from List.of(
-            "Analyitical Method",
-            "Residues",
-            "Acute",
-            "Process",
-            "Application",
-            "Review",
-            "Examination",
-            "Toxicity",
-            "Method Validation",
-            "Explosion",
-            "Sensitisation",
-            "Determination",
-            "Test"
-        )
-        $hlNotKeyword: String() from List.of(
-            "Laboratoire",
-            "Laboratorien"
-        )
-        $species: TextEntity(type=="species")
-        $headline: Headline(
-            onPage(1)
-            && (
-                containsStringIgnoreCase($hlKeyword)
-                || entities contains $species
-            )
-            && !containsStringIgnoreCase($hlNotKeyword)
-        )
-    then
-        entityCreationService.bySemanticNode($headline, "title", EntityType.ENTITY).ifPresent(entity -> {
-            entity.apply("DOC.4.0", "Title found", "n-a");
-            insert(FileAttribute.builder().label("Title").value(entity.getValue()).build());
-        });
-     end
-
-rule "DOC.4.1: study title on cover page between sections"
-    when
-        not TextEntity(type=="title", applied())
-        $page: Page(
-            getNumber() == 1,
-            getMainBodyTextBlock().getSearchText().toLowerCase() (contains "Study Title".toLowerCase())
-            || getMainBodyTextBlock().getSearchText().toLowerCase() (contains "Title".toLowerCase())
-            || getMainBodyTextBlock().getSearchText().toLowerCase() (contains "Report 92 50 12 136".toLowerCase())
-            || getMainBodyTextBlock().getSearchText().toLowerCase() (contains "Final Report".toLowerCase())
-            || getMainBodyTextBlock().getSearchText().toLowerCase() (contains "Final Study Report".toLowerCase()),
-            getMainBodyTextBlock().getSearchText().toLowerCase() (contains "Guideline".toLowerCase())
-            || getMainBodyTextBlock().getSearchText().toLowerCase() (contains "Study Identification".toLowerCase())
-            // too many false positives due to term in header and cover page || getMainBodyTextBlock().getSearchText().toLowerCase() (contains "Final Report".toLowerCase())
-            || getMainBodyTextBlock().getSearchText().toLowerCase() (contains "Data Requirement".toLowerCase())
-            || getMainBodyTextBlock().getSearchText().toLowerCase() (contains "Submitted".toLowerCase())
-            || getMainBodyTextBlock().getSearchText().toLowerCase() (contains "Test Guideline".toLowerCase())
-            || getMainBodyTextBlock().getSearchText().toLowerCase() (contains "Study Director".toLowerCase())
-            || getMainBodyTextBlock().getSearchText().toLowerCase() (contains "Author".toLowerCase())
-            || getMainBodyTextBlock().getSearchText().toLowerCase() (contains "Including:".toLowerCase())
-            || getMainBodyTextBlock().getSearchText().toLowerCase() (contains "Laboratory Investigations".toLowerCase())
-            || getMainBodyTextBlock().getSearchText().toLowerCase() (contains "Test Article".toLowerCase())
-            || getMainBodyTextBlock().getSearchText().toLowerCase() (contains "HLS".toLowerCase())
-            || getMainBodyTextBlock().getSearchText().toLowerCase() (contains "Official Journal".toLowerCase())
-            )
-        then
-            List<String> startStrings = List.of("Study Title", "Study Title:", "Title", "Final Report", "Final Study Report", "Report 92 50 12 136");
-            List<String> stopStrings = List.of("Guideline", "Guidelines", "Study Identification", "Data Requirement", "Submitted", "Test Guideline",
-                                               "Study Director", "Author", "Including:", "Laboratory Investigations", "Test Article", "HLS", "Official Journal");
-            // too many false positives due to term in header and cover page  stopBoundaries.addAll(RedactionSearchUtility.findTextRangesByStringIgnoreCase("Final Report", $page.getMainBodyTextBlock()));
-
-            entityCreationService.shortestBetweenAnyString(startStrings, stopStrings, "title", EntityType.ENTITY, document).forEach(entity -> {
-                entity.apply("DOC.4.1", "Study title found", "n-a");
-                insert(FileAttribute.builder().label("Title").value(entity.getValue()).build());
-            });
-    end
-
-rule "DOC.4.2: Study title by paragraph including species on cover page"
-    when
-        not TextEntity(type=="title", applied())
-        $species: TextEntity(type=="species")
-        $paragraph: Paragraph(
-            onPage(1)
-            && entities contains $species
-        )
-    then
-        entityCreationService.bySemanticNode(
-            $paragraph,
-            "title",
-            EntityType.ENTITY
-        )
-        .ifPresent(entity -> {
-            entity.apply("DOC.4.2","Title with species found on cover page");
-            insert(FileAttribute.builder().label("Title").value(entity.getValue()).build());
-        });
-    end
-
-rule "DOC.5.0: Study Director on cover page in a paragraph on line"
-    when
-        not TextEntity(type=="author", applied())
-        $sectionTitle: String() from List.of(
-            "Study Director/Analyst:",
-            "Study Director:",
-            "Study Director :",
-            "Author:",
-            "Author "
-        )
-        $paragraph: Paragraph(
-            onPage(1)
-            && containsStringIgnoreCase($sectionTitle)
-        )
-    then
-        entityCreationService
-            .lineAfterStringIgnoreCase(
-                $sectionTitle,
-                "author",
-                EntityType.ENTITY,
-                $paragraph
-            )
-            .forEach(entity -> {
-                entity.apply("DOC.5.0","Study Director on cover page found");
-                insert(FileAttribute.builder().label("Author").value(entity.getValue()).build());
-            });
-    end
-
-rule "DOC.5.1: Author/Study Director listing on cover page"
-    when
-        not TextEntity(type=="author", applied())
-        $page: Page(
-            getNumber() == 1
-            && getMainBodyTextBlock().getSearchText().toLowerCase() (
-                contains "Author(s)".toLowerCase()
-                || contains "Authors".toLowerCase()
-                || contains "Author".toLowerCase()
-                || contains "Study Director".toLowerCase()
-                )
-            && getMainBodyTextBlock().getSearchText().toLowerCase() (
-                contains "Test Facility".toLowerCase()
-                || contains "Testing Facility".toLowerCase()
-                || contains "Study Initiation".toLowerCase()
-                || contains "Study Initiated".toLowerCase()
-                || contains "Study completed on".toLowerCase()
-                || contains "Study completion".toLowerCase()
-                || contains "Study amended".toLowerCase()
-                || contains "Report Issue Date".toLowerCase()
-                || contains "Document Date".toLowerCase()
-                || contains "Date".toLowerCase()
-                || contains "Defitrace".toLowerCase() // this should be solved with Organisation Entity as a TextRange
-                )
-            )
-    then
-        List<TextRange> startBoundaries = new LinkedList<>();
-        startBoundaries.addAll(RedactionSearchUtility.findTextRangesByStringIgnoreCase("Author(s)", $page.getMainBodyTextBlock()));
-        startBoundaries.addAll(RedactionSearchUtility.findTextRangesByStringIgnoreCase("Authors", $page.getMainBodyTextBlock()));
-        startBoundaries.addAll(RedactionSearchUtility.findTextRangesByStringIgnoreCase("Author", $page.getMainBodyTextBlock()));
-        startBoundaries.addAll(RedactionSearchUtility.findTextRangesByStringIgnoreCase("Study Director", $page.getMainBodyTextBlock()));
-
-        List<TextRange> stopBoundaries = new LinkedList<>();
-        stopBoundaries.addAll(RedactionSearchUtility.findTextRangesByStringIgnoreCase("Test Facility", $page.getMainBodyTextBlock()));
-        stopBoundaries.addAll(RedactionSearchUtility.findTextRangesByStringIgnoreCase("Testing Facility", $page.getMainBodyTextBlock()));
-        stopBoundaries.addAll(RedactionSearchUtility.findTextRangesByStringIgnoreCase("Study Initiation", $page.getMainBodyTextBlock()));
-        stopBoundaries.addAll(RedactionSearchUtility.findTextRangesByStringIgnoreCase("Study Initiated", $page.getMainBodyTextBlock()));
-        stopBoundaries.addAll(RedactionSearchUtility.findTextRangesByStringIgnoreCase("Study completed on", $page.getMainBodyTextBlock()));
-        stopBoundaries.addAll(RedactionSearchUtility.findTextRangesByStringIgnoreCase("Study completion", $page.getMainBodyTextBlock()));
-        stopBoundaries.addAll(RedactionSearchUtility.findTextRangesByStringIgnoreCase("Study amended", $page.getMainBodyTextBlock()));
-        stopBoundaries.addAll(RedactionSearchUtility.findTextRangesByStringIgnoreCase("Report Issue Date", $page.getMainBodyTextBlock()));
-        stopBoundaries.addAll(RedactionSearchUtility.findTextRangesByStringIgnoreCase("Document Date", $page.getMainBodyTextBlock()));
-        stopBoundaries.addAll(RedactionSearchUtility.findTextRangesByStringIgnoreCase("Date", $page.getMainBodyTextBlock()));
-        stopBoundaries.addAll(RedactionSearchUtility.findTextRangesByStringIgnoreCase("Defitrace", $page.getMainBodyTextBlock()));
-
-        entityCreationService.betweenTextRanges(startBoundaries, stopBoundaries, "author", EntityType.ENTITY, document).forEach(entity -> {
-            entity.apply("DOC.5.1", "Author list found", "n-a");
-            insert(FileAttribute.builder().label("Author").value(entity.getValue()).build());
-        });
-     end
-
-rule "DOC.5.2: Study Director on cover page in a paragraph"
-    when
-        not TextEntity(type=="author", applied())
-        $sectionTitle: String() from List.of(
-            "Study Director"
-        )
-        $node: Paragraph(
-            onPage(1)
-            && containsStringIgnoreCase($sectionTitle)
-        )
-    then
-        entityCreationService
-            .byRegexWithLineBreaksIgnoreCase(
-                "\\n([\\w\\(\\) .]{5,30})\\n",
-                "author",
-                EntityType.ENTITY,
-                1,
-                $node
-            )
-            .filter(
-                entity -> !entity.getValue().toLowerCase().contains($sectionTitle.toLowerCase())
-            )
-            .forEach(entity -> {
-                entity.apply("DOC.5.2","Study Director on cover page found");
-                insert(FileAttribute.builder().label("Author").value(entity.getValue()).build());
-            });
-    end
-
-rule "DOC.5.3: Study Director on cover page in a section"
-    when
-        not TextEntity(type=="author", applied())
-        $page: Page(getNumber() == 1)
-        $sectionTitle: String() from List.of(
-            "Study Director:",
-            "Study Director",
-            "Study Director/Author"
-        )
-        $node: Section(
-            onPage(1)
-            && containsStringIgnoreCase($sectionTitle)
-        )
-    then
-        entityCreationService
-            .byRegexWithLineBreaksIgnoreCase(
-                $sectionTitle+"\\n([\\w\\(\\) .]{5,30})\\n",
-                "author",
-                EntityType.ENTITY,
-                1,
-                $node
-            )
-            .filter(
-                entity -> entity.getPages().contains($page)
-            )
-            .forEach(entity -> {
-                entity.apply("DOC.5.3","Study Director on cover page found");
-                insert(FileAttribute.builder().label("Author").value(entity.getValue()).build());
-            });
-
-        entityCreationService
-            .lineAfterStringIgnoreCase($sectionTitle,"author",EntityType.ENTITY,$node)
-            .forEach(entity -> {
-                entity.apply("DOC.5.2","Study Director on cover page found");
-                insert(FileAttribute.builder().label("Author").value(entity.getValue()).build());
-            });
-    end
-
-rule "DOC.5.4: Author in document section with relevant headline"
-        when
-            not TextEntity(type == "author", applied())
-            $hlKeyword: String() from List.of(
-                "sponsor",
-                "personnel",
-                "staff involved",
-                "study details",
-                "management of study"
-            )
-            $keyword: String() from List.of(
-                "Study Director",
-                "Studv Director",
-                "Study Director:",
-                "Study Director :",
-                "stray Birector:",
-                "Author:",
-                "Author ",
-                "Author(s)"
-            )
-            $section: Section(
-                containsStringIgnoreCase($keyword)
-                && getHeadline().containsStringIgnoreCase($hlKeyword)
-            )
-        then
-            entityCreationService
-                .lineAfterStringIgnoreCase(
-                    $keyword,
-                    "author",
-                    EntityType.ENTITY,
-                    $section
-                )
-                .findFirst()
-                .ifPresent(
-                    entity -> {
-                        entity.apply("DOC.5.4","Author found.");
-                        insert(FileAttribute.builder().label("Author").value(entity.getValue()).build());
-                    }
-                );
-        end
-
-rule "DOC.5.5: Study Director from signature on compliance statement"
-    when
-        not TextEntity(type=="author", applied())
-        $sectionTitle: String() from List.of(
-            "Compliance Statement",
-            "Study Compliance",
-            "Statement of Compliance",
-            "Statement of Study Compliance",
-            "Contributing Scientist",
-            "Compliance with Good Laboratory Practice",
-            "Signatures and Approval"
-        )
-        $role: String() from List.of("Study Director")
-        $node: Section(
-            containsStringIgnoreCase($sectionTitle)
-            && containsStringIgnoreCase($role)
-            && getFirstPage().getNumber() > 4
-        )
-    then
-        entityCreationService
-            .byRegexWithLineBreaksIgnoreCase(
-                "([\\w\\(\\) .,]{5,35})[\\w\\/ ]{0,30}\\n"+$role,
-                "author",
-                EntityType.ENTITY,
-                1,
-                $node
-            )
-            .forEach(entity -> {
-                entity.apply("DOC.5.5","Study Director on compliance page found");
-                insert(FileAttribute.builder().label("Author").value(entity.getValue()).build());
-            });
-    end
-
-rule "DOC.5.6: Study Director from section with relevant headlining responsibility"
-    when
-        not TextEntity(type=="author", applied())
-        $sectionTitle: String() from List.of("Responsible personnel")
-        $role: String() from List.of("Study Director")
-        $node: Section(
-            getHeadline().containsStringIgnoreCase($sectionTitle)
-            && containsStringIgnoreCase($role)
-        )
-        $paragraph: Paragraph(
-            containsStringIgnoreCase($role)
-        )
-    then
-        entityCreationService
-            .lineAfterStringIgnoreCase(
-                $role,
-                "author",
-                EntityType.ENTITY,
-                $paragraph
-            )
-            .forEach(entity -> {
-                entity.apply("DOC.5.6","Study Director on compliance page found");
-                insert(FileAttribute.builder().label("Author").value(entity.getValue()).build());
-            });
-    end
-
-rule "DOC.5.7: Study Director from section with study director in headline"
-    when
-        not TextEntity(type=="author", applied())
-        $sectionTitle: String() from List.of("Study Director")
-        $section: Section(
-            getHeadline().containsStringIgnoreCase($sectionTitle)
-        )
-    then
-        entityCreationService
-            .bySemanticNodeParagraphsOnly(
-                $section,
-                "author",
-                EntityType.ENTITY
-            )
-            .forEach(entity -> {
-                entity.apply("DOC.5.7","Study Director found by headline");
-                insert(FileAttribute.builder().label("Author").value(entity.getValue()).build());
-            });
-    end
-
-rule "DOC.5.9: Remove skipped authors"
-    salience 9999
-    when
-        $author: TextEntity(type=="author", !applied())
-    then
-        $author.removeFromGraph();
-    end
-
-rule "DOC.14.0: GLP Study"
-     when
-        $hlKeywords: String() from List.of(
-            "Good Laboratory Practice",
-            "GLP"
-        )
-        $headline: Headline(
-            containsString($hlKeywords)
-        )
-        $compliance: String() from List.of(
-            "conducted in compliance with",
-            "conducted in accordance with",
-            "conducted and reported in compliance with",
-            "carried out in accordance with",
-            "meets the requirements",
-            "performed in compliance with"
-        )
-        $section: Section(
-            containsStringIgnoreCase($compliance)
-            && getHeadline() == $headline
-        )
-     then
-         entityCreationService.bySemanticNode($headline, "glp_study", EntityType.ENTITY).ifPresent(entity -> {
-             entity.apply("DOC.14.0", "GLP Study found", "n-a");
-             insert(FileAttribute.builder().label("GLP").value("TRUE").build());
-         });
-     end
-
-rule "DOC.14.1: GLP Study"
-     when
-        $compliance: String() from List.of(
-            "conducted in compliance with",
-            "conducted in accordance with",
-            "conducted and reported in compliance with",
-            "carried out in accordance with",
-            "meets the requirements",
-            "performed in compliance with",
-            "conduct"
-        )
-        $principle: String() from List.of(
-            "40 CFR Part 160",
-            "40CFR160",
-            "Good Laboratory Practice",
-            "FIFRA Good Laboratory Practice Standards"
-        )
-        $paragraph: Paragraph(
-            containsStringIgnoreCase($compliance)
-            && containsStringIgnoreCase($principle)
-        )
-     then
-        entityCreationService.betweenStringsIncludeStartAndEndIgnoreCase(
-            $compliance,
-            $principle,
-            "glp_study",
-            EntityType.ENTITY,
-            $paragraph
-            )
-            .forEach(entity -> {
-                entity.apply("DOC.14.1", "GLP Study found", "n-a");
-                insert(FileAttribute.builder().label("GLP").value("TRUE").build());
-            }
-        );
-     end
-
-//------------------------------------ Manual redaction rules ------------------------------------
-
-// Rule unit: MAN.0
-rule "MAN.0.0: Apply manual resize redaction"
-    salience 128
-    when
-        $resizeRedaction: ManualResizeRedaction($id: annotationId, status == AnnotationStatus.APPROVED, $requestDate: requestDate)
-        not ManualResizeRedaction(annotationId == $id, requestDate.isBefore($requestDate))
-        $entityToBeResized: TextEntity(matchesAnnotationId($id))
-    then
-        manualChangesApplicationService.resizeEntityAndReinsert($entityToBeResized, $resizeRedaction);
-        retract($resizeRedaction);
-        update($entityToBeResized);
-        $entityToBeResized.getIntersectingNodes().forEach(node -> update(node));
-    end
-
-rule "MAN.0.1: Apply manual resize redaction"
-    salience 128
-    when
-        $resizeRedaction: ManualResizeRedaction($id: annotationId, status == AnnotationStatus.APPROVED, $requestDate: requestDate)
-        not ManualResizeRedaction(annotationId == $id, requestDate.isBefore($requestDate))
-        $imageToBeResized: Image(id == $id)
-    then
-        manualChangesApplicationService.resizeImage($imageToBeResized, $resizeRedaction);
-        retract($resizeRedaction);
-        update($imageToBeResized);
-        update($imageToBeResized.getParent());
-    end
-
-
-// Rule unit: MAN.1
-rule "MAN.1.0: Apply id removals that are valid and not in forced redactions to Entity"
-    salience 128
-    when
-        $idRemoval: IdRemoval($id: annotationId, status == AnnotationStatus.APPROVED)
-        $entityToBeRemoved: TextEntity(matchesAnnotationId($id))
-    then
-        $entityToBeRemoved.getManualOverwrite().addChange($idRemoval);
-        update($entityToBeRemoved);
-        retract($idRemoval);
-        $entityToBeRemoved.getIntersectingNodes().forEach(node -> update(node));
-    end
-
-rule "MAN.1.1: Apply id removals that are valid and not in forced redactions to Image"
-    salience 128
-    when
-        $idRemoval: IdRemoval($id: annotationId, status == AnnotationStatus.APPROVED)
-        $imageEntityToBeRemoved: Image($id == id)
-    then
-        $imageEntityToBeRemoved.getManualOverwrite().addChange($idRemoval);
-        update($imageEntityToBeRemoved);
-        retract($idRemoval);
-        update($imageEntityToBeRemoved.getParent());
-    end
-
-
-// Rule unit: MAN.2
-rule "MAN.2.0: Apply force redaction"
-    salience 128
-    when
-        $force: ManualForceRedaction($id: annotationId, status == AnnotationStatus.APPROVED)
-        $entityToForce: TextEntity(matchesAnnotationId($id))
-    then
-        $entityToForce.getManualOverwrite().addChange($force);
-        update($entityToForce);
-        $entityToForce.getIntersectingNodes().forEach(node -> update(node));
-        retract($force);
-    end
-
-rule "MAN.2.1: Apply force redaction to images"
-    salience 128
-    when
-        $force: ManualForceRedaction($id: annotationId, status == AnnotationStatus.APPROVED)
-        $imageToForce: Image(id == $id)
-    then
-        $imageToForce.getManualOverwrite().addChange($force);
-        update($imageToForce);
-        update($imageToForce.getParent());
-        retract($force);
-    end
-
-
-// Rule unit: MAN.3
-rule "MAN.3.0: Apply entity recategorization"
-    salience 128
-    when
-        $recategorization: ManualRecategorization($id: annotationId, $type: type, status == AnnotationStatus.APPROVED, $requestDate: requestDate)
-        not ManualRecategorization($id == annotationId, requestDate.isBefore($requestDate))
-        $entityToBeRecategorized: TextEntity(matchesAnnotationId($id), type != $type)
-    then
-        $entityToBeRecategorized.getIntersectingNodes().forEach(node -> update(node));
-        manualChangesApplicationService.recategorize($entityToBeRecategorized, $recategorization);
-        retract($recategorization);
-        // Entity is copied and inserted, so the old entity needs to be retracted to avoid duplication.
-        retract($entityToBeRecategorized);
-    end
-
-
-rule "MAN.3.1: Apply entity recategorization of same type"
-    salience 128
-    when
-        $recategorization: ManualRecategorization($id: annotationId, $type: type, status == AnnotationStatus.APPROVED, $requestDate: requestDate)
-        not ManualRecategorization($id == annotationId, requestDate.isBefore($requestDate))
-        $entityToBeRecategorized: TextEntity(matchesAnnotationId($id), type == $type)
-    then
-        $entityToBeRecategorized.getManualOverwrite().addChange($recategorization);
-        retract($recategorization);
-    end
-
-
-rule "MAN.3.2: Apply image recategorization"
-    salience 128
-    when
-        $recategorization: ManualRecategorization($id: annotationId, status == AnnotationStatus.APPROVED, $requestDate: requestDate)
-        not ManualRecategorization($id == annotationId, requestDate.isBefore($requestDate))
-        $imageToBeRecategorized: Image($id == id)
-    then
-        manualChangesApplicationService.recategorize($imageToBeRecategorized, $recategorization);
-        update($imageToBeRecategorized);
-        update($imageToBeRecategorized.getParent());
-        retract($recategorization);
-    end
-
-
-// Rule unit: MAN.4
-rule "MAN.4.0: Apply legal basis change"
-    salience 128
-    when
-        $legalbasisChange: ManualLegalBasisChange($id: annotationId, status == AnnotationStatus.APPROVED)
-        $imageToBeRecategorized: Image($id == id)
-    then
-        $imageToBeRecategorized.getManualOverwrite().addChange($legalbasisChange);
-    end
-
-rule "MAN.4.1: Apply legal basis change"
-    salience 128
-    when
-        $legalBasisChange: ManualLegalBasisChange($id: annotationId, status == AnnotationStatus.APPROVED)
-        $entityToBeChanged: TextEntity(matchesAnnotationId($id))
-    then
-        $entityToBeChanged.getManualOverwrite().addChange($legalBasisChange);
-    end
-
-
-//------------------------------------ Entity merging rules ------------------------------------
-
-// Rule unit: X.0
-rule "X.0.0: remove Entity contained by Entity of same type"
-    salience 65
-    when
-        $larger: TextEntity($type: type, $entityType: entityType, active())
-        $contained: TextEntity(containedBy($larger), type == $type, entityType == $entityType, this != $larger, !hasManualChanges(), active())
-    then
-        $contained.remove("X.0.0", "remove Entity contained by Entity of same type");
-        retract($contained);
-    end
-
-
-// Rule unit: X.2
-rule "X.2.0: remove Entity of type ENTITY when contained by FALSE_POSITIVE"
-    salience 64
-    when
-        $falsePositive: TextEntity($type: type, entityType == EntityType.FALSE_POSITIVE, active())
-        $entity: TextEntity(containedBy($falsePositive), type == $type, (entityType == EntityType.ENTITY || entityType == EntityType.HINT), !hasManualChanges(), active())
-    then
-        $entity.getIntersectingNodes().forEach(node -> update(node));
-        $entity.remove("X.2.0", "remove Entity of type ENTITY when contained by FALSE_POSITIVE");
-        retract($entity)
-    end
-
-
-// Rule unit: X.3
-rule "X.3.0: remove Entity of type RECOMMENDATION when contained by FALSE_RECOMMENDATION"
-    salience 64
-    when
-        $falseRecommendation: TextEntity($type: type, entityType == EntityType.FALSE_RECOMMENDATION, active())
-        $recommendation: TextEntity(containedBy($falseRecommendation), type == $type, entityType == EntityType.RECOMMENDATION, !hasManualChanges(), active())
-    then
-        $recommendation.remove("X.3.0", "remove Entity of type RECOMMENDATION when contained by FALSE_RECOMMENDATION");
-        retract($recommendation);
-    end
-
-
-// Rule unit: X.4
-rule "X.4.0: remove Entity of type RECOMMENDATION when intersected by ENTITY with same type"
-    salience 256
-    when
-        $entity: TextEntity($type: type, (entityType == EntityType.ENTITY || entityType == EntityType.HINT), active())
-        $recommendation: TextEntity(intersects($entity), type == $type, entityType == EntityType.RECOMMENDATION, !hasManualChanges(), active())
-    then
-        $entity.addEngines($recommendation.getEngines());
-        $recommendation.remove("X.4.0", "remove Entity of type RECOMMENDATION when intersected by ENTITY with same type");
-        retract($recommendation);
-    end
-
-
-// Rule unit: X.5
-rule "X.5.0: remove Entity of type RECOMMENDATION when contained by ENTITY"
-    salience 256
-    when
-        $entity: TextEntity((entityType == EntityType.ENTITY || entityType == EntityType.HINT), active())
-        $recommendation: TextEntity(containedBy($entity), entityType == EntityType.RECOMMENDATION, !hasManualChanges(), active())
-    then
-        $recommendation.remove("X.5.0", "remove Entity of type RECOMMENDATION when contained by ENTITY");
-        retract($recommendation);
-    end
-
-
-// Rule unit: X.7
-rule "X.7.0: remove all images"
-    salience 512
-    when
-        $image: Image(imageType != ImageType.OCR, !hasManualChanges())
-    then
-        $image.remove("X.7.0", "remove all images");
-        retract($image);
-    end
-
-
-//------------------------------------ File attributes rules ------------------------------------
-
-// Rule unit: FA.1
-rule "FA.1.0: remove duplicate FileAttributes"
-
-    salience 64
-    when
-        $fileAttribute: FileAttribute($label: label, $value: value)
-        $duplicate: FileAttribute(this != $fileAttribute, label == $label, value == $value)
-    then
-        retract($duplicate);
-    end
-
-
-// Rule unit: LDS.0
-rule "LDS.0.0: Run local dictionary search"
-    agenda-group "LOCAL_DICTIONARY_ADDS"
-    salience -999
-    when
-        $dictionaryModel: DictionaryModel(!localEntriesWithMatchedRules.isEmpty()) from dictionary.getDictionaryModels()
-    then
-        entityCreationService.bySearchImplementation($dictionaryModel.getLocalSearch(), $dictionaryModel.getType(), EntityType.RECOMMENDATION, document)
-            .forEach(entity ->  {
-                Collection<MatchedRule> matchedRules = $dictionaryModel.getLocalEntriesWithMatchedRules().get(entity.getValue());
-                entity.addMatchedRules(matchedRules);
-            });
-    end

redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/all_redact_manager_rules.drl

@@ -71,7 +71,7 @@ query "getFileAttributes"
 // Rule unit: SYN.0
 rule "SYN.0.0: Redact if CTL/* or BL/* was found (Non Vertebrate Study)"
     when
-        not FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        not FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $section: Section(containsString("CTL/") || containsString("BL/"))
     then
         Stream.concat(
@@ -97,7 +97,7 @@ rule "SYN.1.0: Recommend CTL/BL laboratory that start with BL or CTL"
 // Rule unit: CBI.0
 rule "CBI.0.0: Redact CBI Authors (non vertebrate Study)"
     when
-        not FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        not FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $entity: TextEntity(type == "CBI_author", dictionaryEntry)
     then
         $entity.redact("CBI.0.0", "Author found", "Article 39(e)(3) of Regulation (EC) No 178/2002");
@@ -105,7 +105,7 @@ rule "CBI.0.0: Redact CBI Authors (non vertebrate Study)"
 
 rule "CBI.0.1: Redact CBI Authors (vertebrate Study)"
     when
-        FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $entity: TextEntity(type == "CBI_author", dictionaryEntry)
     then
         $entity.redact("CBI.0.1", "Author found", "Article 39(e)(2) of Regulation (EC) No 178/2002");
@@ -115,7 +115,7 @@ rule "CBI.0.1: Redact CBI Authors (vertebrate Study)"
 // Rule unit: CBI.1
 rule "CBI.1.0: Do not redact CBI Address (non vertebrate Study)"
     when
-        not FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        not FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $entity: TextEntity(type == "CBI_address", dictionaryEntry)
     then
         $entity.skip("CBI.1.0", "Address found for Non Vertebrate Study");
@@ -123,7 +123,7 @@ rule "CBI.1.0: Do not redact CBI Address (non vertebrate Study)"
 
 rule "CBI.1.1: Redact CBI Address (vertebrate Study)"
     when
-        FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $entity: TextEntity(type == "CBI_address", dictionaryEntry)
     then
         $entity.redact("CBI.1.1", "Address found", "Article 39(e)(2) of Regulation (EC) No 178/2002");
@@ -133,7 +133,7 @@ rule "CBI.1.1: Redact CBI Address (vertebrate Study)"
 // Rule unit: CBI.2
 rule "CBI.2.0: Do not redact genitive CBI Author"
     when
-        $entity: TextEntity(type == "CBI_author", anyMatch(textAfter, "['’’'ʼˈ´`‘′ʻ’']s"), applied())
+        $entity: TextEntity(type == "CBI_author", anyMatch(textAfter, "['’’'ʼˈ´`‘′ʻ’']s"))
     then
         entityCreationService.byTextRange($entity.getTextRange(), "CBI_author", EntityType.FALSE_POSITIVE, document)
         .ifPresent(falsePositive -> falsePositive.skip("CBI.2.0", "Genitive Author found"));
@@ -329,17 +329,12 @@ rule "CBI.7.0: Do not redact Names and Addresses if published information found
 
 rule "CBI.7.1: Do not redact Names and Addresses if published information found in same table row"
     when
-        $table: Table(hasEntitiesOfType("published_information"),
-                     (hasEntitiesOfType("CBI_author") || hasEntitiesOfType("CBI_address")))
+        $table: Table(hasEntitiesOfType("published_information"), hasEntitiesOfType("CBI_author") || hasEntitiesOfType("CBI_address"))
+        $cellsWithPublishedInformation: TableCell() from $table.streamTableCellsWhichContainType("published_information").toList()
+        $tableCell: TableCell(row == $cellsWithPublishedInformation.row) from $table.streamTableCells().toList()
+        $authorOrAddress: TextEntity(type == "CBI_author" || type == "CBI_address", active()) from $tableCell.getEntities()
     then
-        $table.streamEntitiesWhereRowContainsEntitiesOfType(List.of("CBI_author", "CBI_address"))
-            .forEach(redactionEntity -> {
-                redactionEntity.skipWithReferences(
-                        "CBI.7.1",
-                        "Published Information found in row",
-                        $table.getEntitiesOfTypeInSameRow("published_information", redactionEntity)
-                );
-            });
+        $authorOrAddress.skipWithReferences("CBI.7.1", "Published Information found in row", $table.getEntitiesOfTypeInSameRow("published_information", $authorOrAddress));
     end
 
 
@@ -380,7 +375,7 @@ rule "CBI.8.1: Redacted because table row contains must_redact entity"
 rule "CBI.9.0: Redact all cells with Header Author(s) as CBI_author (non vertebrate study)"
     agenda-group "LOCAL_DICTIONARY_ADDS"
     when
-        not FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        not FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $table: Table(hasHeader("Author(s)"))
     then
         $table.streamTableCellsWithHeader("Author(s)")
@@ -393,7 +388,7 @@ rule "CBI.9.0: Redact all cells with Header Author(s) as CBI_author (non vertebr
 rule "CBI.9.1: Redact all cells with Header Author as CBI_author (non vertebrate study)"
     agenda-group "LOCAL_DICTIONARY_ADDS"
     when
-        not FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        not FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $table: Table(hasHeader("Author"))
     then
         $table.streamTableCellsWithHeader("Author")
@@ -408,7 +403,7 @@ rule "CBI.9.1: Redact all cells with Header Author as CBI_author (non vertebrate
 rule "CBI.10.0: Redact all cells with Header Author(s) as CBI_author (vertebrate study)"
     agenda-group "LOCAL_DICTIONARY_ADDS"
     when
-        FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $table: Table(hasHeader("Author(s)"))
     then
         $table.streamTableCellsWithHeader("Author(s)")
@@ -421,7 +416,7 @@ rule "CBI.10.0: Redact all cells with Header Author(s) as CBI_author (vertebrate
 rule "CBI.10.1: Redact all cells with Header Author as CBI_author (vertebrate study)"
     agenda-group "LOCAL_DICTIONARY_ADDS"
     when
-        FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $table: Table(hasHeader("Author"))
     then
         $table.streamTableCellsWithHeader("Author")
@@ -439,49 +434,66 @@ rule "CBI.11.0: Recommend all CBI_author entities in Table with Vertebrate Study
     when
         $table: Table(hasHeader("Author(s)") && hasHeader("Vertebrate Study Y/N"))
     then
-        $table.getEntitiesOfType("CBI_author").forEach(entity -> dictionary.addMultipleAuthorsAsRecommendation(entity));
+        $table.getEntitiesOfType("CBI_author").stream().filter(IEntity::applied).forEach(entity -> dictionary.addMultipleAuthorsAsRecommendation(entity));
     end
 
 
 // Rule unit: CBI.12
-rule "CBI.12.0: Add all cells with Header Author(s) as CBI_author"
-    salience 1
+rule "CBI.12.0: Redact and recommend TableCell with header 'Author' or 'Author(s)' and header 'Vertebrate study Y/N' with value 'Yes' (non vertebrate study)"
+    agenda-group "LOCAL_DICTIONARY_ADDS"
     when
-        $table: Table(hasHeader("Author(s)") || hasHeader("Author"))
+        not FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
+        $table: Table(hasHeader("Author(s)") || hasHeader("Author"), hasHeaderIgnoreCase("Vertebrate Study Y/N"))
+        TableCell(header, containsAnyStringIgnoreCase("Author", "Author(s)"), $authorCol: col) from $table.streamHeaders().toList()
+        TableCell(header, containsStringIgnoreCase("Vertebrate study Y/N"), $vertebrateCol: col) from $table.streamHeaders().toList()
+        TableCell(!header, containsAnyString("Yes", "Y"), $rowWithYes: row) from $table.streamCol($vertebrateCol).toList()
+        $authorCell: TableCell(row == $rowWithYes) from $table.streamCol($authorCol).toList()
     then
-        Stream.concat(
-            $table.streamTableCellsWithHeader("Author(s)"),
-            $table.streamTableCellsWithHeader("Author")
-        )
-            .map(tableCell -> entityCreationService.bySemanticNode(tableCell, "CBI_author", EntityType.ENTITY))
-            .filter(Optional::isPresent)
-            .map(Optional::get)
-            .forEach(redactionEntity -> redactionEntity.skip("CBI.12.0", "Author(s) header found"));
+
+        entityCreationService.bySemanticNode($authorCell, "CBI_author", EntityType.ENTITY)
+          .ifPresent(authorEntity -> {
+              authorEntity.redact("CBI.12.0", "Redacted because it's row belongs to a vertebrate study", "Article 39(e)(3) of Regulation (EC) No 178/2002");
+              dictionary.addMultipleAuthorsAsRecommendation(authorEntity);
+          });
+
     end
 
-rule "CBI.12.1: Do not redact CBI_author, if its row contains a cell with header \"Vertebrate study Y/N\" and value No"
+rule "CBI.12.1: Redact and recommend TableCell with header 'Author' or 'Author(s)' and header 'Vertebrate study Y/N' with value 'Yes' (vertebrate study)"
+    agenda-group "LOCAL_DICTIONARY_ADDS"
     when
-        $table: Table(hasRowWithHeaderAndValue("Vertebrate study Y/N", "N") || hasRowWithHeaderAndValue("Vertebrate study Y/N", "No"))
+        FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
+        $table: Table(hasHeader("Author(s)") || hasHeader("Author"), hasHeaderIgnoreCase("Vertebrate Study Y/N"))
+        TableCell(header, containsAnyStringIgnoreCase("Author", "Author(s)"), $authorCol: col) from $table.streamHeaders().toList()
+        TableCell(header, containsStringIgnoreCase("Vertebrate study Y/N"), $vertebrateCol: col) from $table.streamHeaders().toList()
+        TableCell(!header, containsAnyString("Yes", "Y"), $rowWithYes: row) from $table.streamCol($vertebrateCol).toList()
+        $authorCell: TableCell(row == $rowWithYes) from $table.streamCol($authorCol).toList()
     then
-        $table.streamEntitiesWhereRowHasHeaderAndAnyValue("Vertebrate study Y/N", List.of("N", "No"))
-            .filter(redactionEntity -> redactionEntity.isAnyType(List.of("CBI_author", "CBI_address")))
-            .forEach(authorEntity -> authorEntity.skip("CBI.12.1", "Not redacted because it's row does not belong to a vertebrate study"));
+
+        entityCreationService.bySemanticNode($authorCell, "CBI_author", EntityType.ENTITY)
+          .ifPresent(authorEntity -> {
+              authorEntity.redact("CBI.12.1", "Redacted because it's row belongs to a vertebrate study", "Article 39(e)(2) of Regulation (EC) No 178/2002");
+              dictionary.addMultipleAuthorsAsRecommendation(authorEntity);
+          });
+
     end
 
-rule "CBI.12.2: Redact CBI_author, if its row contains a cell with header \"Vertebrate study Y/N\" and value Yes"
+rule "CBI.12.2: Skip TableCell with header 'Author' or 'Author(s)' and header 'Vertebrate study Y/N' with value 'No'"
     when
-        $table: Table(hasRowWithHeaderAndValue("Vertebrate study Y/N", "Y") || hasRowWithHeaderAndValue("Vertebrate study Y/N", "Yes"))
+        $table: Table(hasHeader("Author(s)") || hasHeader("Author"), hasHeaderIgnoreCase("Vertebrate Study Y/N"))
+        TableCell(header, containsAnyStringIgnoreCase("Author", "Author(s)"), $authorCol: col) from $table.streamHeaders().toList()
+        TableCell(header, containsStringIgnoreCase("Vertebrate study Y/N"), $vertebrateCol: col) from $table.streamHeaders().toList()
+        TableCell(!header, containsAnyString("No", "N"), $rowWithNo: row) from $table.streamCol($vertebrateCol).toList()
+        $authorCell: TableCell(row == $rowWithNo) from $table.streamCol($authorCol).toList()
     then
-        $table.streamEntitiesWhereRowHasHeaderAndAnyValue("Vertebrate study Y/N", List.of("Y", "Yes"))
-            .filter(redactionEntity -> redactionEntity.isAnyType(List.of("CBI_author", "CBI_address")))
-            .forEach(authorEntity -> authorEntity.redact("CBI.12.2", "Redacted because it's row belongs to a vertebrate study", "Reg (EC) No 1107/2009 Art. 63 (2g)"));
+        entityCreationService.bySemanticNode($authorCell, "CBI_author", EntityType.ENTITY)
+          .ifPresent(authorEntity -> authorEntity.skip("CBI.12.2", "Not redacted because it's row does not belong to a vertebrate study"));
     end
 
 
 // Rule unit: CBI.13
 rule "CBI.13.0: Ignore CBI Address recommendations"
     when
-        not FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        not FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $entity: TextEntity(type == "CBI_address", entityType == EntityType.RECOMMENDATION)
     then
         $entity.ignore("CBI.13.0", "Ignore CBI Address Recommendations");
@@ -549,7 +561,7 @@ rule "CBI.15.1: Redact CBI_author and CBI_address if row contains \"determinatio
 rule "CBI.16.0: Add CBI_author with \"et al.\" RegEx (non vertebrate study)"
     agenda-group "LOCAL_DICTIONARY_ADDS"
     when
-        not FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        not FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $section: Section(containsString("et al."))
     then
         entityCreationService.byRegex("\\b([A-ZÄÖÜ][^\\s\\.,]+( [A-ZÄÖÜ]{1,2}\\.?)?( ?[A-ZÄÖÜ]\\.?)?) et al\\.?", "CBI_author", EntityType.ENTITY, 1, $section)
@@ -562,7 +574,7 @@ rule "CBI.16.0: Add CBI_author with \"et al.\" RegEx (non vertebrate study)"
 rule "CBI.16.1: Add CBI_author with \"et al.\" RegEx (vertebrate study)"
     agenda-group "LOCAL_DICTIONARY_ADDS"
     when
-        FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $section: Section(containsString("et al."))
     then
         entityCreationService.byRegex("\\b([A-ZÄÖÜ][^\\s\\.,]+( [A-ZÄÖÜ]{1,2}\\.?)?( ?[A-ZÄÖÜ]\\.?)?) et al\\.?", "CBI_author", EntityType.ENTITY, 1, $section)
@@ -628,7 +640,7 @@ rule "CBI.19.0: Expand CBI_author entities with salutation prefix"
 rule "CBI.20.0: Redact between \"PERFORMING LABORATORY\" and \"LABORATORY PROJECT ID:\" (non vertebrate study)"
     agenda-group "LOCAL_DICTIONARY_ADDS"
     when
-        not FileAttribute(label == "Vertebrate Study", value == "Yes")
+        not FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $section: Section(!hasTables(), containsString("PERFORMING LABORATORY:"), containsString("LABORATORY PROJECT ID:"))
     then
         entityCreationService.betweenStrings("PERFORMING LABORATORY:", "LABORATORY PROJECT ID:", "CBI_address", EntityType.ENTITY, $section)
@@ -641,7 +653,7 @@ rule "CBI.20.0: Redact between \"PERFORMING LABORATORY\" and \"LABORATORY PROJEC
 rule "CBI.20.1: Redact between \"PERFORMING LABORATORY\" and \"LABORATORY PROJECT ID:\" (vertebrate study)"
     agenda-group "LOCAL_DICTIONARY_ADDS"
     when
-        FileAttribute(label == "Vertebrate Study", value == "Yes")
+        FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $section: Section(!hasTables(), containsString("PERFORMING LABORATORY:"), containsString("LABORATORY PROJECT ID:"))
     then
          entityCreationService.betweenStrings("PERFORMING LABORATORY:", "LABORATORY PROJECT ID:", "CBI_address", EntityType.ENTITY, $section)
@@ -651,10 +663,11 @@ rule "CBI.20.1: Redact between \"PERFORMING LABORATORY\" and \"LABORATORY PROJEC
          });
     end
 
+
 // Rule unit: CBI.21
 rule "CBI.21.0: Redact short Authors section (non vertebrate study)"
     when
-        not FileAttribute(label == "Vertebrate Study", value == "Yes")
+        not FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $section: Section(containsAnyStringIgnoreCase("author(s)", "author", "authors"), length() < 50, getTreeId().get(0) <= 20) //TODO: evaluate the reason of this rule
         not TextEntity(type == "CBI_author", engines contains Engine.NER) from $section.getEntities()
     then
@@ -666,7 +679,7 @@ rule "CBI.21.0: Redact short Authors section (non vertebrate study)"
 
 rule "CBI.21.1: Redact short Authors section (vertebrate study)"
     when
-        FileAttribute(label == "Vertebrate Study", value == "Yes")
+        FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $section: Section(containsAnyStringIgnoreCase("author(s)", "author", "authors"), length() < 50, getTreeId().get(0) <= 20) //TODO: evaluate the reason of this rule
         not TextEntity(type == "CBI_author", engines contains Engine.NER) from $section.getEntities()
     then
@@ -680,7 +693,7 @@ rule "CBI.21.1: Redact short Authors section (vertebrate study)"
 // Rule unit: CBI.22
 rule "CBI.22.0: Redact Addresses in Reference Tables for vertebrate studies in non-vertebrate documents"
     when
-        not FileAttribute(label == "Vertebrate Study", value == "Yes")
+        not FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $table: Table(hasHeader("Vertebrate study Y/N"), hasRowWithHeaderAndValue("Vertebrate study Y/N", "Y") || hasRowWithHeaderAndValue("Vertebrate study Y/N", "Yes"))
     then
         $table.streamEntitiesWhereRowHasHeaderAndAnyValue("Vertebrate study Y/N", List.of("Y", "Yes"))
@@ -694,7 +707,7 @@ rule "CBI.22.0: Redact Addresses in Reference Tables for vertebrate studies in n
 // Rule unit: PII.0
 rule "PII.0.0: Redact all PII (non vertebrate study)"
     when
-        not FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        not FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $pii: TextEntity(type == "PII", dictionaryEntry)
     then
         $pii.redact("PII.0.0", "Personal Information found", "Article 39(e)(3) of Regulation (EC) No 178/2002");
@@ -702,7 +715,7 @@ rule "PII.0.0: Redact all PII (non vertebrate study)"
 
 rule "PII.0.1: Redact all PII (vertebrate study)"
     when
-        FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $pii: TextEntity(type == "PII", dictionaryEntry)
     then
         $pii.redact("PII.0.1", "Personal Information found", "Article 39(e)(2) of Regulation (EC) No 178/2002");
@@ -712,7 +725,7 @@ rule "PII.0.1: Redact all PII (vertebrate study)"
 // Rule unit: PII.1
 rule "PII.1.0: Redact Emails by RegEx (Non vertebrate study)"
     when
-        not FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        not FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $section: Section(containsString("@"))
     then
         entityCreationService.byRegex("\\b([A-Za-z0-9._%+\\-]+@[A-Za-z0-9.\\-]+\\.[A-Za-z\\-]{1,23}[A-Za-z])\\b", "PII", EntityType.ENTITY, 1, $section)
@@ -721,7 +734,7 @@ rule "PII.1.0: Redact Emails by RegEx (Non vertebrate study)"
 
 rule "PII.1.1: Redact Emails by RegEx (vertebrate study)"
     when
-        FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $section: Section(containsString("@"))
     then
         entityCreationService.byRegex("\\b([A-Za-z0-9._%+\\-]+@[A-Za-z0-9.\\-]+\\.[A-Za-z\\-]{1,23}[A-Za-z])\\b", "PII", EntityType.ENTITY, 1, $section)
@@ -740,7 +753,7 @@ rule "PII.1.2: Redact typoed Emails with indicator"
 // Rule unit: PII.2
 rule "PII.2.0: Redact Phone and Fax by RegEx (non vertebrate study)"
     when
-        not FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        not FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $section: Section(containsString("Contact") ||
                               containsString("Telephone") ||
                               containsString("Phone") ||
@@ -758,7 +771,7 @@ rule "PII.2.0: Redact Phone and Fax by RegEx (non vertebrate study)"
 
 rule "PII.2.1: Redact Phone and Fax by RegEx (vertebrate study)"
     when
-        FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $section: Section(containsString("Contact") ||
                               containsString("Telephone") ||
                               containsString("Phone") ||
@@ -786,7 +799,7 @@ rule "PII.2.2: Redact phone numbers without indicators"
 // Rule unit: PII.3
 rule "PII.3.0: Redact telephone numbers by RegEx (Non vertebrate study)"
     when
-        not FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        not FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $section: Section(matchesRegex("[+]\\d{1,}"))
     then
         entityCreationService.byRegex("((([+]\\d{1,3} (\\d{7,12})\\b)|([+]\\d{1,3}(\\d{3,12})\\b|[+]\\d{1,3}([ -]\\(?\\d{1,6}\\)?){2,4})|[+]\\d{1,3} ?((\\d{2,6}\\)?)([ -]\\d{2,6}){1,4}))(-\\d{1,3})?\\b)", "PII", EntityType.ENTITY, 1, $section)
@@ -795,17 +808,18 @@ rule "PII.3.0: Redact telephone numbers by RegEx (Non vertebrate study)"
 
 rule "PII.3.1: Redact telephone numbers by RegEx (vertebrate study)"
     when
-        FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $section: Section(matchesRegex("[+]\\d{1,}"))
     then
         entityCreationService.byRegex("((([+]\\d{1,3} (\\d{7,12})\\b)|([+]\\d{1,3}(\\d{3,12})\\b|[+]\\d{1,3}([ -]\\(?\\d{1,6}\\)?){2,4})|[+]\\d{1,3} ?((\\d{2,6}\\)?)([ -]\\d{2,6}){1,4}))(-\\d{1,3})?\\b)", "PII", EntityType.ENTITY, 1, $section)
         .forEach(entity -> entity.redact("PII.3.1", "Telephone number found by regex", "Article 39(e)(2) of Regulation (EC) No 178/2002"));
     end
 
+
 // Rule unit: PII.4
 rule "PII.4.0: Redact line after contact information keywords (non vertebrate study)"
     when
-        not FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        not FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $contactKeyword: String() from List.of("Contact point:",
                                          "Contact:",
                                          "Alternative contact:",
@@ -833,7 +847,7 @@ rule "PII.4.0: Redact line after contact information keywords (non vertebrate st
 
 rule "PII.4.1: Redact line after contact information keywords (vertebrate study)"
     when
-        FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $contactKeyword: String() from List.of("Contact point:",
                                          "Contact:",
                                          "Alternative contact:",
@@ -863,7 +877,7 @@ rule "PII.4.1: Redact line after contact information keywords (vertebrate study)
 // Rule unit: PII.5
 rule "PII.5.0: Redact line after contact information keywords reduced (non vertebrate study)"
     when
-        not FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        not FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $contactKeyword: String() from List.of("Contact point:",
                                          "Contact:",
                                          "Alternative contact:",
@@ -876,7 +890,7 @@ rule "PII.5.0: Redact line after contact information keywords reduced (non verte
 
 rule "PII.5.1: Redact line after contact information keywords reduced (Vertebrate study)"
     when
-        FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $contactKeyword: String() from List.of("Contact point:",
                                                "Contact:",
                                                "Alternative contact:",
@@ -891,7 +905,7 @@ rule "PII.5.1: Redact line after contact information keywords reduced (Vertebrat
 // Rule unit: PII.6
 rule "PII.6.0: Redact line between contact keywords (non vertebrate study)"
     when
-        not FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        not FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $section: Section((containsString("No:") && containsString("Fax")) || (containsString("Contact:") && containsString("Tel")))
     then
         Stream.concat(
@@ -903,7 +917,7 @@ rule "PII.6.0: Redact line between contact keywords (non vertebrate study)"
 
 rule "PII.6.1: Redact line between contact keywords (vertebrate study)"
     when
-        FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $section: Section((containsString("No:") && containsString("Fax")) || (containsString("Contact:") && containsString("Tel")))
     then
         Stream.concat(
@@ -917,7 +931,7 @@ rule "PII.6.1: Redact line between contact keywords (vertebrate study)"
 // Rule unit: PII.7
 rule "PII.7.0: Redact contact information if applicant is found (non vertebrate study)"
     when
-        not FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        not FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $section: Section(getHeadline().containsString("applicant") ||
                           getHeadline().containsString("Primary contact") ||
                           getHeadline().containsString("Alternative contact") ||
@@ -935,7 +949,7 @@ rule "PII.7.0: Redact contact information if applicant is found (non vertebrate
 
 rule "PII.7.1: Redact contact information if applicant is found (vertebrate study)"
     when
-        FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $section: Section(getHeadline().containsString("applicant") ||
                           getHeadline().containsString("Primary contact") ||
                           getHeadline().containsString("Alternative contact") ||
@@ -955,7 +969,7 @@ rule "PII.7.1: Redact contact information if applicant is found (vertebrate stud
 // Rule unit: PII.8
 rule "PII.8.0: Redact contact information if producer is found (non vertebrate study)"
     when
-        not FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        not FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $section: Section(containsStringIgnoreCase("producer of the plant protection") ||
                           containsStringIgnoreCase("producer of the active substance") ||
                           containsStringIgnoreCase("manufacturer of the active substance") ||
@@ -973,7 +987,7 @@ rule "PII.8.0: Redact contact information if producer is found (non vertebrate s
 
 rule "PII.8.1: Redact contact information if producer is found (vertebrate study)"
     when
-        FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $section: Section(containsStringIgnoreCase("producer of the plant protection") ||
                           containsStringIgnoreCase("producer of the active substance") ||
                           containsStringIgnoreCase("manufacturer of the active substance") ||
@@ -993,7 +1007,7 @@ rule "PII.8.1: Redact contact information if producer is found (vertebrate study
 // Rule unit: PII.9
 rule "PII.9.0: Redact between \"AUTHOR(S)\" and \"(STUDY) COMPLETION DATE\" (non vertebrate study)"
     when
-        not FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        not FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $document: Document(containsStringIgnoreCase("AUTHOR(S)"), containsAnyStringIgnoreCase("COMPLETION DATE", "STUDY COMPLETION DATE"))
     then
         entityCreationService.shortestBetweenAnyStringIgnoreCase(List.of("AUTHOR(S)", "AUTHOR(S):"), List.of("COMPLETION DATE", "COMPLETION DATE:", "STUDY COMPLETION DATE", "STUDY COMPLETION DATE:"), "PII", EntityType.ENTITY, $document)
@@ -1002,7 +1016,7 @@ rule "PII.9.0: Redact between \"AUTHOR(S)\" and \"(STUDY) COMPLETION DATE\" (non
 
 rule "PII.9.1: Redact between \"AUTHOR(S)\" and \"(STUDY) COMPLETION DATE\" (vertebrate study)"
     when
-        FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $document: Document(containsStringIgnoreCase("AUTHOR(S)"), containsAnyStringIgnoreCase("COMPLETION DATE", "STUDY COMPLETION DATE"))
     then
         entityCreationService.shortestBetweenAnyStringIgnoreCase(List.of("AUTHOR(S)", "AUTHOR(S):"), List.of("COMPLETION DATE", "COMPLETION DATE:", "STUDY COMPLETION DATE", "STUDY COMPLETION DATE:"), "PII", EntityType.ENTITY, $document)
@@ -1033,12 +1047,14 @@ rule "PII.11.0: Redact On behalf of Sequani Ltd.:"
 // Rule unit: PII.12
 rule "PII.12.0: Expand PII entities with salutation prefix"
     when
+        not FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $entityToExpand: TextEntity(type == "PII", anyMatch(textBefore, "\\b(Mrs?|Ms|Miss|Sir|Madame?|Mme)\\s?\\.?\\s*"))
     then
         entityCreationService.byPrefixExpansionRegex($entityToExpand, "\\b(Mrs?|Ms|Miss|Sir|Madame?|Mme)\\s?\\.?\\s*")
-        .ifPresent(expandedEntity -> expandedEntity.addMatchedRules($entityToExpand.getMatchedRuleList()));
+        .ifPresent(expandedEntity -> expandedEntity.apply("PII.12.0", "Expanded PII with salutation prefix", "Article 39(e)(3) of Regulation (EC) No 178/2002"));
     end
 
+
 // Rule unit: PII.13
 rule "PII.13.0: Add recommendation for PII after Contact Person"
     when
@@ -1083,7 +1099,7 @@ rule "ETC.1.0: Redact Purity"
 // Rule unit: ETC.2
 rule "ETC.2.0: Redact signatures (non vertebrate study)"
     when
-        not FileAttribute(label == "Vertebrate Study", value == "Yes")
+        not FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $signature: Image(imageType == ImageType.SIGNATURE)
     then
         $signature.redact("ETC.2.0", "Signature Found", "Article 39(e)(3) of Regulation (EC) No 178/2002");
@@ -1091,7 +1107,7 @@ rule "ETC.2.0: Redact signatures (non vertebrate study)"
 
 rule "ETC.2.1: Redact signatures (vertebrate study)"
     when
-        FileAttribute(label == "Vertebrate Study", value == "Yes")
+        FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $signature: Image(imageType == ImageType.SIGNATURE)
     then
         $signature.redact("ETC.2.1", "Signature Found", "Article 39(e)(2) of Regulation (EC) No 178/2002");
@@ -1099,17 +1115,17 @@ rule "ETC.2.1: Redact signatures (vertebrate study)"
 
 
 // Rule unit: ETC.3
-rule "ETC.3.0: Redact logos (non vertebrate study)"
+rule "ETC.3.0: Skip logos (non vertebrate study)"
     when
-        not FileAttribute(label == "Vertebrate Study", value == "Yes")
+        not FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $logo: Image(imageType == ImageType.LOGO)
     then
-        $logo.redact("ETC.3.0", "Logo Found", "Article 39(e)(3) of Regulation (EC) No 178/2002");
+        $logo.skip("ETC.3.0", "Logo Found");
     end
 
 rule "ETC.3.1: Redact logos (vertebrate study)"
     when
-        FileAttribute(label == "Vertebrate Study", value == "Yes")
+        FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $logo: Image(imageType == ImageType.LOGO)
     then
         $logo.redact("ETC.3.1", "Logo Found", "Article 39(e)(2) of Regulation (EC) No 178/2002");
@@ -1178,7 +1194,7 @@ rule "ETC.7.0: Guidelines FileAttributes"
 // Rule unit: ETC.8
 rule "ETC.8.0: Redact formulas (vertebrate study)"
     when
-        not FileAttribute(label == "Vertebrate Study", value == "Yes")
+        not FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $logo: Image(imageType == ImageType.FORMULA)
     then
         $logo.redact("ETC.8.0", "Logo Found", "Article 39(e)(3) of Regulation (EC) No 178/2002");
@@ -1186,16 +1202,17 @@ rule "ETC.8.0: Redact formulas (vertebrate study)"
 
 rule "ETC.8.1: Redact formulas (non vertebrate study)"
     when
-        FileAttribute(label == "Vertebrate Study", value == "Yes")
+        FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $logo: Image(imageType == ImageType.FORMULA)
     then
         $logo.redact("ETC.8.1", "Logo Found", "Article 39(e)(2) of Regulation (EC) No 178/2002");
     end
 
+
 // Rule unit: ETC.9
 rule "ETC.9.0: Redact skipped impurities"
     when
-        FileAttribute(label == "Redact Skipped Impurities", value == "Yes")
+        FileAttribute(label == "Redact Skipped Impurities", value soundslike "Yes" || value.toLowerCase() == "y")
         $skippedImpurities: TextEntity(type == "skipped_impurities")
     then
         $skippedImpurities.redact("ETC.9.0", "Occasional Impurity found", "Article 63(2)(b) of Regulation (EC) No 1107/2009");
@@ -1203,12 +1220,13 @@ rule "ETC.9.0: Redact skipped impurities"
 
 rule "ETC.9.1: Redact impurities"
     when
-        FileAttribute(label == "Redact Impurities", value == "Yes")
+        FileAttribute(label == "Redact Impurities", value soundslike "Yes" || value.toLowerCase() == "y")
         $skippedImpurities: TextEntity(type == "impurities")
     then
         $skippedImpurities.redact("ETC.9.1", "Impurity found", "Article 63(2)(b) of Regulation (EC) No 1107/2009");
     end
 
+
 // Rule unit: ETC.10
 rule "ETC.10.0: Redact Product Composition Information"
     when
@@ -1217,6 +1235,7 @@ rule "ETC.10.0: Redact Product Composition Information"
         $compositionInformation.redact("ETC.10.0", "Product Composition Information found", "Article 63(2)(d) of Regulation (EC) No 1107/2009");
     end
 
+
 // Rule unit: ETC.11
 rule "ETC.11.0: Recommend first line in table cell with name and address of owner"
     when
@@ -1228,6 +1247,7 @@ rule "ETC.11.0: Recommend first line in table cell with name and address of owne
             .ifPresent(redactionEntity -> redactionEntity.redact("ETC.11.0", "Trial Site owner and address found", "Article 39(e)(3) of Regulation (EC) No 178/2002"));
     end
 
+
 //------------------------------------ AI rules ------------------------------------
 
 // Rule unit: AI.0
@@ -1273,7 +1293,8 @@ rule "AI.3.0: Recommend authors from AI as PII"
             .forEach(nerEntity -> entityCreationService.byNerEntity(nerEntity, "PII", EntityType.RECOMMENDATION, document));
     end
 
-//------------------------------------ Manual redaction rules ------------------------------------
+
+//------------------------------------ Manual changes rules ------------------------------------
 
 // Rule unit: MAN.0
 rule "MAN.0.0: Apply manual resize redaction"
@@ -1307,7 +1328,7 @@ rule "MAN.0.1: Apply manual resize redaction"
 rule "MAN.1.0: Apply id removals that are valid and not in forced redactions to Entity"
     salience 128
     when
-        $idRemoval: IdRemoval($id: annotationId, status == AnnotationStatus.APPROVED)
+        $idRemoval: IdRemoval($id: annotationId, !removeFromDictionary, !removeFromAllDossiers, status == AnnotationStatus.APPROVED)
         $entityToBeRemoved: TextEntity(matchesAnnotationId($id))
     then
         $entityToBeRemoved.getManualOverwrite().addChange($idRemoval);
@@ -1507,12 +1528,11 @@ rule "X.6.0: Remove Entity of lower rank, when contained by by entity of type EN
         retract($lowerRank);
     end
 
-
 rule "X.6.1: remove Entity of higher rank, when intersected by entity of type ENTITY and length of lower rank Entity is bigger than the higher rank Entity"
     salience 32
     when
         $higherRank: TextEntity($type: type, $value: value, (entityType == EntityType.ENTITY || entityType == EntityType.HINT), active())
-        $lowerRank: TextEntity(intersects($higherRank), type != $type, dictionary.getDictionaryRank(type) < dictionary.getDictionaryRank($type), !hasManualChanges(), active(), $lowerRank.getValue().length() > $value.length())
+        $lowerRank: TextEntity(intersects($higherRank), type != $type, (entityType == EntityType.ENTITY || entityType == EntityType.HINT), dictionary.getDictionaryRank(type) < dictionary.getDictionaryRank($type), !hasManualChanges(), active(), $lowerRank.getValue().length() > $value.length())
     then
         $higherRank.getIntersectingNodes().forEach(node -> update(node));
         $higherRank.remove("X.6.1", "remove Entity of higher rank, when intersected by entity of type ENTITY and length of lower rank Entity is bigger than the higher rank Entity");
@@ -1544,7 +1564,7 @@ rule "LDS.0.0: Run local dictionary search"
     then
         entityCreationService.bySearchImplementation($dictionaryModel.getLocalSearch(), $dictionaryModel.getType(), EntityType.RECOMMENDATION, document)
             .forEach(entity ->  {
-                Collection<MatchedRule> matchedRules = $dictionaryModel.getLocalEntriesWithMatchedRules().get(entity.getValue());
-                entity.addMatchedRules(matchedRules);
+                Collection<MatchedRule> matchedRules = $dictionaryModel.getMatchedRulesForLocalDictionaryEntry(entity.getValue());
+                matchedRules.forEach(matchedRule -> entity.addMatchedRule(matchedRule.asSkippedIfApplied()));
             });
     end

redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/documine_flora.drl

@@ -66,7 +66,7 @@ query "getFileAttributes"
     $fileAttribute: FileAttribute()
     end
 
-//------------------------------------ H rules ------------------------------------
+//------------------------------------ Headlines rules ------------------------------------
 
 // Rule unit: H.0
 rule "H.0.0: retract table of contents page"
@@ -116,6 +116,23 @@ rule "H.3.0: Study Type File Attribute"
              .ifPresent(fileAttribute -> insert(fileAttribute));
     end
 
+rule "H.3.1: Study Type File Attribute in Headlines"
+    when
+        not FileAttribute(label == "OECD Number", valueEqualsAnyOf("402","403","404","405","425","429","436","438","439","471","487"))
+        $page: Page($pageNumber:number,
+            getMainBodyTextBlock().getSearchText().contains("DATA REQUIREMENT")
+            || getMainBodyTextBlock().getSearchText().contains("TEST GUIDELINE")
+            || getMainBodyTextBlock().getSearchText().contains("MÉTODO(S) DE REFERÊNCIA(S):"))
+        $headline: Headline(onPage($pageNumber), containsString("OECD") || containsString("EPA")|| containsString("OPPTS"))
+    then
+      Stream.of(RedactionSearchUtility.findTextRangesByRegexIgnoreCase("(?<=OECD)(?:[\\w\\s,\\[\\]\\(\\)\\.]{1,10}|(?:.{5,40}(?:Number |Procedure |Guideline )))(4[\\d]{2})", 1, $headline.getTextBlock()),
+                RedactionSearchUtility.findTextRangesByRegexIgnoreCase("(?<=OECD).{5,40}Method (4[\\d]{2}).{1,65}(\\d{4})\\)", 1, $headline.getTextBlock()),
+                RedactionSearchUtility.findTextRangesByRegexIgnoreCase("(?<=OECD) Guideline (4\\d{2})", 1, $headline.getTextBlock())).flatMap(Collection::stream).findFirst()
+             .map(textRange -> $headline.getTextBlock().subSequence(textRange).toString())
+             .map(value -> FileAttribute.builder().label("OECD Number").value(value).build())
+             .ifPresent(fileAttribute -> insert(fileAttribute));
+    end
+
 
 //------------------------------------ General documine rules ------------------------------------
 
@@ -232,6 +249,58 @@ rule "DOC.1.3: Guidelines"
          });
      end
 
+rule "DOC.1.4: Guideline in Headlines"
+    when
+        $page: Page($pageNumber:number,
+            getMainBodyTextBlock().getSearchText().contains("DATA REQUIREMENT")
+            || getMainBodyTextBlock().getSearchText().contains("TEST GUIDELINE")
+            || getMainBodyTextBlock().getSearchText().contains("MÉTODO(S) DE REFERÊNCIA(S):"))
+        $headline: Headline(onPage($pageNumber), containsString("OECD") || containsString("EPA")|| containsString("OPPTS"))
+    then
+        entityCreationService.byRegex("OECD (No\\.? )?\\d{3}( \\(\\d{4}\\))?", "oecd_guideline", EntityType.ENTITY, $headline).forEach(entity ->
+            entity.apply("DOC.1.4", "OECD Guideline found", "n-a")
+        );
+        entityCreationService.byRegex("OECD[\\s,]{1}(?:.{1,40}.(?>Procedure|Method).{1,20}\\d{3,4}(?>.{1,100}\\d{4}\\))?|\\[.{1,20}.Skin.{1,20}\\]|[\\d\\s,\\(\\)]{7,10}|[\\w\\.\\s]{1,15}[\\d]{3}\\s\\(\\d{4}\\)|.{0,20}[N|n]umber\\s\\d{3}.{0,1}|Test Guideline \\d{3})", "oecd_guideline", EntityType.ENTITY, $headline).forEach(entity ->
+            entity.apply("DOC.1.4", "OECD Guideline found", "n-a")
+        );
+        entityCreationService.byRegex("EPA (OPPTS )?\\d{3}[. ]\\d{4}( \\(\\d{4}\\))?", "epa_guideline", EntityType.ENTITY, $headline).forEach(entity ->
+            entity.apply("DOC.1.4", "EPA Guideline found", "n-a")
+        );
+        entityCreationService.byRegex("EC (Directive )?(No\\.? )?\\d{3,4}\\/\\d{3,4}((,? B(\\.| )\\d{1,2}\\.?)? \\(\\d{4}\\))?", "ec_guideline", EntityType.ENTITY, $headline).forEach(entity ->
+            entity.apply("DOC.1.4", "EC Guideline found", "n-a")
+        );
+        entityCreationService.byRegex("Commission Regulation \\(EC\\) No \\d{3}\\/\\d{4}", "ec_guideline", EntityType.ENTITY, $headline).forEach(entity ->
+            entity.apply("DOC.1.4", "EC Guideline found", "n-a")
+        );
+        entityCreationService.byRegex("OECD Method 4\\d{2}.{5,40}\\(.{5,40}\\d{4}\\)", "oecd_guideline", EntityType.ENTITY, $headline).forEach(entity ->
+            entity.apply("DOC.1.4", "OECD Guideline year found", "n-a")
+        );
+        entityCreationService.byRegex("OPPTS (Guideline Number )?\\d{3}\\.\\d{4}( \\(\\d{4}\\))?", "epa_guideline", EntityType.ENTITY, $headline).forEach(entity ->
+            entity.apply("DOC.1.4", "EPA Guideline found", "n-a")
+        );
+        entityCreationService.byRegex("(?<=OECD)(?:[\\w\\s,\\[\\]\\(\\)\\.]{1,10}|.{5,40}(?:Number |Procedure |Guideline ))(4[\\d]{2})", "oecd_guideline_number", EntityType.ENTITY,1, $headline).forEach(entity ->
+            entity.apply("DOC.1.4", "OECD Guideline no. found", "n-a")
+        );
+        entityCreationService.byRegex("(?<=OECD)(?:[\\w\\s,\\[\\]\\(\\)\\.]{1,10}|.{5,40}(?:Number |Procedure |Guideline ))(4[\\d]{2}),?\\s\\(?(\\d{4})\\)?", "oecd_guideline_year", EntityType.ENTITY,2, $headline).forEach(entity ->
+            entity.apply("DOC.1.4", "OECD Guideline year found", "n-a")
+        );
+        entityCreationService.byRegex("(?<=OECD)[\\w\\s,\\[\\]]{1,10}\\((\\d{4})\\)\\s(4[\\d]{2})", "oecd_guideline_year", EntityType.ENTITY,1, $headline).forEach(entity ->
+            entity.apply("DOC.1.4", "OECD Guideline year found", "n-a")
+        );
+        entityCreationService.byRegex("(?<=OECD).{5,40}Method (4[\\d]{2}).{1,65}(\\d{4})\\)", "oecd_guideline_number", EntityType.ENTITY,1, $headline).forEach(entity ->
+             entity.apply("DOC.1.4", "OECD Guideline number found", "n-a")
+        );
+        entityCreationService.byRegex("(?<=OECD).{5,40}Method (4[\\d]{2}).{1,65}(\\d{4})\\)", "oecd_guideline_year", EntityType.ENTITY,2, $headline).forEach(entity ->
+            entity.apply("DOC.1.4", "OECD Guideline year found", "n-a")
+        );
+        entityCreationService.byRegex("(?<=OECD) Guideline (4\\d{2})", "oecd_guideline_number", EntityType.ENTITY,1, $headline).forEach(entity ->
+            entity.apply("DOC.1.4", "OECD Guideline number found", "n-a")
+        );
+        entityCreationService.byRegex("OECD Guideline 4\\d{2}", "oecd_guideline", EntityType.ENTITY, $headline).forEach(entity ->
+            entity.apply("DOC.1.4", "OECD Guideline found", "n-a")
+        );
+    end
+
 
 // Rule unit: DOC.2
 rule "DOC.2.0: Report number"
@@ -1083,7 +1152,7 @@ rule "DOC.35.0: Doses (mg/kg bodyweight)"
     end
 
 
-//------------------------------------ Manual redaction rules ------------------------------------
+//------------------------------------ Manual changes rules ------------------------------------
 
 // Rule unit: MAN.0
 rule "MAN.0.0: Apply manual resize redaction"
@@ -1117,7 +1186,7 @@ rule "MAN.0.1: Apply manual resize redaction"
 rule "MAN.1.0: Apply id removals that are valid and not in forced redactions to Entity"
     salience 128
     when
-        $idRemoval: IdRemoval($id: annotationId, status == AnnotationStatus.APPROVED)
+        $idRemoval: IdRemoval($id: annotationId, !removeFromDictionary, !removeFromAllDossiers, status == AnnotationStatus.APPROVED)
         $entityToBeRemoved: TextEntity(matchesAnnotationId($id))
     then
         $entityToBeRemoved.getManualOverwrite().addChange($idRemoval);
@@ -1204,6 +1273,14 @@ rule "MAN.3.2: Apply image recategorization"
         retract($recategorization);
     end
 
+rule "MAN.3.3: Apply recategorization entities by default"
+    salience 128
+    when
+        $entity: IEntity(getManualOverwrite().getRecategorized().orElse(false))
+    then
+        $entity.apply("MAN.3.3", "Recategorized entities are applied by default.");
+    end
+
 
 // Rule unit: MAN.4
 rule "MAN.4.0: Apply legal basis change"
@@ -1324,7 +1401,7 @@ rule "LDS.0.0: Run local dictionary search"
     then
         entityCreationService.bySearchImplementation($dictionaryModel.getLocalSearch(), $dictionaryModel.getType(), EntityType.RECOMMENDATION, document)
             .forEach(entity ->  {
-                Collection<MatchedRule> matchedRules = $dictionaryModel.getLocalEntriesWithMatchedRules().get(entity.getValue());
-                entity.addMatchedRules(matchedRules);
+                Collection<MatchedRule> matchedRules = $dictionaryModel.getMatchedRulesForLocalDictionaryEntry(entity.getValue());
+                matchedRules.forEach(matchedRule -> entity.addMatchedRule(matchedRule.asSkippedIfApplied()));
             });
     end

redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/documine_flora_components.drl

@@ -217,7 +217,7 @@ rule "GuidelineDeviation.0.0: Guideline deviation as sentences"
 
 rule "Species.0.0: First found species"
     when
-        $oecdNumber: String() from List.of("402", "403", "404", "405", "425", "429", "436", "471")
+        $oecdNumber: String() from List.of("402", "403", "404", "405", "425", "429", "436")
         FileAttribute(label == "OECD Number", value == $oecdNumber)
         $species: List() from collect (Entity(type == "species"))
     then
@@ -313,7 +313,7 @@ rule "Necropsy.2.0: Conducted with 4 hours of exposure as one block"
 
 rule "StudyDesign.0.0: Study design as one block"
     when
-        $oecdNumber: String() from List.of("404", "405", "429", "406", "428", "438", "439", "474", "487")
+        $oecdNumber: String() from List.of("404", "405", "406", "428", "429", "438", "439", "474", "487")
         FileAttribute(label == "OECD Number", value == $oecdNumber)
         $studyDesigns: List() from collect (Entity(type == "study_design"))
     then
@@ -497,15 +497,16 @@ rule "UsedApproach.1.0: Used approach not found and thus 'Individual'"
         componentCreationService.create("UsedApproach.1.0", "What_was_the_approach_used", "Individual", "'Group' when approach used is present, else 'Individual'");
     end
 
-/*
+
 rule "DefaultComponents.999.0: Create components for all unmapped entities."
     salience -999
     when
+        not FileAttribute(label == "OECD Number")
         $allEntities: List(!isEmpty()) from collect (Entity())
     then
         componentCreationService.createComponentsForUnMappedEntities("DefaultComponents.999.0", $allEntities);
     end
-*/
+
 
 //------------------------------------ Component merging rules ------------------------------------
 /*

redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/manual_redaction_rules.drl

@@ -66,7 +66,7 @@ query "getFileAttributes"
     $fileAttribute: FileAttribute()
     end
 
-//------------------------------------ Manual redaction rules ------------------------------------
+//------------------------------------ Manual changes rules ------------------------------------
 
 // Rule unit: MAN.0
 rule "MAN.0.0: Apply manual resize redaction"
@@ -100,7 +100,7 @@ rule "MAN.0.1: Apply manual resize redaction"
 rule "MAN.1.0: Apply id removals that are valid and not in forced redactions to Entity"
     salience 128
     when
-        $idRemoval: IdRemoval($id: annotationId, status == AnnotationStatus.APPROVED)
+        $idRemoval: IdRemoval($id: annotationId, !removeFromDictionary, !removeFromAllDossiers, status == AnnotationStatus.APPROVED)
         $entityToBeRemoved: TextEntity(matchesAnnotationId($id))
     then
         $entityToBeRemoved.getManualOverwrite().addChange($idRemoval);
@@ -163,7 +163,6 @@ rule "MAN.3.0: Apply entity recategorization"
         retract($entityToBeRecategorized);
     end
 
-
 rule "MAN.3.1: Apply entity recategorization of same type"
     salience 128
     when
@@ -175,7 +174,6 @@ rule "MAN.3.1: Apply entity recategorization of same type"
         retract($recategorization);
     end
 
-
 rule "MAN.3.2: Apply image recategorization"
     salience 128
     when
@@ -208,6 +206,8 @@ rule "MAN.4.1: Apply legal basis change"
     then
         $entityToBeChanged.getManualOverwrite().addChange($legalBasisChange);
     end
+
+
 //------------------------------------ Local dictionary search rules ------------------------------------
 
 // Rule unit: LDS.0
@@ -219,7 +219,7 @@ rule "LDS.0.0: Run local dictionary search"
     then
         entityCreationService.bySearchImplementation($dictionaryModel.getLocalSearch(), $dictionaryModel.getType(), EntityType.RECOMMENDATION, document)
             .forEach(entity ->  {
-                Collection<MatchedRule> matchedRules = $dictionaryModel.getLocalEntriesWithMatchedRules().get(entity.getValue());
-                entity.addMatchedRules(matchedRules);
+                Collection<MatchedRule> matchedRules = $dictionaryModel.getMatchedRulesForLocalDictionaryEntry(entity.getValue());
+                matchedRules.forEach(matchedRule -> entity.addMatchedRule(matchedRule.asSkippedIfApplied()));
             });
     end

redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/rules.drl

@@ -71,7 +71,7 @@ query "getFileAttributes"
 // Rule unit: SYN.0
 rule "SYN.0.0: Redact if CTL/* or BL/* was found (Non Vertebrate Study)"
     when
-        not FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        not FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $section: Section(containsString("CTL/") || containsString("BL/"))
     then
         Stream.concat(
@@ -84,7 +84,7 @@ rule "SYN.0.0: Redact if CTL/* or BL/* was found (Non Vertebrate Study)"
 //------------------------------------ CBI rules ------------------------------------
 
 // Rule unit: CBI.3
-rule "CBI.3.0: Redacted because Section contains Vertebrate"
+rule "CBI.3.0: Redacted because Section contains a vertebrate"
     when
         $section: Section(!hasTables(), hasEntitiesOfType("vertebrate"), (hasEntitiesOfType("CBI_author") || hasEntitiesOfType("CBI_address")))
     then
@@ -99,7 +99,7 @@ rule "CBI.3.0: Redacted because Section contains Vertebrate"
             });
     end
 
-rule "CBI.3.1: Redacted because Table Row contains Vertebrate"
+rule "CBI.3.1: Redacted because table row contains a vertebrate"
     when
         $table: Table(hasEntitiesOfType("vertebrate"), (hasEntitiesOfType("CBI_author") || hasEntitiesOfType("CBI_address")))
     then
@@ -115,7 +115,7 @@ rule "CBI.3.1: Redacted because Table Row contains Vertebrate"
             });
     end
 
-rule "CBI.3.2: Don't redact because Section doesn't contain Vertebrate"
+rule "CBI.3.2: Do not redact because Section does not contain a vertebrate"
     when
         $section: Section(!hasTables(), !hasEntitiesOfType("vertebrate"), (hasEntitiesOfType("CBI_author") || hasEntitiesOfType("CBI_address")))
     then
@@ -123,7 +123,7 @@ rule "CBI.3.2: Don't redact because Section doesn't contain Vertebrate"
             .forEach(entity -> entity.skip("CBI.3.2", "No vertebrate found"));
     end
 
-rule "CBI.3.3: Dont redact because Table Row doesn't contain Vertebrate"
+rule "CBI.3.3: Do not redact because table row does not contain a vertebrate"
     when
         $table: Table(hasEntitiesOfType("CBI_author") || hasEntitiesOfType("CBI_address"))
     then
@@ -134,7 +134,7 @@ rule "CBI.3.3: Dont redact because Table Row doesn't contain Vertebrate"
 
 
 // Rule unit: CBI.4
-rule "CBI.4.0: Dont redact Names and Addresses if no_redaction_indicator is found in Section"
+rule "CBI.4.0: Do not redact Names and Addresses if no_redaction_indicator is found in Section"
     when
         $section: Section(!hasTables(),
                           hasEntitiesOfType("vertebrate"),
@@ -151,7 +151,7 @@ rule "CBI.4.0: Dont redact Names and Addresses if no_redaction_indicator is foun
             });
     end
 
-rule "CBI.4.1: Dont redact Names and Addresses if no_redaction_indicator is found in Table Row"
+rule "CBI.4.1: Do not redact Names and Addresses if no_redaction_indicator is found in table row"
     when
         $table: Table(hasEntitiesOfType("no_redaction_indicator"),
                       hasEntitiesOfType("vertebrate"),
@@ -172,7 +172,7 @@ rule "CBI.4.1: Dont redact Names and Addresses if no_redaction_indicator is foun
 
 
 // Rule unit: CBI.5
-rule "CBI.5.0: Redact Names and Addresses if no_redaction_indicator but also redaction_indicator is found in section"
+rule "CBI.5.0: Redact Names and Addresses if no_redaction_indicator but also redaction_indicator is found in Section"
     when
         $section: Section(!hasTables(),
                           hasEntitiesOfType("redaction_indicator"),
@@ -192,7 +192,7 @@ rule "CBI.5.0: Redact Names and Addresses if no_redaction_indicator but also red
             });
     end
 
-rule "CBI.5.1: Redact Names and Addresses if no_redaction_indicator but also redaction_indicator is found in Table Row"
+rule "CBI.5.1: Redact Names and Addresses if no_redaction_indicator but also redaction_indicator is found in table row"
     when
         $table: Table(hasEntitiesOfType("no_redaction_indicator"),
                       hasEntitiesOfType("redaction_indicator"),
@@ -229,7 +229,7 @@ rule "CBI.8.0: Redacted because Section contains must_redact entity"
             });
     end
 
-rule "CBI.8.1: Redacted because Table Row contains must_redact entity"
+rule "CBI.8.1: Redacted because table row contains must_redact entity"
     when
         $table: Table(hasEntitiesOfType("must_redact"), (hasEntitiesOfType("CBI_author") || hasEntitiesOfType("CBI_address")))
     then
@@ -247,30 +247,30 @@ rule "CBI.8.1: Redacted because Table Row contains must_redact entity"
 
 
 // Rule unit: CBI.9
-rule "CBI.9.0: Redact all Cell's with Header Author(s) as CBI_author (non vertebrate study)"
+rule "CBI.9.0: Redact all cells with Header Author(s) as CBI_author (non vertebrate study)"
     agenda-group "LOCAL_DICTIONARY_ADDS"
     when
-        not FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        not FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $table: Table(hasHeader("Author(s)"))
     then
         $table.streamTableCellsWithHeader("Author(s)")
             .map(tableCell -> entityCreationService.bySemanticNode(tableCell, "CBI_author", EntityType.ENTITY))
             .filter(Optional::isPresent)
             .map(Optional::get)
-            .forEach(redactionEntity -> redactionEntity.apply("CBI.9.0", "Author(s) found", "Article 39(e)(3) of Regulation (EC) No 178/2002"));
+            .forEach(redactionEntity -> redactionEntity.redact("CBI.9.0", "Author(s) found", "Article 39(e)(3) of Regulation (EC) No 178/2002"));
     end
 
-rule "CBI.9.1: Redact all Cell's with Header Author as CBI_author (non vertebrate study)"
+rule "CBI.9.1: Redact all cells with Header Author as CBI_author (non vertebrate study)"
     agenda-group "LOCAL_DICTIONARY_ADDS"
     when
-        not FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        not FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $table: Table(hasHeader("Author"))
     then
         $table.streamTableCellsWithHeader("Author")
             .map(tableCell -> entityCreationService.bySemanticNode(tableCell, "CBI_author", EntityType.ENTITY))
             .filter(Optional::isPresent)
             .map(Optional::get)
-            .forEach(redactionEntity -> redactionEntity.apply("CBI.9.1", "Author found", "Article 39(e)(3) of Regulation (EC) No 178/2002"));
+            .forEach(redactionEntity -> redactionEntity.redact("CBI.9.1", "Author found", "Article 39(e)(3) of Regulation (EC) No 178/2002"));
     end
 
 
@@ -281,42 +281,59 @@ rule "CBI.11.0: Recommend all CBI_author entities in Table with Vertebrate Study
     when
         $table: Table(hasHeader("Author(s)") && hasHeader("Vertebrate Study Y/N"))
     then
-        $table.getEntitiesOfType("CBI_author").forEach(entity -> dictionary.addMultipleAuthorsAsRecommendation(entity));
+        $table.getEntitiesOfType("CBI_author").stream().filter(IEntity::applied).forEach(entity -> dictionary.addMultipleAuthorsAsRecommendation(entity));
     end
 
 
 // Rule unit: CBI.12
-rule "CBI.12.0: Add all Cell's with Header Author(s) as CBI_author"
-    salience 1
+rule "CBI.12.0: Redact and recommend TableCell with header 'Author' or 'Author(s)' and header 'Vertebrate study Y/N' with value 'Yes' (non vertebrate study)"
+    agenda-group "LOCAL_DICTIONARY_ADDS"
     when
-        $table: Table(hasHeader("Author(s)") || hasHeader("Author"))
+        not FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
+        $table: Table(hasHeader("Author(s)") || hasHeader("Author"), hasHeaderIgnoreCase("Vertebrate Study Y/N"))
+        TableCell(header, containsAnyStringIgnoreCase("Author", "Author(s)"), $authorCol: col) from $table.streamHeaders().toList()
+        TableCell(header, containsStringIgnoreCase("Vertebrate study Y/N"), $vertebrateCol: col) from $table.streamHeaders().toList()
+        TableCell(!header, containsAnyString("Yes", "Y"), $rowWithYes: row) from $table.streamCol($vertebrateCol).toList()
+        $authorCell: TableCell(row == $rowWithYes) from $table.streamCol($authorCol).toList()
     then
-        Stream.concat(
-            $table.streamTableCellsWithHeader("Author(s)"),
-            $table.streamTableCellsWithHeader("Author")
-        )
-            .map(tableCell -> entityCreationService.bySemanticNode(tableCell, "CBI_author", EntityType.ENTITY))
-            .filter(Optional::isPresent)
-            .map(Optional::get)
-            .forEach(redactionEntity -> redactionEntity.skip("CBI.12.0", "Author(s) header found"));
+
+        entityCreationService.bySemanticNode($authorCell, "CBI_author", EntityType.ENTITY)
+          .ifPresent(authorEntity -> {
+              authorEntity.redact("CBI.12.0", "Redacted because it's row belongs to a vertebrate study", "Article 39(e)(3) of Regulation (EC) No 178/2002");
+              dictionary.addMultipleAuthorsAsRecommendation(authorEntity);
+          });
+
     end
 
-rule "CBI.12.1: Dont redact CBI_author, if its row contains a cell with header \"Vertebrate study Y/N\" and value No"
+rule "CBI.12.1: Redact and recommend TableCell with header 'Author' or 'Author(s)' and header 'Vertebrate study Y/N' with value 'Yes' (vertebrate study)"
+    agenda-group "LOCAL_DICTIONARY_ADDS"
     when
-        $table: Table(hasRowWithHeaderAndValue("Vertebrate study Y/N", "N") || hasRowWithHeaderAndValue("Vertebrate study Y/N", "No"))
+        FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
+        $table: Table(hasHeader("Author(s)") || hasHeader("Author"), hasHeaderIgnoreCase("Vertebrate Study Y/N"))
+        TableCell(header, containsAnyStringIgnoreCase("Author", "Author(s)"), $authorCol: col) from $table.streamHeaders().toList()
+        TableCell(header, containsStringIgnoreCase("Vertebrate study Y/N"), $vertebrateCol: col) from $table.streamHeaders().toList()
+        TableCell(!header, containsAnyString("Yes", "Y"), $rowWithYes: row) from $table.streamCol($vertebrateCol).toList()
+        $authorCell: TableCell(row == $rowWithYes) from $table.streamCol($authorCol).toList()
     then
-        $table.streamEntitiesWhereRowHasHeaderAndAnyValue("Vertebrate study Y/N", List.of("N", "No"))
-            .filter(redactionEntity -> redactionEntity.isAnyType(List.of("CBI_author", "CBI_address")))
-            .forEach(authorEntity -> authorEntity.skip("CBI.12.1", "Not redacted because it's row does not belong to a vertebrate study"));
+
+        entityCreationService.bySemanticNode($authorCell, "CBI_author", EntityType.ENTITY)
+          .ifPresent(authorEntity -> {
+              authorEntity.redact("CBI.12.1", "Redacted because it's row belongs to a vertebrate study", "Article 39(e)(2) of Regulation (EC) No 178/2002");
+              dictionary.addMultipleAuthorsAsRecommendation(authorEntity);
+          });
+
     end
 
-rule "CBI.12.2: Redact CBI_author, if its row contains a cell with header \"Vertebrate study Y/N\" and value Yes"
+rule "CBI.12.2: Skip TableCell with header 'Author' or 'Author(s)' and header 'Vertebrate study Y/N' with value 'No'"
     when
-        $table: Table(hasRowWithHeaderAndValue("Vertebrate study Y/N", "Y") || hasRowWithHeaderAndValue("Vertebrate study Y/N", "Yes"))
+        $table: Table(hasHeader("Author(s)") || hasHeader("Author"), hasHeaderIgnoreCase("Vertebrate Study Y/N"))
+        TableCell(header, containsAnyStringIgnoreCase("Author", "Author(s)"), $authorCol: col) from $table.streamHeaders().toList()
+        TableCell(header, containsStringIgnoreCase("Vertebrate study Y/N"), $vertebrateCol: col) from $table.streamHeaders().toList()
+        TableCell(!header, containsAnyString("No", "N"), $rowWithNo: row) from $table.streamCol($vertebrateCol).toList()
+        $authorCell: TableCell(row == $rowWithNo) from $table.streamCol($authorCol).toList()
     then
-        $table.streamEntitiesWhereRowHasHeaderAndAnyValue("Vertebrate study Y/N", List.of("Y", "Yes"))
-            .filter(redactionEntity -> redactionEntity.isAnyType(List.of("CBI_author", "CBI_address")))
-            .forEach(authorEntity -> authorEntity.apply("CBI.12.2", "Redacted because it's row belongs to a vertebrate study", "Reg (EC) No 1107/2009 Art. 63 (2g)"));
+        entityCreationService.bySemanticNode($authorCell, "CBI_author", EntityType.ENTITY)
+          .ifPresent(authorEntity -> authorEntity.skip("CBI.12.2", "Not redacted because it's row does not belong to a vertebrate study"));
     end
 
 
@@ -325,7 +342,7 @@ rule "CBI.14.0: Redact CBI_sponsor entities if preceded by \"batches produced at
     when
         $sponsorEntity: TextEntity(type == "CBI_sponsor", textBefore.contains("batches produced at"))
     then
-        $sponsorEntity.apply("CBI.14.0", "Redacted because it represents a sponsor company", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+        $sponsorEntity.redact("CBI.14.0", "Redacted because it represents a sponsor company", "Reg (EC) No 1107/2009 Art. 63 (2g)");
     end
 
 
@@ -350,7 +367,7 @@ rule "CBI.15.0: Redact row if row contains \"determination of residues\" and liv
             .toList();
 
         $section.getEntitiesOfType(List.of($keyword, $residueKeyword))
-            .forEach(redactionEntity -> redactionEntity.apply("CBI.15.0", "Determination of residues and keyword \"" + $keyword + "\" was found.", "Reg (EC) No 1107/2009 Art. 63 (2g)"));
+            .forEach(redactionEntity -> redactionEntity.redact("CBI.15.0", "Determination of residues and keyword \"" + $keyword + "\" was found.", "Reg (EC) No 1107/2009 Art. 63 (2g)"));
     end
 
 rule "CBI.15.1: Redact CBI_author and CBI_address if row contains \"determination of residues\" and livestock keyword"
@@ -372,33 +389,33 @@ rule "CBI.15.1: Redact CBI_author and CBI_address if row contains \"determinatio
 
         $table.streamEntitiesWhereRowContainsStringsIgnoreCase(List.of($keyword, $residueKeyword))
             .filter(redactionEntity -> redactionEntity.isAnyType(List.of("CBI_author", "CBI_address")))
-            .forEach(redactionEntity -> redactionEntity.apply("CBI.15.1", "Determination of residues and keyword \"" + $keyword + "\" was found.", "Reg (EC) No 1107/2009 Art. 63 (2g)"));
+            .forEach(redactionEntity -> redactionEntity.redact("CBI.15.1", "Determination of residues and keyword \"" + $keyword + "\" was found.", "Reg (EC) No 1107/2009 Art. 63 (2g)"));
     end
 
 
 // Rule unit: CBI.16
-rule "CBI.16.0: Add CBI_author with \"et al.\" Regex (non vertebrate study)"
+rule "CBI.16.0: Add CBI_author with \"et al.\" RegEx (non vertebrate study)"
     agenda-group "LOCAL_DICTIONARY_ADDS"
     when
-        not FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        not FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $section: Section(containsString("et al."))
     then
         entityCreationService.byRegex("\\b([A-ZÄÖÜ][^\\s\\.,]+( [A-ZÄÖÜ]{1,2}\\.?)?( ?[A-ZÄÖÜ]\\.?)?) et al\\.?", "CBI_author", EntityType.ENTITY, 1, $section)
             .forEach(entity -> {
-                entity.apply("CBI.16.0", "Author found by \"et al\" regex", "Article 39(e)(3) of Regulation (EC) No 178/2002");
+                entity.redact("CBI.16.0", "Author found by \"et al\" regex", "Article 39(e)(3) of Regulation (EC) No 178/2002");
                 dictionary.recommendEverywhere(entity);
             });
     end
 
-rule "CBI.16.1: Add CBI_author with \"et al.\" Regex (vertebrate study)"
+rule "CBI.16.1: Add CBI_author with \"et al.\" RegEx (vertebrate study)"
     agenda-group "LOCAL_DICTIONARY_ADDS"
     when
-        FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $section: Section(containsString("et al."))
     then
         entityCreationService.byRegex("\\b([A-ZÄÖÜ][^\\s\\.,]+( [A-ZÄÖÜ]{1,2}\\.?)?( ?[A-ZÄÖÜ]\\.?)?) et al\\.?", "CBI_author", EntityType.ENTITY, 1, $section)
             .forEach(entity -> {
-                entity.apply("CBI.16.1", "Author found by \"et al\" regex", "Article 39(e)(2) of Regulation (EC) No 178/2002");
+                entity.redact("CBI.16.1", "Author found by \"et al\" regex", "Article 39(e)(2) of Regulation (EC) No 178/2002");
                 dictionary.recommendEverywhere(entity);
             });
     end
@@ -459,7 +476,7 @@ rule "CBI.19.0: Expand CBI_author entities with salutation prefix"
 rule "CBI.20.0: Redact between \"PERFORMING LABORATORY\" and \"LABORATORY PROJECT ID:\" (non vertebrate study)"
     agenda-group "LOCAL_DICTIONARY_ADDS"
     when
-        not FileAttribute(label == "Vertebrate Study", value == "Yes")
+        not FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $section: Section(!hasTables(), containsString("PERFORMING LABORATORY:"), containsString("LABORATORY PROJECT ID:"))
     then
         entityCreationService.betweenStrings("PERFORMING LABORATORY:", "LABORATORY PROJECT ID:", "CBI_address", EntityType.ENTITY, $section)
@@ -472,12 +489,12 @@ rule "CBI.20.0: Redact between \"PERFORMING LABORATORY\" and \"LABORATORY PROJEC
 rule "CBI.20.1: Redact between \"PERFORMING LABORATORY\" and \"LABORATORY PROJECT ID:\" (vertebrate study)"
     agenda-group "LOCAL_DICTIONARY_ADDS"
     when
-        FileAttribute(label == "Vertebrate Study", value == "Yes")
+        FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $section: Section(!hasTables(), containsString("PERFORMING LABORATORY:"), containsString("LABORATORY PROJECT ID:"))
     then
          entityCreationService.betweenStrings("PERFORMING LABORATORY:", "LABORATORY PROJECT ID:", "CBI_address", EntityType.ENTITY, $section)
          .forEach(laboratoryEntity -> {
-             laboratoryEntity.apply("CBI.20.1", "PERFORMING LABORATORY was found", "Article 39(e)(2) of Regulation (EC) No 178/2002");
+             laboratoryEntity.redact("CBI.20.1", "PERFORMING LABORATORY was found", "Article 39(e)(2) of Regulation (EC) No 178/2002");
              dictionary.recommendEverywhere(laboratoryEntity);
          });
     end
@@ -488,45 +505,45 @@ rule "CBI.20.1: Redact between \"PERFORMING LABORATORY\" and \"LABORATORY PROJEC
 // Rule unit: PII.0
 rule "PII.0.0: Redact all PII (non vertebrate study)"
     when
-        not FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        not FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $pii: TextEntity(type == "PII", dictionaryEntry)
     then
-        $pii.apply("PII.0.0", "Personal Information found", "Article 39(e)(3) of Regulation (EC) No 178/2002");
+        $pii.redact("PII.0.0", "Personal Information found", "Article 39(e)(3) of Regulation (EC) No 178/2002");
     end
 
 rule "PII.0.1: Redact all PII (vertebrate study)"
     when
-        FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $pii: TextEntity(type == "PII", dictionaryEntry)
     then
-        $pii.apply("PII.0.1", "Personal Information found", "Article 39(e)(2) of Regulation (EC) No 178/2002");
+        $pii.redact("PII.0.1", "Personal Information found", "Article 39(e)(2) of Regulation (EC) No 178/2002");
     end
 
 
 // Rule unit: PII.1
 rule "PII.1.0: Redact Emails by RegEx (Non vertebrate study)"
     when
-        not FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        not FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $section: Section(containsString("@"))
     then
         entityCreationService.byRegex("\\b([A-Za-z0-9._%+\\-]+@[A-Za-z0-9.\\-]+\\.[A-Za-z\\-]{1,23}[A-Za-z])\\b", "PII", EntityType.ENTITY, 1, $section)
-            .forEach(emailEntity -> emailEntity.apply("PII.1.0", "Found by Email Regex", "Article 39(e)(3) of Regulation (EC) No 178/2002"));
+            .forEach(emailEntity -> emailEntity.redact("PII.1.0", "Found by Email Regex", "Article 39(e)(3) of Regulation (EC) No 178/2002"));
     end
 
 rule "PII.1.1: Redact Emails by RegEx (vertebrate study)"
     when
-        FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $section: Section(containsString("@"))
     then
         entityCreationService.byRegex("\\b([A-Za-z0-9._%+\\-]+@[A-Za-z0-9.\\-]+\\.[A-Za-z\\-]{1,23}[A-Za-z])\\b", "PII", EntityType.ENTITY, 1, $section)
-            .forEach(emailEntity -> emailEntity.apply("PII.1.1", "Found by Email Regex", "Article 39(e)(3) of Regulation (EC) No 178/2002"));
+            .forEach(emailEntity -> emailEntity.redact("PII.1.1", "Found by Email Regex", "Article 39(e)(2) of Regulation (EC) No 178/2002"));
     end
 
 
 // Rule unit: PII.4
 rule "PII.4.0: Redact line after contact information keywords (non vertebrate study)"
     when
-        not FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        not FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $contactKeyword: String() from List.of("Contact point:",
                                          "Contact:",
                                          "Alternative contact:",
@@ -549,12 +566,12 @@ rule "PII.4.0: Redact line after contact information keywords (non vertebrate st
         $section: Section(containsString($contactKeyword))
     then
         entityCreationService.lineAfterString($contactKeyword, "PII", EntityType.ENTITY, $section)
-            .forEach(contactEntity -> contactEntity.apply("PII.4.0", "Found after \"" + $contactKeyword + "\" contact keyword", "Reg (EC) No 1107/2009 Art. 63 (2e)"));
+            .forEach(contactEntity -> contactEntity.redact("PII.4.0", "Found after \"" + $contactKeyword + "\" contact keyword", "Reg (EC) No 1107/2009 Art. 63 (2e)"));
     end
 
-rule "PII.4.1: Redact line after contact information keywords (non vertebrate study)"
+rule "PII.4.1: Redact line after contact information keywords (vertebrate study)"
     when
-        not FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $contactKeyword: String() from List.of("Contact point:",
                                          "Contact:",
                                          "Alternative contact:",
@@ -577,40 +594,40 @@ rule "PII.4.1: Redact line after contact information keywords (non vertebrate st
         $section: Section(containsString($contactKeyword))
     then
         entityCreationService.lineAfterString($contactKeyword, "PII", EntityType.ENTITY, $section)
-            .forEach(contactEntity -> contactEntity.apply("PII.4.1", "Found after \"" + $contactKeyword + "\" contact keyword", "Reg (EC) No 1107/2009 Art. 63 (2e)"));
+            .forEach(contactEntity -> contactEntity.redact("PII.4.1", "Found after \"" + $contactKeyword + "\" contact keyword", "Reg (EC) No 1107/2009 Art. 63 (2e)"));
     end
 
 
 // Rule unit: PII.6
-rule "PII.6.0: redact line between contact keywords (non vertebrate study)"
+rule "PII.6.0: Redact line between contact keywords (non vertebrate study)"
     when
-        not FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        not FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $section: Section((containsString("No:") && containsString("Fax")) || (containsString("Contact:") && containsString("Tel")))
     then
         Stream.concat(
             entityCreationService.betweenStrings("No:", "Fax", "PII", EntityType.ENTITY, $section),
             entityCreationService.betweenStrings("Contact:", "Tel", "PII", EntityType.ENTITY, $section)
         )
-            .forEach(contactEntity -> contactEntity.apply("PII.6.0", "Found between contact keywords", "Article 39(e)(3) of Regulation (EC) No 178/2002"));
+            .forEach(contactEntity -> contactEntity.redact("PII.6.0", "Found between contact keywords", "Article 39(e)(3) of Regulation (EC) No 178/2002"));
     end
 
-rule "PII.6.1: redact line between contact keywords"
+rule "PII.6.1: Redact line between contact keywords (vertebrate study)"
     when
-        FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $section: Section((containsString("No:") && containsString("Fax")) || (containsString("Contact:") && containsString("Tel")))
     then
         Stream.concat(
             entityCreationService.betweenStrings("No:", "Fax", "PII", EntityType.ENTITY, $section),
             entityCreationService.betweenStrings("Contact:", "Tel", "PII", EntityType.ENTITY, $section)
         )
-            .forEach(contactEntity -> contactEntity.apply("PII.6.1", "Found between contact keywords", "Article 39(e)(2) of Regulation (EC) No 178/2002"));
+            .forEach(contactEntity -> contactEntity.redact("PII.6.1", "Found between contact keywords", "Article 39(e)(2) of Regulation (EC) No 178/2002"));
     end
 
 
 // Rule unit: PII.7
 rule "PII.7.0: Redact contact information if applicant is found (non vertebrate study)"
     when
-        not FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        not FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $section: Section(getHeadline().containsString("applicant") ||
                           getHeadline().containsString("Primary contact") ||
                           getHeadline().containsString("Alternative contact") ||
@@ -623,12 +640,12 @@ rule "PII.7.0: Redact contact information if applicant is found (non vertebrate
                  entityCreationService.betweenStrings("No:", "Fax", "PII", EntityType.ENTITY, $section),
                  entityCreationService.betweenStrings("Contact:", "Tel", "PII", EntityType.ENTITY, $section)
              ))
-            .forEach(entity -> entity.apply("PII.7.0", "Applicant information was found", "Article 39(e)(3) of Regulation (EC) No 178/2002"));
+            .forEach(entity -> entity.redact("PII.7.0", "Applicant information was found", "Article 39(e)(3) of Regulation (EC) No 178/2002"));
     end
 
-rule "PII.7.1: Redact contact information if applicant is found (non vertebrate study)"
+rule "PII.7.1: Redact contact information if applicant is found (vertebrate study)"
     when
-        FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $section: Section(getHeadline().containsString("applicant") ||
                           getHeadline().containsString("Primary contact") ||
                           getHeadline().containsString("Alternative contact") ||
@@ -641,14 +658,14 @@ rule "PII.7.1: Redact contact information if applicant is found (non vertebrate
                  entityCreationService.betweenStrings("No:", "Fax", "PII", EntityType.ENTITY, $section),
                  entityCreationService.betweenStrings("Contact:", "Tel", "PII", EntityType.ENTITY, $section)
              ))
-            .forEach(entity -> entity.apply("PII.7.1", "Applicant information was found", "Article 39(e)(2) of Regulation (EC) No 178/2002"));
+            .forEach(entity -> entity.redact("PII.7.1", "Applicant information was found", "Article 39(e)(2) of Regulation (EC) No 178/2002"));
     end
 
 
 // Rule unit: PII.8
-rule "PII.8.0: Redact contact information if producer is found"
+rule "PII.8.0: Redact contact information if producer is found (non vertebrate study)"
     when
-        not FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        not FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $section: Section(containsStringIgnoreCase("producer of the plant protection") ||
                           containsStringIgnoreCase("producer of the active substance") ||
                           containsStringIgnoreCase("manufacturer of the active substance") ||
@@ -661,12 +678,12 @@ rule "PII.8.0: Redact contact information if producer is found"
                  entityCreationService.betweenStrings("No:", "Fax", "PII", EntityType.ENTITY, $section),
                  entityCreationService.betweenStrings("Contact:", "Tel", "PII", EntityType.ENTITY, $section)
              ))
-            .forEach(entity -> entity.apply("PII.8.0", "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)"));
+            .forEach(entity -> entity.redact("PII.8.0", "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)"));
     end
 
-rule "PII.8.1: Redact contact information if producer is found"
+rule "PII.8.1: Redact contact information if producer is found (vertebrate study)"
     when
-        FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
+        FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $section: Section(containsStringIgnoreCase("producer of the plant protection") ||
                           containsStringIgnoreCase("producer of the active substance") ||
                           containsStringIgnoreCase("manufacturer of the active substance") ||
@@ -679,45 +696,27 @@ rule "PII.8.1: Redact contact information if producer is found"
                  entityCreationService.betweenStrings("No:", "Fax", "PII", EntityType.ENTITY, $section),
                  entityCreationService.betweenStrings("Contact:", "Tel", "PII", EntityType.ENTITY, $section)
              ))
-            .forEach(entity -> entity.apply("PII.8.1", "Producer was found", "Article 39(e)(2) of Regulation (EC) No 178/2002"));
+            .forEach(entity -> entity.redact("PII.8.1", "Producer was found", "Article 39(e)(2) of Regulation (EC) No 178/2002"));
     end
 
 
 // Rule unit: PII.9
-rule "PII.9.0: Redact between \"AUTHOR(S)\" and \"COMPLETION DATE\" (non vertebrate study)"
+rule "PII.9.0: Redact between \"AUTHOR(S)\" and \"(STUDY) COMPLETION DATE\" (non vertebrate study)"
     when
-        not FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
-        $section: Section(!hasTables(), containsString("AUTHOR(S):"), containsString("COMPLETION DATE:"), !containsString("STUDY COMPLETION DATE:"))
+        not FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
+        $document: Document(containsStringIgnoreCase("AUTHOR(S)"), containsAnyStringIgnoreCase("COMPLETION DATE", "STUDY COMPLETION DATE"))
     then
-        entityCreationService.betweenStrings("AUTHOR(S):", "COMPLETION DATE:", "PII", EntityType.ENTITY, $section)
-         .forEach(authorEntity -> authorEntity.apply("PII.9.0", "AUTHOR(S) was found", "Article 39(e)(3) of Regulation (EC) No 178/2002"));
+        entityCreationService.shortestBetweenAnyStringIgnoreCase(List.of("AUTHOR(S)", "AUTHOR(S):"), List.of("COMPLETION DATE", "COMPLETION DATE:", "STUDY COMPLETION DATE", "STUDY COMPLETION DATE:"), "PII", EntityType.ENTITY, $document)
+         .forEach(authorEntity -> authorEntity.redact("PII.9.0", "AUTHOR(S) was found", "Article 39(e)(3) of Regulation (EC) No 178/2002"));
     end
 
-rule "PII.9.1: Redact between \"AUTHOR(S)\" and \"STUDY COMPLETION DATE\" (non vertebrate study)"
+rule "PII.9.1: Redact between \"AUTHOR(S)\" and \"(STUDY) COMPLETION DATE\" (vertebrate study)"
     when
-        FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
-        $section: Section(!hasTables(), containsString("AUTHOR(S):"), containsString("COMPLETION DATE:"), !containsString("STUDY COMPLETION DATE:"))
+        FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
+        $document: Document(containsStringIgnoreCase("AUTHOR(S)"), containsAnyStringIgnoreCase("COMPLETION DATE", "STUDY COMPLETION DATE"))
     then
-        entityCreationService.betweenStrings("AUTHOR(S):", "COMPLETION DATE:", "PII", EntityType.ENTITY, $section)
-         .forEach(authorEntity -> authorEntity.apply("PII.9.1", "AUTHOR(S) was found", "Article 39(e)(2) of Regulation (EC) No 178/2002"));
-    end
-
-rule "PII.9.2: Redact between \"AUTHOR(S)\" and \"COMPLETION DATE\" (non vertebrate study)"
-    when
-        not FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
-        $section: Section(!hasTables(), containsString("AUTHOR(S):"), containsString("STUDY COMPLETION DATE:"))
-    then
-        entityCreationService.betweenStrings("AUTHOR(S):", "STUDY COMPLETION DATE:", "PII", EntityType.ENTITY, $section)
-         .forEach(authorEntity -> authorEntity.apply("PII.9.2", "AUTHOR(S) was found", "Article 39(e)(3) of Regulation (EC) No 178/2002"));
-    end
-
-rule "PII.9.3: Redact between \"AUTHOR(S)\" and \"STUDY COMPLETION DATE\" (vertebrate study)"
-    when
-        FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
-        $section: Section(!hasTables(), containsString("AUTHOR(S):"), containsString("STUDY COMPLETION DATE:"))
-    then
-        entityCreationService.betweenStrings("AUTHOR(S):", "STUDY COMPLETION DATE:", "PII", EntityType.ENTITY, $section)
-         .forEach(authorEntity -> authorEntity.apply("PII.9.3", "AUTHOR(S) was found", "Article 39(e)(2) of Regulation (EC) No 178/2002"));
+        entityCreationService.shortestBetweenAnyStringIgnoreCase(List.of("AUTHOR(S)", "AUTHOR(S):"), List.of("COMPLETION DATE", "COMPLETION DATE:", "STUDY COMPLETION DATE", "STUDY COMPLETION DATE:"), "PII", EntityType.ENTITY, $document)
+        .forEach(authorEntity -> authorEntity.redact("PII.9.1", "AUTHOR(S) was found", "Article 39(e)(2) of Regulation (EC) No 178/2002"));
     end
 
 
@@ -727,17 +726,27 @@ rule "PII.11.0: Redact On behalf of Sequani Ltd.:"
         $section: Section(!hasTables(), containsString("On behalf of Sequani Ltd.: Name Title"))
     then
         entityCreationService.betweenStrings("On behalf of Sequani Ltd.: Name Title", "On behalf of", "PII", EntityType.ENTITY, $section)
-         .forEach(authorEntity -> authorEntity.apply("PII.11.0", "On behalf of Sequani Ltd.: Name Title was found", "Article 39(e)(3) of Regulation (EC) No 178/2002"));
+         .forEach(authorEntity -> authorEntity.redact("PII.11.0", "On behalf of Sequani Ltd.: Name Title was found", "Article 39(e)(3) of Regulation (EC) No 178/2002"));
     end
 
 
 // Rule unit: PII.12
 rule "PII.12.0: Expand PII entities with salutation prefix"
     when
+        not FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $entityToExpand: TextEntity(type == "PII", anyMatch(textBefore, "\\b(Mrs?|Ms|Miss|Sir|Madame?|Mme)\\s?\\.?\\s*"))
     then
         entityCreationService.byPrefixExpansionRegex($entityToExpand, "\\b(Mrs?|Ms|Miss|Sir|Madame?|Mme)\\s?\\.?\\s*")
-        .ifPresent(expandedEntity -> expandedEntity.addMatchedRules($entityToExpand.getMatchedRuleList()));
+        .ifPresent(expandedEntity -> expandedEntity.apply("PII.12.0", "Expanded PII with salutation prefix", "Article 39(e)(3) of Regulation (EC) No 178/2002"));
+    end
+
+rule "PII.12.1: Expand PII entities with salutation prefix"
+    when
+        FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
+        $entityToExpand: TextEntity(type == "PII", anyMatch(textBefore, "\\b(Mrs?|Ms|Miss|Sir|Madame?|Mme)\\s?\\.?\\s*"))
+    then
+        entityCreationService.byPrefixExpansionRegex($entityToExpand, "\\b(Mrs?|Ms|Miss|Sir|Madame?|Mme)\\s?\\.?\\s*")
+        .ifPresent(expandedEntity -> expandedEntity.apply("PII.12.1", "Expanded PII with salutation prefix", "Article 39(e)(2) of Regulation (EC) No 178/2002"));
     end
 
 
@@ -749,43 +758,43 @@ rule "ETC.1.0: Redact Purity"
         $section: Section(containsStringIgnoreCase("purity"))
     then
         entityCreationService.byRegex("\\bPurity:\\s*(<?>?\\s*\\d{1,2}(?:\\.\\d{1,2})?\\s*%)", "purity", EntityType.ENTITY, 1, $section)
-            .forEach(entity -> entity.apply("ETC.1.0", "Purity found", "Reg (EC) No 1107/2009 Art. 63 (2a)"));
+            .forEach(entity -> entity.redact("ETC.1.0", "Purity found", "Reg (EC) No 1107/2009 Art. 63 (2a)"));
      end
 
 
 // Rule unit: ETC.2
 rule "ETC.2.0: Redact signatures (non vertebrate study)"
     when
-        not FileAttribute(label == "Vertebrate Study", value == "Yes")
+        not FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $signature: Image(imageType == ImageType.SIGNATURE)
     then
-        $signature.apply("ETC.2.0", "Signature Found", "Article 39(e)(3) of Regulation (EC) No 178/2002");
+        $signature.redact("ETC.2.0", "Signature Found", "Article 39(e)(3) of Regulation (EC) No 178/2002");
     end
 
 rule "ETC.2.1: Redact signatures (vertebrate study)"
     when
-        FileAttribute(label == "Vertebrate Study", value == "Yes")
+        FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $signature: Image(imageType == ImageType.SIGNATURE)
     then
-        $signature.apply("ETC.2.1", "Signature Found", "Article 39(e)(2) of Regulation (EC) No 178/2002");
+        $signature.redact("ETC.2.1", "Signature Found", "Article 39(e)(2) of Regulation (EC) No 178/2002");
     end
 
 
 // Rule unit: ETC.3
-rule "ETC.3.0: Redact logos (vertebrate study)"
+rule "ETC.3.0: Skip logos (non vertebrate study)"
     when
-        not FileAttribute(label == "Vertebrate Study", value == "Yes")
+        not FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $logo: Image(imageType == ImageType.LOGO)
     then
-        $logo.apply("ETC.3.0", "Logo Found", "Article 39(e)(3) of Regulation (EC) No 178/2002");
+        $logo.skip("ETC.3.0", "Logo Found");
     end
 
-rule "ETC.3.1: Redact logos (non vertebrate study)"
+rule "ETC.3.1: Redact logos (vertebrate study)"
     when
-        FileAttribute(label == "Vertebrate Study", value == "Yes")
+        FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $logo: Image(imageType == ImageType.LOGO)
     then
-        $logo.apply("ETC.3.1", "Logo Found", "Article 39(e)(2) of Regulation (EC) No 178/2002");
+        $logo.redact("ETC.3.1", "Logo Found", "Article 39(e)(2) of Regulation (EC) No 178/2002");
     end
 
 
@@ -794,7 +803,7 @@ rule "ETC.4.0: Redact dossier dictionary entries"
     when
         $dossierRedaction: TextEntity(type == "dossier_redaction")
     then
-        $dossierRedaction.apply("ETC.4.0", "Specification of impurity found", "Article 39(e)(3) of Regulation (EC) No 178/2002");
+        $dossierRedaction.redact("ETC.4.0", "Specification of impurity found", "Article 39(e)(3) of Regulation (EC) No 178/2002");
     end
 
 
@@ -818,14 +827,14 @@ rule "ETC.6.0: Redact CAS Number"
             .map(tableCell -> entityCreationService.bySemanticNode(tableCell, "PII", EntityType.ENTITY))
             .filter(Optional::isPresent)
             .map(Optional::get)
-            .forEach(redactionEntity -> redactionEntity.apply("ETC.6.0", "Sample # found in Header", "Reg (EC) No 1107/2009 Art. 63 (2g)"));
+            .forEach(redactionEntity -> redactionEntity.redact("ETC.6.0", "Sample # found in Header", "Reg (EC) No 1107/2009 Art. 63 (2g)"));
     end
 
 
 // Rule unit: ETC.7
 rule "ETC.7.0: Guidelines FileAttributes"
     when
-        $section: Section(!hasTables(), (containsString("DATA REQUIREMENT(S):") || containsString("TEST GUIDELINE(S):")) && (containsString("OECD") || containsString("EPA") || containsString("OPPTS")))
+        $section: Section(!hasTables(), containsAnyString("DATA REQUIREMENT(S):", "TEST GUIDELINE(S):") && containsAnyString("OECD", "EPA", "OPPTS"))
     then
         RedactionSearchUtility.findTextRangesByRegex("OECD (No\\.? )?\\d{3}( \\(\\d{4}\\))?", $section.getTextBlock()).stream()
             .map(boundary -> $section.getTextBlock().subSequence(boundary).toString())
@@ -837,25 +846,25 @@ rule "ETC.7.0: Guidelines FileAttributes"
 // Rule unit: ETC.8
 rule "ETC.8.0: Redact formulas (vertebrate study)"
     when
-        not FileAttribute(label == "Vertebrate Study", value == "Yes")
+        not FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $logo: Image(imageType == ImageType.FORMULA)
     then
-        $logo.apply("ETC.8.0", "Logo Found", "Article 39(e)(3) of Regulation (EC) No 178/2002");
+        $logo.redact("ETC.8.0", "Logo Found", "Article 39(e)(3) of Regulation (EC) No 178/2002");
     end
 
 rule "ETC.8.1: Redact formulas (non vertebrate study)"
     when
-        FileAttribute(label == "Vertebrate Study", value == "Yes")
+        FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
         $logo: Image(imageType == ImageType.FORMULA)
     then
-        $logo.apply("ETC.8.1", "Logo Found", "Article 39(e)(2) of Regulation (EC) No 178/2002");
+        $logo.redact("ETC.8.1", "Logo Found", "Article 39(e)(2) of Regulation (EC) No 178/2002");
     end
 
 
 //------------------------------------ AI rules ------------------------------------
 
 // Rule unit: AI.0
-rule "AI.0.0: add all NER Entities of type CBI_author"
+rule "AI.0.0: Add all NER Entities of type CBI_author"
     salience 999
     when
         nerEntities: NerEntities(hasEntitiesOfType("CBI_author"))
@@ -866,7 +875,7 @@ rule "AI.0.0: add all NER Entities of type CBI_author"
 
 
 // Rule unit: AI.1
-rule "AI.1.0: combine and add NER Entities as CBI_address"
+rule "AI.1.0: Combine and add NER Entities as CBI_address"
     salience 999
     when
         nerEntities: NerEntities(hasEntitiesOfType("ORG") || hasEntitiesOfType("STREET") || hasEntitiesOfType("CITY"))
@@ -875,7 +884,7 @@ rule "AI.1.0: combine and add NER Entities as CBI_address"
     end
 
 
-//------------------------------------ Manual redaction rules ------------------------------------
+//------------------------------------ Manual changes rules ------------------------------------
 
 // Rule unit: MAN.0
 rule "MAN.0.0: Apply manual resize redaction"
@@ -909,7 +918,7 @@ rule "MAN.0.1: Apply manual resize redaction"
 rule "MAN.1.0: Apply id removals that are valid and not in forced redactions to Entity"
     salience 128
     when
-        $idRemoval: IdRemoval($id: annotationId, status == AnnotationStatus.APPROVED)
+        $idRemoval: IdRemoval($id: annotationId, !removeFromDictionary, !removeFromAllDossiers, status == AnnotationStatus.APPROVED)
         $entityToBeRemoved: TextEntity(matchesAnnotationId($id))
     then
         $entityToBeRemoved.getManualOverwrite().addChange($idRemoval);
@@ -1020,7 +1029,7 @@ rule "MAN.4.1: Apply legal basis change"
 //------------------------------------ Entity merging rules ------------------------------------
 
 // Rule unit: X.0
-rule "X.0.0: remove Entity contained by Entity of same type"
+rule "X.0.0: Remove Entity contained by Entity of same type"
     salience 65
     when
         $larger: TextEntity($type: type, $entityType: entityType, active())
@@ -1032,7 +1041,7 @@ rule "X.0.0: remove Entity contained by Entity of same type"
 
 
 // Rule unit: X.1
-rule "X.1.0: merge intersecting Entities of same type"
+rule "X.1.0: Merge intersecting Entities of same type"
     salience 64
     when
         $first: TextEntity($type: type, $entityType: entityType, !resized(), active())
@@ -1048,7 +1057,7 @@ rule "X.1.0: merge intersecting Entities of same type"
 
 
 // Rule unit: X.2
-rule "X.2.0: remove Entity of type ENTITY when contained by FALSE_POSITIVE"
+rule "X.2.0: Remove Entity of type ENTITY when contained by FALSE_POSITIVE"
     salience 64
     when
         $falsePositive: TextEntity($type: type, entityType == EntityType.FALSE_POSITIVE, active())
@@ -1061,7 +1070,7 @@ rule "X.2.0: remove Entity of type ENTITY when contained by FALSE_POSITIVE"
 
 
 // Rule unit: X.3
-rule "X.3.0: remove Entity of type RECOMMENDATION when contained by FALSE_RECOMMENDATION"
+rule "X.3.0: Remove Entity of type RECOMMENDATION when contained by FALSE_RECOMMENDATION"
     salience 64
     when
         $falseRecommendation: TextEntity($type: type, entityType == EntityType.FALSE_RECOMMENDATION, active())
@@ -1073,7 +1082,7 @@ rule "X.3.0: remove Entity of type RECOMMENDATION when contained by FALSE_RECOMM
 
 
 // Rule unit: X.4
-rule "X.4.0: remove Entity of type RECOMMENDATION when intersected by ENTITY with same type"
+rule "X.4.0: Remove Entity of type RECOMMENDATION when intersected by ENTITY with same type"
     salience 256
     when
         $entity: TextEntity($type: type, (entityType == EntityType.ENTITY || entityType == EntityType.HINT), active())
@@ -1086,7 +1095,7 @@ rule "X.4.0: remove Entity of type RECOMMENDATION when intersected by ENTITY wit
 
 
 // Rule unit: X.5
-rule "X.5.0: remove Entity of type RECOMMENDATION when contained by ENTITY"
+rule "X.5.0: Remove Entity of type RECOMMENDATION when contained by ENTITY"
     salience 256
     when
         $entity: TextEntity((entityType == EntityType.ENTITY || entityType == EntityType.HINT), active())
@@ -1098,7 +1107,7 @@ rule "X.5.0: remove Entity of type RECOMMENDATION when contained by ENTITY"
 
 
 // Rule unit: X.6
-rule "X.6.0: remove Entity of lower rank, when contained by entity of type ENTITY"
+rule "X.6.0: Remove Entity of lower rank, when contained by by entity of type ENTITY"
     salience 32
     when
         $higherRank: TextEntity($type: type, (entityType == EntityType.ENTITY || entityType == EntityType.HINT), active())
@@ -1113,7 +1122,7 @@ rule "X.6.1: remove Entity of higher rank, when intersected by entity of type EN
     salience 32
     when
         $higherRank: TextEntity($type: type, $value: value, (entityType == EntityType.ENTITY || entityType == EntityType.HINT), active())
-        $lowerRank: TextEntity(intersects($higherRank), type != $type, dictionary.getDictionaryRank(type) < dictionary.getDictionaryRank($type), !hasManualChanges(), active(), $lowerRank.getValue().length() > $value.length())
+        $lowerRank: TextEntity(intersects($higherRank), type != $type, (entityType == EntityType.ENTITY || entityType == EntityType.HINT), dictionary.getDictionaryRank(type) < dictionary.getDictionaryRank($type), !hasManualChanges(), active(), $lowerRank.getValue().length() > $value.length())
     then
         $higherRank.getIntersectingNodes().forEach(node -> update(node));
         $higherRank.remove("X.6.1", "remove Entity of higher rank, when intersected by entity of type ENTITY and length of lower rank Entity is bigger than the higher rank Entity");
@@ -1124,7 +1133,7 @@ rule "X.6.1: remove Entity of higher rank, when intersected by entity of type EN
 //------------------------------------ File attributes rules ------------------------------------
 
 // Rule unit: FA.1
-rule "FA.1.0: remove duplicate FileAttributes"
+rule "FA.1.0: Remove duplicate FileAttributes"
     salience 64
     when
         $fileAttribute: FileAttribute($label: label, $value: value)
@@ -1145,7 +1154,7 @@ rule "LDS.0.0: Run local dictionary search"
     then
         entityCreationService.bySearchImplementation($dictionaryModel.getLocalSearch(), $dictionaryModel.getType(), EntityType.RECOMMENDATION, document)
             .forEach(entity ->  {
-                Collection<MatchedRule> matchedRules = $dictionaryModel.getLocalEntriesWithMatchedRules().get(entity.getValue());
-                entity.addMatchedRules(matchedRules);
+                Collection<MatchedRule> matchedRules = $dictionaryModel.getMatchedRulesForLocalDictionaryEntry(entity.getValue());
+                matchedRules.forEach(matchedRule -> entity.addMatchedRule(matchedRule.asSkippedIfApplied()));
             });
     end

redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/rules_v2.drl

@@ -60,16 +60,40 @@ global EntityCreationService entityCreationService
 global ManualChangesApplicationService manualChangesApplicationService
 global Dictionary dictionary
 
-// --------------------------------------- queries -------------------------------------------------------------------
+//------------------------------------ queries ------------------------------------
 
 query "getFileAttributes"
     $fileAttribute: FileAttribute()
     end
 
-// --------------------------------------- NER Entities rules -------------------------------------------------------------------
+//------------------------------------ CBI rules ------------------------------------
+
+// Rule unit: CBI.0
+rule "CBI.0.0: Redact CBI Authors (non vertebrate Study)"
+    when
+        not FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
+        $entity: TextEntity(type == "CBI_author", dictionaryEntry)
+    then
+        $entity.redact("CBI.0.0", "Author found", "Article 39(e)(3) of Regulation (EC) No 178/2002");
+    end
+
+
+//------------------------------------ PII rules ------------------------------------
+
+// Rule unit: PII.0
+rule "PII.0.0: Redact all PII (non vertebrate study)"
+    when
+        not FileAttribute(label == "Vertebrate Study", value soundslike "Yes" || value.toLowerCase() == "y")
+        $pii: TextEntity(type == "PII", dictionaryEntry)
+    then
+        $pii.redact("PII.0.0", "Personal Information found", "Article 39(e)(3) of Regulation (EC) No 178/2002");
+    end
+
+
+//------------------------------------ AI rules ------------------------------------
 
 // Rule unit: AI.0
-rule "AI.0.0: add all NER Entities of type CBI_author"
+rule "AI.0.0: Add all NER Entities of type CBI_author"
     salience 999
     when
         nerEntities: NerEntities(hasEntitiesOfType("CBI_author"))
@@ -78,28 +102,8 @@ rule "AI.0.0: add all NER Entities of type CBI_author"
             .forEach(nerEntity -> entityCreationService.byNerEntity(nerEntity, EntityType.RECOMMENDATION, document));
     end
 
-// --------------------------------------- CBI rules -------------------------------------------------------------------
 
-rule "CBI.0.0: Always redact CBI_author"
-
-    when
-        $cbiAuthor: TextEntity(type == "CBI_author", entityType == EntityType.ENTITY)
-    then
-        $cbiAuthor.apply("CBI.0.0", "Author found", "Article 39(e)(2) of Regulation (EC) No 178/2002");
-    end
-
-// --------------------------------------- PII rules -------------------------------------------------------------------
-
-rule "PII.0.0: Always redact PII"
-
-    when
-        $cbiAuthor: TextEntity(type == "PII", entityType == EntityType.ENTITY)
-    then
-        $cbiAuthor.apply("PII.0.0", "PII found", "Article 39(e)(2) of Regulation (EC) No 178/2002");
-    end
-
-
-//------------------------------------ Manual redaction rules ------------------------------------
+//------------------------------------ Manual changes rules ------------------------------------
 
 // Rule unit: MAN.0
 rule "MAN.0.0: Apply manual resize redaction"
@@ -133,7 +137,7 @@ rule "MAN.0.1: Apply manual resize redaction"
 rule "MAN.1.0: Apply id removals that are valid and not in forced redactions to Entity"
     salience 128
     when
-        $idRemoval: IdRemoval($id: annotationId, status == AnnotationStatus.APPROVED)
+        $idRemoval: IdRemoval($id: annotationId, !removeFromDictionary, !removeFromAllDossiers, status == AnnotationStatus.APPROVED)
         $entityToBeRemoved: TextEntity(matchesAnnotationId($id))
     then
         $entityToBeRemoved.getManualOverwrite().addChange($idRemoval);
@@ -157,7 +161,6 @@ rule "MAN.1.1: Apply id removals that are valid and not in forced redactions to
 
 // Rule unit: MAN.2
 rule "MAN.2.0: Apply force redaction"
-    no-loop true
     salience 128
     when
         $force: ManualForceRedaction($id: annotationId, status == AnnotationStatus.APPROVED)
@@ -166,10 +169,10 @@ rule "MAN.2.0: Apply force redaction"
         $entityToForce.getManualOverwrite().addChange($force);
         update($entityToForce);
         $entityToForce.getIntersectingNodes().forEach(node -> update(node));
+        retract($force);
     end
 
 rule "MAN.2.1: Apply force redaction to images"
-    no-loop true
     salience 128
     when
         $force: ManualForceRedaction($id: annotationId, status == AnnotationStatus.APPROVED)
@@ -178,6 +181,7 @@ rule "MAN.2.1: Apply force redaction to images"
         $imageToForce.getManualOverwrite().addChange($force);
         update($imageToForce);
         update($imageToForce.getParent());
+        retract($force);
     end
 
 
@@ -185,9 +189,9 @@ rule "MAN.2.1: Apply force redaction to images"
 rule "MAN.3.0: Apply entity recategorization"
     salience 128
     when
-        $recategorization: ManualRecategorization($id: annotationId, status == AnnotationStatus.APPROVED, $requestDate: requestDate)
+        $recategorization: ManualRecategorization($id: annotationId, $type: type, status == AnnotationStatus.APPROVED, $requestDate: requestDate)
         not ManualRecategorization($id == annotationId, requestDate.isBefore($requestDate))
-        $entityToBeRecategorized: TextEntity(matchesAnnotationId($id))
+        $entityToBeRecategorized: TextEntity(matchesAnnotationId($id), type != $type)
     then
         $entityToBeRecategorized.getIntersectingNodes().forEach(node -> update(node));
         manualChangesApplicationService.recategorize($entityToBeRecategorized, $recategorization);
@@ -196,16 +200,14 @@ rule "MAN.3.0: Apply entity recategorization"
         retract($entityToBeRecategorized);
     end
 
-rule "MAN.3.1: Apply image recategorization"
+rule "MAN.3.1: Apply entity recategorization of same type"
     salience 128
     when
-        $recategorization: ManualRecategorization($id: annotationId, status == AnnotationStatus.APPROVED, $requestDate: requestDate)
+        $recategorization: ManualRecategorization($id: annotationId, $type: type, status == AnnotationStatus.APPROVED, $requestDate: requestDate)
         not ManualRecategorization($id == annotationId, requestDate.isBefore($requestDate))
-        $imageToBeRecategorized: Image($id == id)
+        $entityToBeRecategorized: TextEntity(matchesAnnotationId($id), type == $type)
     then
-        manualChangesApplicationService.recategorize($imageToBeRecategorized, $recategorization);
-        update($imageToBeRecategorized);
-        update($imageToBeRecategorized.getParent());
+        $entityToBeRecategorized.getManualOverwrite().addChange($recategorization);
         retract($recategorization);
     end
 
@@ -233,7 +235,7 @@ rule "MAN.4.1: Apply legal basis change"
 //------------------------------------ Entity merging rules ------------------------------------
 
 // Rule unit: X.0
-rule "X.0.0: remove Entity contained by Entity of same type"
+rule "X.0.0: Remove Entity contained by Entity of same type"
     salience 65
     when
         $larger: TextEntity($type: type, $entityType: entityType, active())
@@ -245,7 +247,7 @@ rule "X.0.0: remove Entity contained by Entity of same type"
 
 
 // Rule unit: X.1
-rule "X.1.0: merge intersecting Entities of same type"
+rule "X.1.0: Merge intersecting Entities of same type"
     salience 64
     when
         $first: TextEntity($type: type, $entityType: entityType, !resized(), active())
@@ -261,7 +263,7 @@ rule "X.1.0: merge intersecting Entities of same type"
 
 
 // Rule unit: X.2
-rule "X.2.0: remove Entity of type ENTITY when contained by FALSE_POSITIVE"
+rule "X.2.0: Remove Entity of type ENTITY when contained by FALSE_POSITIVE"
     salience 64
     when
         $falsePositive: TextEntity($type: type, entityType == EntityType.FALSE_POSITIVE, active())
@@ -274,7 +276,7 @@ rule "X.2.0: remove Entity of type ENTITY when contained by FALSE_POSITIVE"
 
 
 // Rule unit: X.3
-rule "X.3.0: remove Entity of type RECOMMENDATION when contained by FALSE_RECOMMENDATION"
+rule "X.3.0: Remove Entity of type RECOMMENDATION when contained by FALSE_RECOMMENDATION"
     salience 64
     when
         $falseRecommendation: TextEntity($type: type, entityType == EntityType.FALSE_RECOMMENDATION, active())
@@ -286,7 +288,7 @@ rule "X.3.0: remove Entity of type RECOMMENDATION when contained by FALSE_RECOMM
 
 
 // Rule unit: X.4
-rule "X.4.0: remove Entity of type RECOMMENDATION when intersected by ENTITY with same type"
+rule "X.4.0: Remove Entity of type RECOMMENDATION when intersected by ENTITY with same type"
     salience 256
     when
         $entity: TextEntity($type: type, (entityType == EntityType.ENTITY || entityType == EntityType.HINT), active())
@@ -299,7 +301,7 @@ rule "X.4.0: remove Entity of type RECOMMENDATION when intersected by ENTITY wit
 
 
 // Rule unit: X.5
-rule "X.5.0: remove Entity of type RECOMMENDATION when contained by ENTITY"
+rule "X.5.0: Remove Entity of type RECOMMENDATION when contained by ENTITY"
     salience 256
     when
         $entity: TextEntity((entityType == EntityType.ENTITY || entityType == EntityType.HINT), active())
@@ -311,7 +313,7 @@ rule "X.5.0: remove Entity of type RECOMMENDATION when contained by ENTITY"
 
 
 // Rule unit: X.6
-rule "X.6.0: remove Entity of lower rank, when contained by by entity of type ENTITY"
+rule "X.6.0: Remove Entity of lower rank, when contained by by entity of type ENTITY"
     salience 32
     when
         $higherRank: TextEntity($type: type, (entityType == EntityType.ENTITY || entityType == EntityType.HINT), active())
@@ -326,7 +328,7 @@ rule "X.6.1: remove Entity of higher rank, when intersected by entity of type EN
     salience 32
     when
         $higherRank: TextEntity($type: type, $value: value, (entityType == EntityType.ENTITY || entityType == EntityType.HINT), active())
-        $lowerRank: TextEntity(intersects($higherRank), type != $type, dictionary.getDictionaryRank(type) < dictionary.getDictionaryRank($type), !hasManualChanges(), active(), $lowerRank.getValue().length() > $value.length())
+        $lowerRank: TextEntity(intersects($higherRank), type != $type, (entityType == EntityType.ENTITY || entityType == EntityType.HINT), dictionary.getDictionaryRank(type) < dictionary.getDictionaryRank($type), !hasManualChanges(), active(), $lowerRank.getValue().length() > $value.length())
     then
         $higherRank.getIntersectingNodes().forEach(node -> update(node));
         $higherRank.remove("X.6.1", "remove Entity of higher rank, when intersected by entity of type ENTITY and length of lower rank Entity is bigger than the higher rank Entity");
@@ -337,7 +339,7 @@ rule "X.6.1: remove Entity of higher rank, when intersected by entity of type EN
 //------------------------------------ File attributes rules ------------------------------------
 
 // Rule unit: FA.1
-rule "FA.1.0: remove duplicate FileAttributes"
+rule "FA.1.0: Remove duplicate FileAttributes"
     salience 64
     when
         $fileAttribute: FileAttribute($label: label, $value: value)
@@ -358,7 +360,7 @@ rule "LDS.0.0: Run local dictionary search"
     then
         entityCreationService.bySearchImplementation($dictionaryModel.getLocalSearch(), $dictionaryModel.getType(), EntityType.RECOMMENDATION, document)
             .forEach(entity ->  {
-                Collection<MatchedRule> matchedRules = $dictionaryModel.getLocalEntriesWithMatchedRules().get(entity.getValue());
-                entity.addMatchedRules(matchedRules);
+                Collection<MatchedRule> matchedRules = $dictionaryModel.getMatchedRulesForLocalDictionaryEntry(entity.getValue());
+                matchedRules.forEach(matchedRule -> entity.addMatchedRule(matchedRule.asSkippedIfApplied()));
             });
     end

redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/table_demo.drl

@@ -53,7 +53,7 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualForceRedaction;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualRecategorization;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualLegalBasisChange;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.AnnotationStatus
+import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.AnnotationStatus;
 
 global Document document
 global EntityCreationService entityCreationService
@@ -65,8 +65,10 @@ global Dictionary dictionary
 query "getFileAttributes"
     $fileAttribute: FileAttribute()
     end
-//---------------------------------------------------------------------------
 
+//------------------------------------ Table extraction rules ------------------------------------
+
+// Rule unit: TAB.0
 rule "TAB.0.0: Study Type File Attribute"
     when
         not FileAttribute(label == "OECD Number", valueEqualsAnyOf("402","403","404","405","425","429","436","438","439","471","487"))
@@ -99,6 +101,8 @@ rule "TAB.0.1: Guidelines"
             .forEach(guideline -> guideline.apply("TAB.0.1", "OECD Guideline year found"));
     end
 
+
+// Rule unit: TAB.1
 rule "TAB.1.0: Full Table extraction (Guideline Deviation)"
     when
         FileAttribute(label == "OECD Number", valueEqualsAnyOf("425"))
@@ -106,10 +110,12 @@ rule "TAB.1.0: Full Table extraction (Guideline Deviation)"
         $table: Table() from $section.getParent().streamAllSubNodesOfType(NodeType.TABLE).toList()
         $tableCell: TableCell(!header) from $table.streamTableCells().toList()
     then
-        entityCreationService.bySemanticNode($tableCell, "guideline_deviation", EntityType.ENTITY)
+        entityCreationService.bySemanticNode($tableCell, "full_table_row", EntityType.ENTITY)
             .ifPresent(entity -> entity.apply("TAB.1.0", "full table extracted"));
     end
 
+
+// Rule unit: TAB.2
 rule "TAB.2.0: Individual row extraction (Clinical Signs)"
     when
         FileAttribute(label == "OECD Number", valueEqualsAnyOf("425"))
@@ -122,6 +128,8 @@ rule "TAB.2.0: Individual row extraction (Clinical Signs)"
             .ifPresent(entity -> entity.apply("TAB.2.0", "Individual row based on animal number"));
     end
 
+
+// Rule unit: TAB.3
 rule "TAB.3.0: Individual column extraction (Strain)"
     when
         FileAttribute(label == "OECD Number", valueEqualsAnyOf("425"))
@@ -135,34 +143,36 @@ rule "TAB.3.0: Individual column extraction (Strain)"
             .forEach(redactionEntity -> redactionEntity.apply("TAB.3.0", "Individual column based on column header"));
     end
 
+
+// Rule unit: TAB.4
 rule "TAB.4.0: Combined Columns Extraction - Sex and Dosage"
     when
         FileAttribute(label == "OECD Number", valueEqualsAnyOf("425"))
         $section: Section(getHeadline().containsString("Combined Columns"))
-        $table: Table(hasHeader("Sex"), hasHeader("Dosage (mg/kg bw)")) from $section.getParent().streamAllSubNodesOfType(NodeType.TABLE).toList()
-        $maleCells: TableCell($row: row, containsAnyWordIgnoreCase("Male")) from $table.streamTableCellsWithHeader("Sex").toList()
-        $dosageCells: TableCell($row == row) from $table.streamTableCellsWithHeader("Dosage").toList()
+        $table: Table(hasHeader("Dosage (mg/kg bw)")) from $section.getParent().streamAllSubNodesOfType(NodeType.TABLE).toList()
     then
-        entityCreationService.bySemanticNode($maleCells, "combined_male_dosage", EntityType.ENTITY)
-                    .ifPresent(entity -> entity.apply("TAB.4.0", "Dosage combined in row with male"));
-        entityCreationService.bySemanticNode($dosageCells, "combined_male_dosage", EntityType.ENTITY)
-                    .ifPresent(entity -> entity.apply("TAB.4.0", "Dosage combined in row with male"));
+        $table.streamTableCellsWithHeader("Dosage (mg/kg bw)")
+            .map(tableCell -> entityCreationService.bySemanticNode(tableCell, "dose_mortality_dose", EntityType.ENTITY))
+            .filter(Optional::isPresent)
+            .map(Optional::get)
+            .forEach(redactionEntity -> redactionEntity.apply("TAB.4.0", "Dose Mortality dose found."));
     end
 
 rule "TAB.4.1: Combined Columns Extraction - Sex and Mortality"
     when
         FileAttribute(label == "OECD Number", valueEqualsAnyOf("425"))
         $section: Section(getHeadline().containsString("Combined Columns"))
-        $table: Table(hasHeader("Sex"), hasHeader("Mortality")) from $section.getParent().streamAllSubNodesOfType(NodeType.TABLE).toList()
-        $femaleCells: TableCell($row: row, containsAnyWordIgnoreCase("Female")) from $table.streamTableCellsWithHeader("Sex").toList()
-        $mortalityCells: TableCell($row == row) from $table.streamTableCellsWithHeader("Mortality").toList()
+        $table: Table(hasHeader("Mortality")) from $section.getParent().streamAllSubNodesOfType(NodeType.TABLE).toList()
     then
-        entityCreationService.bySemanticNode($femaleCells, "combined_female_mortality", EntityType.ENTITY)
-            .ifPresent(entity -> entity.apply("TAB.4.1", "Mortality combined in row with female"));
-        entityCreationService.bySemanticNode($mortalityCells, "combined_female_mortality", EntityType.ENTITY)
-            .ifPresent(entity -> entity.apply("TAB.4.1", "Mortality combined in row with female"));
+        $table.streamTableCellsWithHeader("Mortality")
+            .map(tableCell -> entityCreationService.bySemanticNode(tableCell, "dose_mortality", EntityType.ENTITY))
+            .filter(Optional::isPresent)
+            .map(Optional::get)
+            .forEach(redactionEntity -> redactionEntity.apply("TAB.4.1", "Dose Mortality found."));
     end
 
+
+// Rule unit: TAB.5
 rule "TAB.5.0: Targeted cell extraction"
     when
         FileAttribute(label == "OECD Number", valueEqualsAnyOf("425"))
@@ -176,6 +186,8 @@ rule "TAB.5.0: Targeted cell extraction"
             .ifPresent(entity -> entity.apply("TAB.5.0", "Dosage found in row with survived male"));
     end
 
+
+// Rule unit: TAB.6
 rule "TAB.6.0: Targeted cell extraction (Experimental Stop date)"
     when
         $section: Section(getHeadline().containsString("Advanced Table Extraction"), containsAllStrings("female", "Female", "Survived", "Group 2"))
@@ -188,20 +200,23 @@ rule "TAB.6.0: Targeted cell extraction (Experimental Stop date)"
             .ifPresent(entity -> entity.apply("TAB.6.0", "Female in group to experimental start date"));
     end
 
+
+// Rule unit: TAB.7
 rule "TAB.7.0: Indicator (Species)"
     when
         FileAttribute(label == "OECD Number", valueEqualsAnyOf("425"))
         $section: Section(getHeadline().containsString("Entity-Based"))
         $table: Table() from $section.streamAllSubNodesOfType(NodeType.TABLE).toList()
         TableCell(isHeader(), containsString("Title"), $col: col) from $table.streamTableCells().toList()
-        TableCell(hasEntitiesOfType("vertebrate"), $row: row) from $table.streamTableCells().toList()
+        TableCell(hasEntitiesOfType("vertebrates"), $row: row) from $table.streamTableCells().toList()
         $cell: TableCell($col == col, $row == row) from $table.streamTableCells().toList()
     then
         entityCreationService.bySemanticNode($cell, "study_design", EntityType.ENTITY)
             .ifPresent(redactionEntity -> redactionEntity.apply("TAB.7.0", "Vertebrate study found"));
     end
 
-//------------------------------------ Manual redaction rules ------------------------------------
+
+//------------------------------------ Manual changes rules ------------------------------------
 
 // Rule unit: MAN.0
 rule "MAN.0.0: Apply manual resize redaction"
@@ -235,7 +250,7 @@ rule "MAN.0.1: Apply manual resize redaction"
 rule "MAN.1.0: Apply id removals that are valid and not in forced redactions to Entity"
     salience 128
     when
-        $idRemoval: IdRemoval($id: annotationId, status == AnnotationStatus.APPROVED)
+        $idRemoval: IdRemoval($id: annotationId, !removeFromDictionary, !removeFromAllDossiers, status == AnnotationStatus.APPROVED)
         $entityToBeRemoved: TextEntity(matchesAnnotationId($id))
     then
         $entityToBeRemoved.getManualOverwrite().addChange($idRemoval);
@@ -407,8 +422,32 @@ rule "X.5.0: Remove Entity of type RECOMMENDATION when contained by ENTITY"
     end
 
 
+// Rule unit: X.6
+rule "X.6.0: Remove Entity of lower rank, when contained by by entity of type ENTITY"
+    salience 32
+    when
+        $higherRank: TextEntity($type: type, (entityType == EntityType.ENTITY || entityType == EntityType.HINT), active())
+        $lowerRank: TextEntity(containedBy($higherRank), type != $type, dictionary.getDictionaryRank(type) < dictionary.getDictionaryRank($type), !hasManualChanges(), active())
+    then
+        $lowerRank.getIntersectingNodes().forEach(node -> update(node));
+        $lowerRank.remove("X.6.0", "remove Entity of lower rank, when contained by entity of type ENTITY");
+        retract($lowerRank);
+    end
+
+rule "X.6.1: remove Entity of higher rank, when intersected by entity of type ENTITY and length of lower rank Entity is bigger than the higher rank Entity"
+    salience 32
+    when
+        $higherRank: TextEntity($type: type, $value: value, (entityType == EntityType.ENTITY || entityType == EntityType.HINT), active())
+        $lowerRank: TextEntity(intersects($higherRank), type != $type, (entityType == EntityType.ENTITY || entityType == EntityType.HINT), dictionary.getDictionaryRank(type) < dictionary.getDictionaryRank($type), !hasManualChanges(), active(), $lowerRank.getValue().length() > $value.length())
+    then
+        $higherRank.getIntersectingNodes().forEach(node -> update(node));
+        $higherRank.remove("X.6.1", "remove Entity of higher rank, when intersected by entity of type ENTITY and length of lower rank Entity is bigger than the higher rank Entity");
+        retract($higherRank);
+    end
+
+
 // Rule unit: X.7
-rule "X.7.0: remove all images"
+rule "X.7.0: Remove all images"
     salience 512
     when
         $image: Image(imageType != ImageType.OCR, !hasManualChanges())
@@ -442,7 +481,7 @@ rule "LDS.0.0: Run local dictionary search"
     then
         entityCreationService.bySearchImplementation($dictionaryModel.getLocalSearch(), $dictionaryModel.getType(), EntityType.RECOMMENDATION, document)
             .forEach(entity ->  {
-                Collection<MatchedRule> matchedRules = $dictionaryModel.getLocalEntriesWithMatchedRules().get(entity.getValue());
-                entity.addMatchedRules(matchedRules);
+                Collection<MatchedRule> matchedRules = $dictionaryModel.getMatchedRulesForLocalDictionaryEntry(entity.getValue());
+                matchedRules.forEach(matchedRule -> entity.addMatchedRule(matchedRule.asSkippedIfApplied()));
             });
     end

redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/table_demo_components.drl

@@ -45,467 +45,73 @@ declare GuidelineMapping
     guideline: String
  end
 
-//------------------------------------ Default Components rules ------------------------------------
+//------------------------------------ Demo Components rules ------------------------------------
 
-rule "StudyTitle.0.0: First Title found"
+rule "FullTable.1.1: All rows of matching table"
     when
-        $titleCandidates: List() from collect (Entity(type == "title"))
+        $tableRowValues: List() from collect (Entity(type == "full_table_row"))
     then
-        componentCreationService.firstOrElse("StudyTitle.0.0", "Study_Title", $titleCandidates, "");
+        componentCreationService.joiningFromSameTableRow("FullTable.1.1", "1.1 Full Table", $tableRowValues);
     end
 
 
-rule "PerformingLaboratory.1.0: Performing Laboratory name and country found in same section"
+rule "IndivRowExtr.1.2: Individual rows of table"
     when
-        $laboratoryName: Entity(type == "laboratory_name", $node: containingNode)
-        $laboratoryCountry: Entity(type == "laboratory_country", containingNode == $node)
-        not Entity(type == "laboratory_country", containingNode == $node, Math.abs($laboratoryName.startOffset - startOffset) < Math.abs($laboratoryName.startOffset - $laboratoryCountry.startOffset))
-    then
-        componentCreationService.create("PerformingLaboratory.1.0", "Performing_Laboratory", $laboratoryName.getValue() + ", " + $laboratoryCountry.getValue(), "Laboratory name and country found!", List.of($laboratoryName, $laboratoryCountry));
-    end
-
-rule "PerformingLaboratory.2.0: Performing Laboratory name but no country found in same section"
-    when
-        $laboratoryName: Entity(type == "laboratory_name", $node: containingNode)
-        not Entity(type == "laboratory_country", containingNode == $node)
-    then
-        componentCreationService.create("PerformingLaboratory.2.0", "Performing_Laboratory", $laboratoryName.getValue(), "Only laboratory name found!", List.of($laboratoryName));
-    end
-
-rule "PerformingLaboratory.0.2: Performing Laboratory not found"
-    salience -1
-    when
-        not Component(name == "Performing_Laboratory")
-    then
-        componentCreationService.create("PerformingLaboratory.0.2", "Performing_Laboratory", "", "fallback");
-    end
-
-
-rule "ReportNumber.0.0: First Report number found"
-    when
-        $reportNumberCandidates: List() from collect (Entity(type == "report_number"))
-    then
-        componentCreationService.firstOrElse("ReportNumber.0.0", "Report_Number", $reportNumberCandidates, "");
-    end
-
-
-rule "GLPStudy.0.0: GLP Study found"
-    when
-        $glpStudyList: List(!isEmpty) from collect(Entity(type == "glp_study"))
-    then
-        componentCreationService.create("GLPStudy.0.0", "GLP_Study", "Yes", "Yes if present, No if not", $glpStudyList);
-    end
-
-rule "GLPStudy.1.0: GLP Study not found"
-    when
-        not Entity(type == "glp_study")
-    then
-        componentCreationService.create("GLPStudy.1.0", "GLP_Study", "No", "Yes if present, No if not");
-    end
-
-
-rule "TestGuideline.0.0: create OECD number and year guideline mappings"
-    salience 2
-    when
-        Entity(type == "oecd_guideline_number")
-        Entity(type == "oecd_guideline_year")
-    then
-        insert(new GuidelineMapping("425", "2008", "Nº 425: Acute oral Toxicity - Up-and-Down Procedure (03/10/2008)"));
-        insert(new GuidelineMapping("425", "2001", "Nº 425: Acute oral Toxicity - Up-and-Down Procedure (17/12/2001)"));
-        insert(new GuidelineMapping("402", "2017", "Nº 402: Acute Dermal Toxicity (09/10/2017)"));
-        insert(new GuidelineMapping("402", "1987", "Nº 402: Acute Dermal Toxicity (24/02/1987)"));
-        insert(new GuidelineMapping("403", "2009", "Nº 403: Acute Inhalation Toxicity (08/09/2009)"));
-        insert(new GuidelineMapping("403", "1981", "Nº 403: Acute Inhalation Toxicity (12/05/1981)"));
-        insert(new GuidelineMapping("433", "2018", "Nº 433: Acute Inhalation Toxicity: Fixed Concentration Procedure (27/06/2018)"));
-        insert(new GuidelineMapping("433", "2017", "Nº 433: Acute Inhalation Toxicity: Fixed Concentration Procedure (09/10/2017)"));
-        insert(new GuidelineMapping("436", "2009", "Nº 436: Acute Inhalation Toxicity – Acute Toxic Class Method (08/09/2009)"));
-        insert(new GuidelineMapping("404", "1981", "Nº 404: Acute Dermal Irritation/Corrosion (12/05/1981)"));
-        insert(new GuidelineMapping("404", "1992", "Nº 404: Acute Dermal Irritation/Corrosion (17/07/1992)"));
-        insert(new GuidelineMapping("404", "2002", "Nº 404: Acute Dermal Irritation/Corrosion (24/04/2002)"));
-        insert(new GuidelineMapping("404", "2015", "Nº 404: Acute Dermal Irritation/Corrosion (28/07/2015)"));
-        insert(new GuidelineMapping("405", "2017", "Nº 405: Acute Eye Irritation/Corrosion (09/10/2017)"));
-        insert(new GuidelineMapping("405", "2012", "Nº 405: Acute Eye Irritation/Corrosion (02/10/2012)"));
-        insert(new GuidelineMapping("405", "2002", "Nº 405: Acute Eye Irritation/Corrosion (24/04/2002)"));
-        insert(new GuidelineMapping("405", "1987", "Nº 405: Acute Eye Irritation/Corrosion (24/02/1987)"));
-        insert(new GuidelineMapping("429", "2002", "Nº 429: Skin Sensitisation: Local Lymph Node Assay (24/04/2002)"));
-        insert(new GuidelineMapping("429", "2010", "Nº 429: Skin Sensitisation (23/07/2010)"));
-        insert(new GuidelineMapping("442A", "2018", "Nº 442A: Skin Sensitization (23/07/2018)"));
-        insert(new GuidelineMapping("442B", "2018", "Nº 442B: Skin Sensitization (27/06/2018)"));
-        insert(new GuidelineMapping("471", "1997", "Nº 471: Bacterial Reverse Mutation Test (21/07/1997)"));
-        insert(new GuidelineMapping("471", "2020", "Nº 471: Bacterial Reverse Mutation Test (26/06/2020)"));
-        insert(new GuidelineMapping("406", "1992", "Nº 406: Skin Sensitisation (1992)"));
-        insert(new GuidelineMapping("428", "2004", "Nº 428: Split-Thickness Skin test (2004)"));
-        insert(new GuidelineMapping("438", "2018", "Nº 438: Eye Irritation (26/06/2018)"));
-        insert(new GuidelineMapping("439", "2019", "Nº 439: Skin Irritation (2019)"));
-        insert(new GuidelineMapping("474", "2016", "Nº 474: Micronucleus Bone Marrow Cells Rat (2016)"));
-        insert(new GuidelineMapping("487", "2016", "Nº 487: Micronucleus Human Lymphocytes (2016)"));
-    end
-
-rule "TestGuideline.0.1: match OECD number and year with guideline mappings"
-    salience 1
-    when
-        not Component(name == "Test_Guidelines_1")
-        GuidelineMapping($year: year, $number: number, $guideline: guideline)
-        $guidelineNumber: Entity(type == "oecd_guideline_number", value == $number)
-        $guidelineYear: Entity(type == "oecd_guideline_year", value == $year)
-    then
-        componentCreationService.create(
-           "TestGuideline.0.0",
-           "Test_Guidelines_1",
-           $guideline,
-           "OECD Number and guideline year mapped!",
-           List.of($guidelineNumber, $guidelineYear)
-        );
-    end
-
-rule "TestGuideline.1.0: no guideline mapping found"
-    when
-        not Component(name == "Test_Guidelines_1")
-        $guideLine: Entity(type == "oecd_guideline")
-    then
-        componentCreationService.create("TestGuideline.2.0", "Test_Guidelines_1", $guideLine.getValue(), "No Mapping for OECD number and year found, using fallback instead!", List.of($guideLine));
-    end
-
-rule "TestGuideline.2.0: All values of EPA guideline and EC guidelines"
-    when
-        $guidelines: List() from collect (Entity(type == "epa_guideline" || type ==  "ec_guideline"))
-    then
-        componentCreationService.joining("TestGuideline.2.0", "Test_Guidelines_2", $guidelines);
-    end
-
-
-rule "StartDate.0.0: All experimental start dates converted to dd/MM/yyyy"
-    when
-        $startDates: List() from collect (Entity(type == "experimental_start_date"))
-    then
-        componentCreationService.convertDates("StartDate.0.0", "Experimental_Starting_Date", $startDates);
-    end
-
-
-rule "CompletionDate.0.0: All experimental end dates converted to dd/MM/yyyy"
-    when
-        $endDates: List() from collect (Entity(type == "experimental_end_date"))
-    then
-        componentCreationService.convertDates("CompletionDate.0.0", "Experimental_Completion_Date", $endDates);
-    end
-
-
-rule "AnalysisCertificate.0.0: Unique values of certificate of analysis batch identification"
-    when
-        $batchNumbers: List() from collect (Entity(type == "batch_number"))
-    then
-        componentCreationService.joiningUnique("AnalysisCertificate.0.0", "Certificate_of_Analysis_Batch_Identification", $batchNumbers);
-    end
-
-rule "StudyConclusion.0.0: Study conclusion in first found section"
-    when
-        $oecdNumber: String() from List.of("402", "403", "404", "405", "425", "429", "436", "471")
-        FileAttribute(label == "OECD Number", value == $oecdNumber)
-        $studyConclusions: List() from collect(Entity(type == "study_conclusion"))
-    then
-        componentCreationService.joiningFromFirstSectionOnly("StudyConclusion.0.0", "Study_Conclusion", $studyConclusions, " ");
-    end
-
-rule "GuidelineDeviation.0.0: Guideline deviation as sentences"
-    when
-        $oecdNumber: String() from List.of("402", "403", "404", "405", "425", "429", "436", "471")
-        FileAttribute(label == "OECD Number", value == $oecdNumber)
-        $guidelineDeviations: List() from collect (Entity(type == "guideline_deviation"))
-    then
-        componentCreationService.joining("GuidelineDeviation.0.0", "Deviation_from_the_Guideline", $guidelineDeviations, "\n");
-    end
-
-rule "Species.0.0: First found species"
-    when
-        $oecdNumber: String() from List.of("402", "403", "404", "405", "425", "429", "436", "471")
-        FileAttribute(label == "OECD Number", value == $oecdNumber)
-        $species: List() from collect (Entity(type == "species"))
-    then
-        componentCreationService.firstOrElse("Species.0.0", "Species", $species, "");
-    end
-
-rule "Strain.0.0: First found strain"
-    when
-        $oecdNumber: String() from List.of("402", "403", "404", "405", "425", "429", "436", "471")
-        FileAttribute(label == "OECD Number", value == $oecdNumber)
-        $strain: List() from collect (Entity(type == "strain"))
-    then
-        componentCreationService.firstOrElse("Strain.0.0", "Strain", $strain, "");
-    end
-
-rule "Conclusion.0.0: Unique values of Conclusion LD50"
-    when
-        $oecdNumber: String() from List.of("402", "403", "425", "436")
-        FileAttribute(label == "OECD Number", value == $oecdNumber)
-        $conclusions: List() from collect (Entity(type == "ld50_value"))
-    then
-        componentCreationService.joiningUnique("Conclusion.0.0", "Conclusion_LD50_mg_per_kg", $conclusions);
-    end
-
-rule "Conclusion0.1.0: Greater than found"
-    when
-        $oecdNumber: String() from List.of("402", "403", "425", "436")
-        FileAttribute(label == "OECD Number", value == $oecdNumber)
-        $conclusions: List(!isEmpty()) from collect (Entity(type == "ld50_greater"))
-    then
-        componentCreationService.create("Conclusion.1.0", "Conclusion_LD50_Greater_than", "Greater than", "Entity of type 'ld50_greater' found", $conclusions);
-    end
-
-rule "Conclusion.1.1: Greater than not found"
-    when
-        $oecdNumber: String() from List.of("402", "403", "425", "436")
-        FileAttribute(label == "OECD Number", value == $oecdNumber)
-        not Entity(type == "ld50_greater")
-    then
-        componentCreationService.create("Conclusion.1.1", "Conclusion_LD50_Greater_than", "", "No entity of type 'ld50_greater' found");
-    end
-
-rule "Conclusion.2.0: Minimum confidence as unique values"
-    when
-        $oecdNumber: String() from List.of("402", "403", "425", "436")
-        FileAttribute(label == "OECD Number", value == $oecdNumber)
-        $conclusions: List() from collect (Entity(type == "confidence_minimal"))
-    then
-        componentCreationService.joiningUnique("Conclusion.2.0", "Conclusion_Minimum_Confidence", $conclusions);
-    end
-
-rule "Conclusion.3.0: Maximum confidence as unique values"
-    when
-        $oecdNumber: String() from List.of("402", "403", "425", "436")
-        FileAttribute(label == "OECD Number", value == $oecdNumber)
-        $conclusions: List() from collect (Entity(type == "confidence_maximal"))
-    then
-        componentCreationService.joiningUnique("Conclusion.3.0", "Conclusion_Maximum_Confidence", $conclusions);
-    end
-
-rule "Necropsy.0.0: Necropsy findings from longest section"
-    when
-        FileAttribute(label == "OECD Number", value == "402")
-        $necropsies: List() from collect (Entity(type == "necropsy_findings"))
-    then
-        componentCreationService.joiningFromLongestSectionOnly("Necropsy.0.0", "Necropsy_Findings", $necropsies, " ");
-    end
-
-rule "Necropsy.0.1: Necropsy findings joined with \n"
-    when
-        FileAttribute(label == "OECD Number", value == "403" || value == "436")
-        $necropsies: List() from collect (Entity(type == "necropsy_findings"))
-    then
-        componentCreationService.joining("Necropsy.0.0", "Necropsy_Findings", $necropsies, "\n");
-    end
-
-rule "Necropsy.1.0: Doses mg per kg of Bodyweight as one block"
-    when
-        FileAttribute(label == "OECD Number", value == "402")
-        $dosages: List() from collect (Entity(type == "doses_(mg_kg_bw)"))
-    then
-        componentCreationService.joining("Necropsy.1.0", "Doses_mg_per_kg_bw", $dosages, " ");
-    end
-
-rule "Necropsy.2.0: Conducted with 4 hours of exposure as one block"
-    when
-        $oecdNumber: String() from List.of("403", "436")
-        FileAttribute(label == "OECD Number", value == $oecdNumber)
-        $exposures: List() from collect (Entity(type == "4h_exposure"))
-    then
-        componentCreationService.joining("Necropsy.3.0", "Conducted_with_4_Hours_of_Exposure", $exposures, " ");
-    end
-
-rule "StudyDesign.0.0: Study design as one block"
-    when
-        $oecdNumber: String() from List.of("404", "405", "429", "406", "428", "438", "439", "474", "487")
-        FileAttribute(label == "OECD Number", value == $oecdNumber)
-        $studyDesigns: List() from collect (Entity(type == "study_design"))
-    then
-        componentCreationService.joining("StudyDesign.0.0", "Study_Design", $studyDesigns, " ");
-    end
-
-rule "Results.0.0: Results and conclusions as joined values"
-    when
-        $oecdNumber: String() from List.of("406", "428", "438", "439", "474", "487")
-        FileAttribute(label == "OECD Number", value == $oecdNumber)
-        $results: List() from collect (Entity(type == "results_and_conclusion"))
-    then
-        componentCreationService.joining("Results.0.0", "Results_and_Conclusions", $results, " ");
-    end
-
-rule "WeightBehavior.0.0: Weight change behavior as sentences"
-    when
-        FileAttribute(label == "OECD Number", value == "402")
-        $weightChanges: List() from collect (Entity(type == "weight_behavior_changes"))
-    then
-        componentCreationService.joining("WeightBehavior.0.0", "Weight_Behavior_Changes", $weightChanges, "\n");
-    end
-
-rule "MortalityStatement.0.0: Mortality statements as one block"
-    when
-        FileAttribute(label == "OECD Number", value == "402")
-        $mortalityStatements: List() from collect (Entity(type == "mortality_statement"))
-    then
-        componentCreationService.joining("MortalityStatement.0.0", "Mortality_Statement", $mortalityStatements, " ");
-    end
-
-rule "ClinicalObservations.0.0: Clinical observations as sentences"
-    when
-        FileAttribute(label == "OECD Number", value == "403")
-        $observations: List() from collect (Entity(type == "clinical_observations"))
-    then
-        componentCreationService.joining("MortalityStatement.0.0", "Clinical_Observations", $observations, "\n");
-    end
-
-rule "BodyWeight.0.0: Bodyweight changes as sentences"
-    when
-        FileAttribute(label == "OECD Number", value == "403")
-        $weightChanges: List() from collect (Entity(type == "bodyweight_changes"))
-    then
-        componentCreationService.joining("BodyWeight.0.0", "Body_Weight_Changes", $weightChanges, "\n");
-    end
-
-rule "Detailing.0.0: Detailing of reported changes as one block"
-    when
-        $oecdNumber: String() from List.of("404", "405")
-        FileAttribute(label == "OECD Number", value == $oecdNumber)
-        $detailings: List() from collect (Entity(type == "detailing"))
-    then
-        componentCreationService.joining("Detailing.0.0", "Detailing_of_Reported_Changes", $detailings, " ");
-    end
-
-rule "Sex.0.0: Male sex found"
-    when
-        $oecdNumber: String() from List.of("405", "429")
-        FileAttribute(label == "OECD Number", value == $oecdNumber)
-        $males: List(!isEmpty) from collect (Entity(type == "sex", (value.toLowerCase() == "male" || value.toLowerCase() == "males")))
-    then
-        componentCreationService.create("Sex.0.0", "Sex", "male", "male sex found", $males);
-    end
-
-rule "Sex.1.0: Female sex found"
-    when
-        $oecdNumber: String() from List.of("405", "429")
-        FileAttribute(label == "OECD Number", value == $oecdNumber)
-        $females: List(!isEmpty) from collect (Entity(type == "sex", (value.toLowerCase() == "female" || value.toLowerCase() == "females")))
-    then
-        componentCreationService.create("Sex.0.0", "Sex", "female", "female sex found", $females);
-    end
-
-rule "NumberOfAnimals.0.0: Number of animals found"
-    when
-        $oecdNumber: String() from List.of("405", "429")
-        FileAttribute(label == "OECD Number", value == $oecdNumber)
-        $numberOfAnimals: Entity(type == "number_of_animals")
-    then
-        componentCreationService.create("NumberOfAnimals.0.0", "Number_of_Animals", $numberOfAnimals.getValue(), "Number of animals found directly", $numberOfAnimals);
-    end
-
-rule "NumberOfAnimals.1.0: Count unique occurences of animals"
-    when
-        $oecdNumber: String() from List.of("405", "429")
-        FileAttribute(label == "OECD Number", value == $oecdNumber)
-        not Entity(type == "number_of_animals")
-        $animals: List() from collect (Entity(type == "animal_number"))
-    then
-        componentCreationService.uniqueValueCount("NumberOfAnimals.1.0", "Number_of_Animals", $animals);
-    end
-
-rule "ClinicalSigns.0.0: Clinical signs as sentences"
-    when
-        $oecdNumber: String() from List.of("425")
-        FileAttribute(label == "OECD Number", value == $oecdNumber)
         $clinicalSigns: List() from collect (Entity(type == "clinical_signs"))
     then
-        componentCreationService.joining("ClinicalSigns.0.0", "Clinical_Signs", $clinicalSigns, "\n");
+        componentCreationService.joiningFromSameTableRow("IndivRowExtr.1.2", "1.2 Individual Rows", $clinicalSigns);
     end
 
-rule "DoseMortality.0.0: Dose mortality joined with dose from same table row"
+
+rule "IndivColExtr.1.3: Individual column of table"
+    when
+        $tableColValues: List() from collect (Entity(type == "dosages"))
+    then
+        componentCreationService.joiningFromSameTableRow("IndivColExtr.1.3", "1.3 Individual Column", $tableColValues);
+    end
+
+
+rule "CombColExtr.2.1: Combined Columns Extraction"
     when
-        $oecdNumber: String() from List.of("425")
-        FileAttribute(label == "OECD Number", value == $oecdNumber)
         $doseMortalities: List() from collect (Entity(type == "dose_mortality" || type == "dose_mortality_dose"))
     then
-        componentCreationService.joiningFromSameTableRow("DoseMortality.0.0", "Dose_Mortality", $doseMortalities);
+        componentCreationService.joiningFromSameTableRow("DoseMortality.0.0", "2.1 Combined Columns", $doseMortalities);
     end
 
-rule "Mortality.0.0: Mortality as one block"
+
+rule "ValueExtrRef.2.2: Cells containing dose for survived males"
     when
-        $oecdNumber: String() from List.of("425")
-        FileAttribute(label == "OECD Number", value == $oecdNumber)
-        $mortalities: List() from collect (Entity(type == "mortality"))
+        $tableValues: List() from collect (Entity(type == "doses_mg_kg_bw"))
     then
-        componentCreationService.joining("Mortality.0.0", "Mortality", $mortalities, " ");
+        componentCreationService.joining("ValueExtrRef.2.2", "2.2 Individual Table Values", $tableValues);
     end
 
-rule "Dosages.0.0: First found value of Dosages"
+
+rule "AdvTableExtr.2.3: Cells containing dose for survived males"
     when
-        $oecdNumber: String() from List.of("425")
-        FileAttribute(label == "OECD Number", value == $oecdNumber)
-        $mortalities: List() from collect (Entity(type == "dosages"))
+        $tableValues: List() from collect (Entity(type == "experiment_female_survived"))
     then
-        componentCreationService.firstOrElse("Dosages.0.0", "Dosages", $mortalities, "");
+        componentCreationService.rowValueCount("AdvTableExtr.2.3", "2.3 Advanced Table Values", $tableValues);
     end
 
-rule "PrelimResults.0.0: Preliminary test results as sentences"
+
+rule "EntityBasedExtr.2.4: Cells containing dose for survived males"
     when
-        $oecdNumber: String() from List.of("429")
-        FileAttribute(label == "OECD Number", value == $oecdNumber)
-        $results: List() from collect (Entity(type == "preliminary_test_results"))
+        $tableValues: List() from collect (Entity(type == "study_design"))
     then
-        componentCreationService.joining("PrelimResults.0.0", "Preliminary_Test_Results", $results, "\n");
+        componentCreationService.joiningFromSameTableRow("EntityBasedExtr.2.4", "2.4 Entity-Based Values", $tableValues);
     end
 
-rule "TestResults.0.0: Test results as one block"
-    when
-        $oecdNumber: String() from List.of("429")
-        FileAttribute(label == "OECD Number", value == $oecdNumber)
-        $results: List() from collect (Entity(type == "test_results"))
-    then
-        componentCreationService.joining("TestResults.0.0", "Test_Results", $results, " ");
-    end
 
-rule "PositiveControl.0.0: Was the definitive study conducted with positive control"
-    when
-        $oecdNumber: String() from List.of("429")
-        FileAttribute(label == "OECD Number", value == $oecdNumber)
-        $results: List() from collect (Entity(type == "positive_control"))
-    then
-        componentCreationService.joining("PositiveControl.0.0", "Was_the_definitive_study_conducted_with_positive_control", $results, " ");
-    end
-
-rule "MainResults.0.0: Results from main study as one block"
-    when
-        $oecdNumber: String() from List.of("429")
-        FileAttribute(label == "OECD Number", value == $oecdNumber)
-        $results: List() from collect (Entity(type == "results_(main_study)"))
-    then
-        componentCreationService.joining("MainResults.0.0", "Results_Main_Study", $results, " ");
-    end
-
-rule "UsedApproach.0.0: Used approach found and mapped to 'Group'"
-    when
-        $oecdNumber: String() from List.of("429")
-        FileAttribute(label == "OECD Number", value == $oecdNumber)
-        $results: List(!isEmpty()) from collect (Entity(type == "approach_used"))
-    then
-        componentCreationService.create("UsedApproach.0.0", "What_was_the_approach_used", "Group", "'Group' when approach used is present, else 'Individual'", $results);
-    end
-
-rule "UsedApproach.1.0: Used approach not found and thus 'Individual'"
-    when
-        $oecdNumber: String() from List.of("429")
-        FileAttribute(label == "OECD Number", value == $oecdNumber)
-        not Entity(type == "approach_used")
-    then
-        componentCreationService.create("UsedApproach.1.0", "What_was_the_approach_used", "Individual", "'Group' when approach used is present, else 'Individual'");
-    end
-
-/*
 rule "DefaultComponents.999.0: Create components for all unmapped entities."
     salience -999
     when
+        not FileAttribute(label == "OECD Number")
         $allEntities: List(!isEmpty()) from collect (Entity())
     then
         componentCreationService.createComponentsForUnMappedEntities("DefaultComponents.999.0", $allEntities);
     end
-*/
+
 
 //------------------------------------ Component merging rules ------------------------------------
 /*

redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/test_components.drl

@@ -0,0 +1,55 @@
+package drools
+
+import static java.lang.String.format;
+import static com.iqser.red.service.redaction.v1.server.utils.RedactionSearchUtility.anyMatch;
+import static com.iqser.red.service.redaction.v1.server.utils.RedactionSearchUtility.exactMatch;
+
+import java.util.List;
+import java.util.LinkedList;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.Collection;
+import java.util.stream.Stream;
+import java.util.Optional;
+
+import com.iqser.red.service.redaction.v1.server.model.component.Component;
+import com.iqser.red.service.redaction.v1.server.model.component.Entity;
+import com.iqser.red.service.redaction.v1.server.service.document.ComponentCreationService;
+
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.Change;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.Engine;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntryState;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntryType;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.ManualChange;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.Position;
+
+import com.iqser.red.service.persistence.service.v1.api.shared.model.FileAttribute;
+
+global ComponentCreationService componentCreationService
+
+//------------------------------------ queries ------------------------------------
+
+query "getFileAttributes"
+    $fileAttribute: FileAttribute()
+    end
+
+query "getComponents"
+    $component: Component()
+    end
+
+//------------------------------------ Guideline mapping object ------------------------------------
+
+declare GuidelineMapping
+    number: String
+    year: String
+    guideline: String
+ end
+
+//------------------------------------ Test Components rules ------------------------------------
+
+rule "AdvTableExtr.2.3: Cells containing dose for survived males"
+    when
+        $tableValues: List() from collect (Entity(type == "test"))
+    then
+        componentCreationService.rowValueCount("AdvTableExtr.2.3", "2.3 Advanced Table Values", $tableValues);
+    end

redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/test_rules.drl

@@ -0,0 +1,403 @@
+package drools
+
+import static java.lang.String.format;
+import static com.iqser.red.service.redaction.v1.server.utils.RedactionSearchUtility.anyMatch;
+import static com.iqser.red.service.redaction.v1.server.utils.RedactionSearchUtility.exactMatch;
+
+import java.util.List;
+import java.util.LinkedList;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.Collection;
+import java.util.stream.Stream;
+import java.util.Optional;
+
+import com.iqser.red.service.redaction.v1.server.model.document.*;
+import com.iqser.red.service.redaction.v1.server.model.document.TextRange;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.*;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.EntityType;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.MatchedRule;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.TextEntity
+import com.iqser.red.service.redaction.v1.server.model.document.entity.MatchedRule
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.*;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.Section;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.Table;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.TableCell;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.SemanticNode;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.Document;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.Paragraph;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.Image;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.ImageType;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.Page;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.Headline;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.SectionIdentifier;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.Footer;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.Header;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.NodeType;
+import com.iqser.red.service.redaction.v1.server.model.document.textblock.*;
+import com.iqser.red.service.redaction.v1.server.model.document.textblock.TextBlock;
+import com.iqser.red.service.redaction.v1.server.model.document.textblock.TextBlockCollector;
+import com.iqser.red.service.redaction.v1.server.model.document.textblock.AtomicTextBlock;
+import com.iqser.red.service.redaction.v1.server.model.document.textblock.ConcatenatedTextBlock;
+import com.iqser.red.service.redaction.v1.server.model.NerEntities;
+import com.iqser.red.service.redaction.v1.server.model.dictionary.Dictionary;
+import com.iqser.red.service.redaction.v1.server.model.dictionary.DictionaryModel;
+import com.iqser.red.service.redaction.v1.server.service.document.EntityCreationService;
+import com.iqser.red.service.redaction.v1.server.service.ManualChangesApplicationService;
+import com.iqser.red.service.redaction.v1.server.utils.RedactionSearchUtility;
+
+import com.iqser.red.service.persistence.service.v1.api.shared.model.FileAttribute;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.Engine;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualResizeRedaction;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.IdRemoval;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualForceRedaction;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualRecategorization;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualLegalBasisChange;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.AnnotationStatus;
+
+global Document document
+global EntityCreationService entityCreationService
+global ManualChangesApplicationService manualChangesApplicationService
+global Dictionary dictionary
+
+//------------------------------------ queries ------------------------------------
+
+query "getFileAttributes"
+    $fileAttribute: FileAttribute()
+    end
+
+//------------------------------------ Table extraction rules ------------------------------------
+
+// Rule unit: TAB.0
+rule "TAB.0.0: Study Type File Attribute"
+    when
+        not FileAttribute(label == "OECD Number", valueEqualsAnyOf("402","403","404","405","425","429","436","438","439","471","487"))
+        $section: Section(containsAnyString("DATA REQUIREMENT", "TEST GUIDELINE", "MÉTODO(S) DE REFERÊNCIA(S):")
+            && containsAnyString("OECD", "EPA", "OPPTS"))
+    then
+        RedactionSearchUtility.findTextRangesByRegexIgnoreCase("(?<=OECD)(?:[\\w\\s,\\[\\]\\(\\)\\.]{1,10}|(?:.{5,40}(?:Number |Procedure |Guideline )))(4[\\d]{2})", 1 ,$section.getTextBlock()).stream()
+            .map(boundary -> $section.getTextBlock().subSequence(boundary).toString())
+            .map(value -> FileAttribute.builder().label("OECD Number").value(value).build())
+            .forEach(fileAttribute -> insert(fileAttribute));
+        RedactionSearchUtility.findTextRangesByRegexIgnoreCase("(?<=OECD).{5,40}Method (4[\\d]{2}).{1,65}(\\d{4})\\)", 1, $section.getTextBlock()).stream()
+            .map(boundary -> $section.getTextBlock().subSequence(boundary).toString())
+            .map(value -> FileAttribute.builder().label("OECD Number").value(value).build())
+            .forEach(fileAttribute -> insert(fileAttribute));
+    end
+
+rule "TAB.0.1: Guidelines"
+    when
+        $section: Section(containsAnyString("DATA REQUIREMENT", "TEST GUIDELINE", "MÉTODO(S) DE REFERÊNCIA(S):") && containsAnyString("OECD", "EPA", "OPPTS"))
+    then
+        entityCreationService.byRegex("(?<=OECD)(?:[\\w\\s,\\[\\]\\(\\)\\.]{1,10}|.{5,40}(?:Number |Procedure |Guideline ))(4[\\d]{2})", "oecd_guideline_number", EntityType.ENTITY, 1, $section)
+            .forEach(guideline -> guideline.apply("TAB.0.1", "OECD Guideline no. found"));
+        entityCreationService.byRegex("(?<=OECD)(?:[\\w\\s,\\[\\]\\(\\)\\.]{1,10}|.{5,40}(?:Number |Procedure |Guideline ))(4[\\d]{2}),?\\s\\(?(\\d{4})\\)?", "oecd_guideline_year", EntityType.ENTITY, 2, $section)
+            .forEach(guideline -> guideline.apply("TAB.0.1", "OECD Guideline year found"));
+        entityCreationService.byRegex("(?<=OECD)[\\w\\s,\\[\\]]{1,10}\\((\\d{4})\\)\\s(4[\\d]{2})", "oecd_guideline_year", EntityType.ENTITY, 1, $section)
+            .forEach(guideline -> guideline.apply("TAB.0.1", "OECD Guideline year found"));
+        entityCreationService.byRegex("(?<=OECD).{5,40}Method (4[\\d]{2}).{1,65}(\\d{4})\\)", "oecd_guideline_number", EntityType.ENTITY, 1, $section)
+            .forEach(guideline -> guideline.apply("TAB.0.1", "OECD Guideline number found"));
+        entityCreationService.byRegex("(?<=OECD).{5,40}Method (4[\\d]{2}).{1,65}(\\d{4})\\)", "oecd_guideline_year", EntityType.ENTITY, 2, $section)
+            .forEach(guideline -> guideline.apply("TAB.0.1", "OECD Guideline year found"));
+    end
+
+
+// Rule unit: TAB.6
+rule "TAB.6.0: Targeted cell extraction (Experimental Stop date)"
+    when
+        $section: Section(getHeadline().containsString("Advanced Table Extraction"), containsAllStrings("female", "Female", "Survived", "Group 2"))
+        $table: Table(hasHeader("Group 2")) from $section.streamChildren().toList()
+        TableCell(containsWordIgnoreCase("Female"), $row: row) from $table.streamTableCellsWithHeader("Group 2").toList()
+        TableCell($row == row, containsStringIgnoreCase("Survived")) from $table.streamTableCellsWithHeader("Group 2").toList()
+        $femaleSurvived: TableCell($row == row) from $table.streamTableCellsWithHeader("Group 2").toList()
+    then
+        entityCreationService.bySemanticNode($femaleSurvived, "experiment_female_survived", EntityType.ENTITY)
+            .ifPresent(entity -> entity.apply("TAB.6.0", "Female in group to experimental start date"));
+    end
+
+
+//------------------------------------ Manual changes rules ------------------------------------
+
+// Rule unit: MAN.0
+rule "MAN.0.0: Apply manual resize redaction"
+    salience 128
+    when
+        $resizeRedaction: ManualResizeRedaction($id: annotationId, status == AnnotationStatus.APPROVED, $requestDate: requestDate)
+        not ManualResizeRedaction(annotationId == $id, requestDate.isBefore($requestDate))
+        $entityToBeResized: TextEntity(matchesAnnotationId($id))
+    then
+        manualChangesApplicationService.resizeEntityAndReinsert($entityToBeResized, $resizeRedaction);
+        retract($resizeRedaction);
+        update($entityToBeResized);
+        $entityToBeResized.getIntersectingNodes().forEach(node -> update(node));
+    end
+
+rule "MAN.0.1: Apply manual resize redaction"
+    salience 128
+    when
+        $resizeRedaction: ManualResizeRedaction($id: annotationId, status == AnnotationStatus.APPROVED, $requestDate: requestDate)
+        not ManualResizeRedaction(annotationId == $id, requestDate.isBefore($requestDate))
+        $imageToBeResized: Image(id == $id)
+    then
+        manualChangesApplicationService.resizeImage($imageToBeResized, $resizeRedaction);
+        retract($resizeRedaction);
+        update($imageToBeResized);
+        update($imageToBeResized.getParent());
+    end
+
+
+// Rule unit: MAN.1
+rule "MAN.1.0: Apply id removals that are valid and not in forced redactions to Entity"
+    salience 128
+    when
+        $idRemoval: IdRemoval($id: annotationId, !removeFromDictionary, !removeFromAllDossiers, status == AnnotationStatus.APPROVED)
+        $entityToBeRemoved: TextEntity(matchesAnnotationId($id))
+    then
+        $entityToBeRemoved.getManualOverwrite().addChange($idRemoval);
+        update($entityToBeRemoved);
+        retract($idRemoval);
+        $entityToBeRemoved.getIntersectingNodes().forEach(node -> update(node));
+    end
+
+rule "MAN.1.1: Apply id removals that are valid and not in forced redactions to Image"
+    salience 128
+    when
+        $idRemoval: IdRemoval($id: annotationId, status == AnnotationStatus.APPROVED)
+        $imageEntityToBeRemoved: Image($id == id)
+    then
+        $imageEntityToBeRemoved.getManualOverwrite().addChange($idRemoval);
+        update($imageEntityToBeRemoved);
+        retract($idRemoval);
+        update($imageEntityToBeRemoved.getParent());
+    end
+
+
+// Rule unit: MAN.2
+rule "MAN.2.0: Apply force redaction"
+    salience 128
+    when
+        $force: ManualForceRedaction($id: annotationId, status == AnnotationStatus.APPROVED)
+        $entityToForce: TextEntity(matchesAnnotationId($id))
+    then
+        $entityToForce.getManualOverwrite().addChange($force);
+        update($entityToForce);
+        $entityToForce.getIntersectingNodes().forEach(node -> update(node));
+        retract($force);
+    end
+
+rule "MAN.2.1: Apply force redaction to images"
+    salience 128
+    when
+        $force: ManualForceRedaction($id: annotationId, status == AnnotationStatus.APPROVED)
+        $imageToForce: Image(id == $id)
+    then
+        $imageToForce.getManualOverwrite().addChange($force);
+        update($imageToForce);
+        update($imageToForce.getParent());
+        retract($force);
+    end
+
+
+// Rule unit: MAN.3
+rule "MAN.3.0: Apply entity recategorization"
+    salience 128
+    when
+        $recategorization: ManualRecategorization($id: annotationId, $type: type, status == AnnotationStatus.APPROVED, $requestDate: requestDate)
+        not ManualRecategorization($id == annotationId, requestDate.isBefore($requestDate))
+        $entityToBeRecategorized: TextEntity(matchesAnnotationId($id), type != $type)
+    then
+        $entityToBeRecategorized.getIntersectingNodes().forEach(node -> update(node));
+        manualChangesApplicationService.recategorize($entityToBeRecategorized, $recategorization);
+        retract($recategorization);
+        // Entity is copied and inserted, so the old entity needs to be retracted to avoid duplication.
+        retract($entityToBeRecategorized);
+    end
+
+rule "MAN.3.1: Apply entity recategorization of same type"
+    salience 128
+    when
+        $recategorization: ManualRecategorization($id: annotationId, $type: type, status == AnnotationStatus.APPROVED, $requestDate: requestDate)
+        not ManualRecategorization($id == annotationId, requestDate.isBefore($requestDate))
+        $entityToBeRecategorized: TextEntity(matchesAnnotationId($id), type == $type)
+    then
+        $entityToBeRecategorized.getManualOverwrite().addChange($recategorization);
+        retract($recategorization);
+    end
+
+rule "MAN.3.2: Apply image recategorization"
+    salience 128
+    when
+        $recategorization: ManualRecategorization($id: annotationId, status == AnnotationStatus.APPROVED, $requestDate: requestDate)
+        not ManualRecategorization($id == annotationId, requestDate.isBefore($requestDate))
+        $imageToBeRecategorized: Image($id == id)
+    then
+        manualChangesApplicationService.recategorize($imageToBeRecategorized, $recategorization);
+        update($imageToBeRecategorized);
+        update($imageToBeRecategorized.getParent());
+        retract($recategorization);
+    end
+
+
+// Rule unit: MAN.4
+rule "MAN.4.0: Apply legal basis change"
+    salience 128
+    when
+        $legalbasisChange: ManualLegalBasisChange($id: annotationId, status == AnnotationStatus.APPROVED)
+        $imageToBeRecategorized: Image($id == id)
+    then
+        $imageToBeRecategorized.getManualOverwrite().addChange($legalbasisChange);
+    end
+
+rule "MAN.4.1: Apply legal basis change"
+    salience 128
+    when
+        $legalBasisChange: ManualLegalBasisChange($id: annotationId, status == AnnotationStatus.APPROVED)
+        $entityToBeChanged: TextEntity(matchesAnnotationId($id))
+    then
+        $entityToBeChanged.getManualOverwrite().addChange($legalBasisChange);
+    end
+
+
+//------------------------------------ Entity merging rules ------------------------------------
+
+// Rule unit: X.0
+rule "X.0.0: Remove Entity contained by Entity of same type"
+    salience 65
+    when
+        $larger: TextEntity($type: type, $entityType: entityType, active())
+        $contained: TextEntity(containedBy($larger), type == $type, entityType == $entityType, this != $larger, !hasManualChanges(), active())
+    then
+        $contained.remove("X.0.0", "remove Entity contained by Entity of same type");
+        retract($contained);
+    end
+
+
+// Rule unit: X.1
+rule "X.1.0: Merge intersecting Entities of same type"
+    salience 64
+    when
+        $first: TextEntity($type: type, $entityType: entityType, !resized(), active())
+        $second: TextEntity(intersects($first), type == $type, entityType == $entityType, this != $first, !hasManualChanges(), active())
+    then
+        TextEntity mergedEntity = entityCreationService.mergeEntitiesOfSameType(List.of($first, $second), $type, $entityType, document);
+        $first.remove("X.1.0", "merge intersecting Entities of same type");
+        $second.remove("X.1.0", "merge intersecting Entities of same type");
+        retract($first);
+        retract($second);
+        mergedEntity.getIntersectingNodes().forEach(node -> update(node));
+    end
+
+
+// Rule unit: X.2
+rule "X.2.0: Remove Entity of type ENTITY when contained by FALSE_POSITIVE"
+    salience 64
+    when
+        $falsePositive: TextEntity($type: type, entityType == EntityType.FALSE_POSITIVE, active())
+        $entity: TextEntity(containedBy($falsePositive), type == $type, (entityType == EntityType.ENTITY || entityType == EntityType.HINT), !hasManualChanges(), active())
+    then
+        $entity.getIntersectingNodes().forEach(node -> update(node));
+        $entity.remove("X.2.0", "remove Entity of type ENTITY when contained by FALSE_POSITIVE");
+        retract($entity)
+    end
+
+
+// Rule unit: X.3
+rule "X.3.0: Remove Entity of type RECOMMENDATION when contained by FALSE_RECOMMENDATION"
+    salience 64
+    when
+        $falseRecommendation: TextEntity($type: type, entityType == EntityType.FALSE_RECOMMENDATION, active())
+        $recommendation: TextEntity(containedBy($falseRecommendation), type == $type, entityType == EntityType.RECOMMENDATION, !hasManualChanges(), active())
+    then
+        $recommendation.remove("X.3.0", "remove Entity of type RECOMMENDATION when contained by FALSE_RECOMMENDATION");
+        retract($recommendation);
+    end
+
+
+// Rule unit: X.4
+rule "X.4.0: Remove Entity of type RECOMMENDATION when intersected by ENTITY with same type"
+    salience 256
+    when
+        $entity: TextEntity($type: type, (entityType == EntityType.ENTITY || entityType == EntityType.HINT), active())
+        $recommendation: TextEntity(intersects($entity), type == $type, entityType == EntityType.RECOMMENDATION, !hasManualChanges(), active())
+    then
+        $entity.addEngines($recommendation.getEngines());
+        $recommendation.remove("X.4.0", "remove Entity of type RECOMMENDATION when intersected by ENTITY with same type");
+        retract($recommendation);
+    end
+
+
+// Rule unit: X.5
+rule "X.5.0: Remove Entity of type RECOMMENDATION when contained by ENTITY"
+    salience 256
+    when
+        $entity: TextEntity((entityType == EntityType.ENTITY || entityType == EntityType.HINT), active())
+        $recommendation: TextEntity(containedBy($entity), entityType == EntityType.RECOMMENDATION, !hasManualChanges(), active())
+    then
+        $recommendation.remove("X.5.0", "remove Entity of type RECOMMENDATION when contained by ENTITY");
+        retract($recommendation);
+    end
+
+
+// Rule unit: X.6
+rule "X.6.0: Remove Entity of lower rank, when contained by by entity of type ENTITY"
+    salience 32
+    when
+        $higherRank: TextEntity($type: type, (entityType == EntityType.ENTITY || entityType == EntityType.HINT), active())
+        $lowerRank: TextEntity(containedBy($higherRank), type != $type, dictionary.getDictionaryRank(type) < dictionary.getDictionaryRank($type), !hasManualChanges(), active())
+    then
+        $lowerRank.getIntersectingNodes().forEach(node -> update(node));
+        $lowerRank.remove("X.6.0", "remove Entity of lower rank, when contained by entity of type ENTITY");
+        retract($lowerRank);
+    end
+
+rule "X.6.1: remove Entity of higher rank, when intersected by entity of type ENTITY and length of lower rank Entity is bigger than the higher rank Entity"
+    salience 32
+    when
+        $higherRank: TextEntity($type: type, $value: value, (entityType == EntityType.ENTITY || entityType == EntityType.HINT), active())
+        $lowerRank: TextEntity(intersects($higherRank), type != $type, (entityType == EntityType.ENTITY || entityType == EntityType.HINT), dictionary.getDictionaryRank(type) < dictionary.getDictionaryRank($type), !hasManualChanges(), active(), $lowerRank.getValue().length() > $value.length())
+    then
+        $higherRank.getIntersectingNodes().forEach(node -> update(node));
+        $higherRank.remove("X.6.1", "remove Entity of higher rank, when intersected by entity of type ENTITY and length of lower rank Entity is bigger than the higher rank Entity");
+        retract($higherRank);
+    end
+
+
+// Rule unit: X.7
+rule "X.7.0: Remove all images"
+    salience 512
+    when
+        $image: Image(imageType != ImageType.OCR, !hasManualChanges())
+    then
+        $image.remove("X.7.0", "remove all images");
+        retract($image);
+    end
+
+
+//------------------------------------ File attributes rules ------------------------------------
+
+// Rule unit: FA.1
+rule "FA.1.0: Remove duplicate FileAttributes"
+    salience 64
+    when
+        $fileAttribute: FileAttribute($label: label, $value: value)
+        $duplicate: FileAttribute(this != $fileAttribute, label == $label, value == $value)
+    then
+        retract($duplicate);
+    end
+
+
+//------------------------------------ Local dictionary search rules ------------------------------------
+
+// Rule unit: LDS.0
+rule "LDS.0.0: Run local dictionary search"
+    agenda-group "LOCAL_DICTIONARY_ADDS"
+    salience -999
+    when
+        $dictionaryModel: DictionaryModel(!localEntriesWithMatchedRules.isEmpty()) from dictionary.getDictionaryModels()
+    then
+        entityCreationService.bySearchImplementation($dictionaryModel.getLocalSearch(), $dictionaryModel.getType(), EntityType.RECOMMENDATION, document)
+            .forEach(entity ->  {
+                Collection<MatchedRule> matchedRules = $dictionaryModel.getMatchedRulesForLocalDictionaryEntry(entity.getValue());
+                matchedRules.forEach(matchedRule -> entity.addMatchedRule(matchedRule.asSkippedIfApplied()));
+            });
+    end

redaction-service-v1/redaction-service-server-v1/src/test/resources/performance/dictionaries/EFSA_sanitisation_GFL_v1/rules.drl

@@ -142,17 +142,12 @@ rule "CBI.7.0: Do not redact Names and Addresses if published information found
 
 rule "CBI.7.1: Do not redact Names and Addresses if published information found in same table row"
     when
-        $table: Table(hasEntitiesOfType("published_information"),
-                     (hasEntitiesOfType("CBI_author") || hasEntitiesOfType("CBI_address")))
+        $table: Table(hasEntitiesOfType("published_information"), hasEntitiesOfType("CBI_author"))
+        $cellsWithPublishedInformation: TableCell() from $table.streamTableCellsWhichContainType("published_information").toList()
+        $tableCell: TableCell(row == $cellsWithPublishedInformation.row) from $table.streamTableCells().toList()
+        $author: TextEntity(type == "CBI_author", active()) from $tableCell.getEntities()
     then
-        $table.streamEntitiesWhereRowContainsEntitiesOfType(List.of("CBI_author", "CBI_address"))
-            .forEach(redactionEntity -> {
-                redactionEntity.skipWithReferences(
-                        "CBI.7.1",
-                        "Published Information found in row",
-                        $table.getEntitiesOfTypeInSameRow("published_information", redactionEntity)
-                );
-            });
+        $author.skipWithReferences("CBI.7.1", "Published Information found in row", $table.getEntitiesOfTypeInSameRow("published_information", $author));
     end
 
 

redaction-service-v1/rules-management/README.md

@@ -0,0 +1,87 @@
+Rules Management CLI
+---
+The rules-management program is a command-line interface (CLI) tool written in Java. It is designed to generate Drools files based on rule classes and units. This README file provides an overview of the program and instructions for usage.
+
+Table of Contents  
+--
+* Introduction   
+* Installation  
+* Usage  
+* Options  
+* Examples  
+
+Introduction
+--
+The rules-management CLI program allows you to generate Drools files containing various rule classes and units. Each rule class represents a specific type of rule, such as SYN (Syngenta specific), CBI, PII, ETC (Other), AI, MAN (Manual redactions), X (Entity interactions), FA (FileAttribute interactions), and LDS (Local Dictionary Search).
+
+A rule unit is identified by a combination of the rule class and an integer. For example, CBI.1 refers to rule unit 1 in the CBI rule class. Each rule unit may contain multiple rules, which are also identified by integers. For instance, CBI.1.2 represents the second rule in rule unit 1 of the CBI rule class.
+
+The program provides options to specify the input type, input source, output destination, and additional flags for customization.
+
+Installation
+--
+To use the rules-management CLI, you need to have Java 17+ and gradle installed on your system. Follow these steps to get started:
+
+Clone the latest main branch.   
+compile with `gradle install`
+
+Testing
+--
+You can validate the rules you are changing if they are correctly written from a syntax point of view using the
+`DroolsCompilationTest` class. Make sure you also place the changes in the `test/resources/<rules_file>.drl` and then run the test. 
+
+Usage
+--
+To run the rules-management program, open a terminal or command prompt and navigate to the directory where the program files are located. Use the following command:
+
+
+`java -jar rules-management.jar [options]`  
+
+or directly with gradle  
+
+`gradle run --args='[options]'`
+
+Options
+--
+The rules-management program supports the following command-line options:
+
+-t, --type: Specifies the input type. Default is "list" (if the recursive flag is set: "file").  Available options:
+* "list" or "l": Expects a list of rule identifiers. For example: "MAN, X, LDS, CBI.0, PII.0.1", you can use wildcards such as * or leaving out digits with the identifiers to match multiple rule identifiers. This allows for convenient selection of multiple rule units or rules.   
+* "file" or "f": Expects the absolute path to a rule file. The file must contain the current Rule Identifiers. This option is useful for migrating rule files to the current state.
+* "old" or "o": Expects the absolute path to an old rule file. The program attempts to translate the old rules to new rules based on '"main/resources/old_rules_with_translations.csv"'.  
+
+
+-i, --input: Specifies the input source based on the chosen type. It can be:
+
+* A string of rule identifiers like `"MAN, X, LDS, CBI.0, SYN.*.0, PII.0.1"`  
+* path to a rules file  `/path/to/old_rules.txt`  
+* path to a folder containing rules files named "rules.txt" or "rules.drl" (if the "recursive" flag is set) `/path/to/rules_directory`   
+
+
+-o, --output: Specifies the output file path. If a directory is supplied as input, the folder structure is preserved.
+
+-n, --noop: If this flag is set, the input file will not be attempted to be translated or migrated, use this to only escape files. Currently, this only works with input type "file"
+
+-e, --escape: If this flag is set, the output files will be escaped and saved as ".txt", similar to dossier templates.
+
+-r, --recursive: Can only be set in combination with the "file" or "old" type and a directory as input. Searches recursively for files named "rules.txt" or "rules.drl" and attempts to migrate/translate them.
+The folder structure is preserved in the output folder.
+
+-a, --application: Indicate which application you are targeting. For redact manager use RM. For Documine use DM. If it's not specified it will default to RM.
+
+Examples
+--
+Generate Drools files from a list of rule identifiers and save them to the specified output file:  
+`gradle run --args='-t list -i "MAN, X, LDS, CBI.0, PII.0.1" -o /path/to/output/rules.drl'`  
+
+Migrate an old rule file to the current format and save the translated rules to the specified output file:  
+`gradle run --args='-t old -i /path/to/old_rules.drl -o /path/to/output/translated_rules.drl'`  
+
+Migrate multiple rule files in a directory (including subdirectories) and save the translated rules:  
+`gradle run --args='-t old -i /path/to/rules_directory -o /path/to/output/translated_rules -r'`  
+
+Generate Drools files from a rules file and escape the output:  
+`gradle run --args='-t file -i /path/to/rules.txt -o /path/to/output/escaped_rules -e'`
+
+Escape Drools file rules.drl as is:  
+`gradle run --args='-t f -n -e -i /path/to/rules.drl -o /path/to/output/rules.txt'`

redaction-service-v1/rules-management/build.gradle.kts

@@ -0,0 +1,52 @@
+plugins {
+    application
+}
+
+group = "com.knecon.fforesight.utility"
+version = "1.0-SNAPSHOT"
+
+repositories {
+    mavenCentral()
+    maven {
+        url = uri("https://nexus.knecon.com/repository/red-platform-releases/")
+        credentials {
+            username = providers.gradleProperty("mavenUser").getOrNull();
+            password = providers.gradleProperty("mavenPassword").getOrNull();
+        }
+    }
+}
+
+sourceSets {
+    test {
+        resources {
+            srcDirs("src/main/resources", "src/test/ressources") // add both so test can access the all_rules_file
+        }
+    }
+}
+
+dependencies {
+    implementation(project(":redaction-service-server-v1"))
+    implementation("org.projectlombok:lombok:1.18.28")
+    testImplementation(platform("org.junit:junit-bom:5.10.0"))
+    testImplementation("org.junit.jupiter:junit-jupiter")
+
+    implementation("com.github.javaparser:javaparser-core:3.25.3")
+    implementation("org.drools:drools-drl-parser:8.41.0.Final")
+    implementation("org.apache.commons:commons-csv:1.10.0")
+    implementation("commons-cli:commons-cli:1.5.0")
+
+
+    compileOnly("org.projectlombok:lombok:1.18.28")
+    annotationProcessor("org.projectlombok:lombok:1.18.28")
+
+    testCompileOnly("org.projectlombok:lombok:1.18.28")
+    testAnnotationProcessor("org.projectlombok:lombok:1.18.28")
+
+    implementation("org.kie:kie-api:9.44.0.Final")
+    implementation("org.drools:drools-compiler:9.44.0.Final")
+    testImplementation("org.kie:kie-ci:9.44.0.Final")
+}
+
+tasks.test {
+    useJUnitPlatform()
+}

redaction-service-v1/rules-management/src/main/java/com/knecon/fforesight/utility/rules/management/Main.java

@@ -0,0 +1,214 @@
+package com.knecon.fforesight.utility.rules.management;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.HelpFormatter;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
+
+import com.knecon.fforesight.utility.rules.management.factory.RuleFileFactory;
+import com.knecon.fforesight.utility.rules.management.factory.RuleFileParser;
+import com.knecon.fforesight.utility.rules.management.models.ApplicationType;
+import com.knecon.fforesight.utility.rules.management.models.RuleIdentifier;
+import com.knecon.fforesight.utility.rules.management.translation.OldRulesParser;
+import com.knecon.fforesight.utility.rules.management.utils.RuleFileIO;
+
+import lombok.SneakyThrows;
+
+public class Main {
+
+    public static void main(String[] args) {
+
+        Options options = buildOptions();
+
+        CommandLineParser parser = new DefaultParser();
+        HelpFormatter formatter = new HelpFormatter();
+        CommandLine cmd = null; //not a good practice, it serves its purpose
+
+        try {
+            cmd = parser.parse(options, args);
+        } catch (ParseException e) {
+            System.out.println(e.getMessage());
+            formatter.printHelp("utility-name", options);
+
+            System.exit(1);
+        }
+        final CommandLine finalCmd = cmd;
+
+        if (finalCmd.hasOption("r")) {
+            handleRecursiveFileCreation(finalCmd);
+        } else {
+            handleSingleFileCreation(finalCmd);
+        }
+    }
+
+
+    private static void handleSingleFileCreation(final CommandLine cmd) {
+
+        String ruleFileString;
+        String type = cmd.hasOption("t") ? cmd.getOptionValue("t") : "l";
+        String input = cmd.getOptionValue("input");
+        ApplicationType applicationType = getApplicationType(cmd);
+
+        if (cmd.hasOption("n")) {
+            if (!type.equals("file") && !type.equals("f")) {
+                System.out.println("No op can only be used with type \"file\"");
+                System.exit(1);
+            }
+            ruleFileString = RuleFileIO.getRulesString(input);
+        } else {
+            Set<RuleIdentifier> identifiers = switch (type) {
+                case "list", "l" -> RuleIdentifier.fromListOfIdentifiersString(input);
+                case "file", "f" -> RuleFileParser.parseRuleIdentifiersFromFile(input);
+                case "old", "o" -> OldRulesParser.translateOldRulesStringToNewIdentifiers(RuleFileIO.getRulesString(input), applicationType);
+                default -> throw new IllegalArgumentException(String.format("type \"%s\" is not valid", cmd.getOptionValue("t")));
+            };
+            ruleFileString = RuleFileFactory.createFileFromIdentifiers(identifiers, applicationType);
+        }
+
+        ruleFileString = escapeRuleStringIfOptionIsSet(cmd, ruleFileString);
+
+        try (var out = new FileOutputStream(cmd.getOptionValue("output"))) {
+            out.write(ruleFileString.getBytes(StandardCharsets.UTF_8));
+        } catch (IOException e) {
+            System.out.println(e.getMessage());
+            System.exit(1);
+        }
+    }
+
+
+    private static void handleRecursiveFileCreation(final CommandLine cmd) {
+
+        Path outputDir = Path.of(cmd.getOptionValue("output"));
+        if (!outputDir.toFile().isDirectory()) {
+            System.out.printf("%s is not a directory!%n", cmd.getOptionValue("output"));
+            System.exit(1);
+        }
+        outputDir.toFile().mkdirs();
+        ApplicationType applicationType = getApplicationType(cmd);
+
+        String type = cmd.hasOption("t") ? cmd.getOptionValue("t") : "f";
+        Map<Path, Set<RuleIdentifier>> identifiersPerFile = switch (type) {
+            case "file", "f" -> parseIdentifiersFromFiles(Path.of(cmd.getOptionValue("input")));
+            case "old", "o" -> translateIdentifiersFromOldFiles(Path.of(cmd.getOptionValue("input")), applicationType);
+            default -> throw new IllegalArgumentException(String.format("type \"%s\" is not valid in combination with the \"recursive\" flag", cmd.getOptionValue("t")));
+        };
+        identifiersPerFile.keySet().forEach(path -> {
+            String ruleFileString = RuleFileFactory.createFileFromIdentifiers(identifiersPerFile.get(path), applicationType);
+
+            ruleFileString = escapeRuleStringIfOptionIsSet(cmd, ruleFileString);
+            Path output = outputDir.resolve(path);
+            output.getParent().toFile().mkdirs();
+            try (var out = new FileOutputStream(output.toFile())) {
+                out.write(ruleFileString.getBytes(StandardCharsets.UTF_8));
+            } catch (IOException e) {
+                System.out.println(e.getMessage());
+                System.exit(1);
+            }
+        });
+    }
+
+
+    private static String escapeRuleStringIfOptionIsSet(CommandLine finalCmd, String ruleFileString) {
+
+        if (finalCmd.hasOption("e")) {
+            ruleFileString = RuleFileIO.escapeAndWrap(ruleFileString);
+        }
+        return ruleFileString;
+    }
+
+
+    private static Path getRelativizedPath(Path inputDirectory, File file) {
+
+        return inputDirectory.relativize(Path.of(file.getAbsolutePath()));
+    }
+
+
+    @SneakyThrows
+    private static Map<Path, Set<RuleIdentifier>> translateIdentifiersFromOldFiles(Path inputDirectory, ApplicationType applicationType) {
+
+        return RuleFileIO.streamAllRuleFilesInDirectory(inputDirectory)
+                .collect(Collectors.toMap(file -> getRelativizedPath(inputDirectory, file), e -> OldRulesParser.translateOldRulesFileToNewIdentifiers(e, applicationType)));
+    }
+
+
+    @SneakyThrows
+    private static Map<Path, Set<RuleIdentifier>> parseIdentifiersFromFiles(Path inputDirectory) {
+
+        return RuleFileIO.streamAllRuleFilesInDirectory(inputDirectory)
+                .collect(Collectors.toMap(file -> getRelativizedPath(inputDirectory, file), RuleFileParser::parseRuleIdentifiersFromFile));
+    }
+
+    private static ApplicationType getApplicationType(final CommandLine cmd) {
+
+        String application = cmd.hasOption("a") ? cmd.getOptionValue("a") : "RM";
+        ApplicationType applicationType;
+
+        if (application.equals("DM") || application.equals("RM")) {
+            applicationType = ApplicationType.valueOf(application);
+        } else {
+            throw new IllegalArgumentException(String.format("Application type \"%s\" is not valid, choose between \"RM\" or \"DM\"", cmd.getOptionValue("a")));
+        }
+
+        return applicationType;
+    }
+
+
+    private static Options buildOptions() {
+
+        Options options = new Options();
+
+        Option type = new Option("t",//
+                "type",//
+                true,//
+                "Please specify the input type, defaults to \"list\", \n" +//
+                        "current options:\n" +//
+                        "\"list\" or \"l\" (List of Rule identifiers e.g. \"MAN, X, LDS, CBI.0, PII.0.1\")\n" +//
+                        "\"file\" or \"f\" (Absolute Path to rule file, escaped or not, but the rule file must contain the current Rule Identifiers, the main use case is migrating rule files to the current state)\n" +//
+                        "\"old\" or \"o\" (Absolute Path to old rule file, escaped or not, the script will attempt to translate the old rules to new rules based on \"main/resources/old_rules_with_translations.csv\")\n");
+        options.addOption(type);
+        Option input = new Option("i",
+                "input",
+                true,
+                "Based on type expects: String of Rule identifiers, Absolute Path to a rules file or a folder containing rules files named rules.txt or rules.drl if \"recursive\" flag is set");
+        input.setRequired(true);
+        options.addOption(input);
+
+        Option output = new Option("o", "output", true, "output file path, if a directory is supplied, the folder structure is preserved");
+        output.setRequired(true);
+        options.addOption(output);
+
+        Option noTranslate = new Option("n",
+                "noop",
+                false,
+                "If this flag is set, the input file will not be attempted to be translated or migrated, use this to only escape files. Currently this only works with input type \"file\"");
+        options.addOption(noTranslate);
+        Option escapeOutput = new Option("e", "escape", false, "If this flag is set, the output files will be escaped and saved as \".txt\", like in the dossier templates");
+        options.addOption(escapeOutput);
+
+        Option recursive = new Option("r",
+                "recursive",
+                false,
+                "Can only be set in combination with type \"file\" or \"old\" Searches recursively for files named rules.txt or rules.drl and attempts to migrate/translate them.");
+        options.addOption(recursive);
+
+        Option application = new Option("a",
+                "application",
+                true,
+                "What application to update the rules for. For Redact Manager specify: RM. For Documine specify: DM. Defaults to RM.");
+        options.addOption(application);
+        return options;
+    }
+
+}

redaction-service-v1/rules-management/src/main/java/com/knecon/fforesight/utility/rules/management/RuleManagementResources.java

@@ -0,0 +1,55 @@
+package com.knecon.fforesight.utility.rules.management;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+
+import com.knecon.fforesight.utility.rules.management.models.ApplicationType;
+
+import lombok.SneakyThrows;
+
+public class RuleManagementResources {
+
+    public static InputStream getAllRulesInputStream(ApplicationType applicationType) {
+
+        if (applicationType == ApplicationType.RM) {
+            return RuleManagementResources.class.getClassLoader().getResourceAsStream("all_redact_manager_rules.drl");
+        }
+        return  RuleManagementResources.class.getClassLoader().getResourceAsStream("all_rules_documine.drl");
+    }
+
+
+    public static InputStream getDefaultRuleIdentifiesInputStream(ApplicationType applicationType) {
+
+        if (applicationType == ApplicationType.RM) {
+            return RuleManagementResources.class.getClassLoader().getResourceAsStream("default_rule_identifiers.txt");
+        } else {
+            return RuleManagementResources.class.getClassLoader().getResourceAsStream("default_rule_identifiers_dm.txt");
+        }
+    }
+
+
+    public static InputStream getTemplateInputStream() {
+
+        return RuleManagementResources.class.getClassLoader().getResourceAsStream("order_template.txt");
+    }
+
+
+    public static InputStream getOldRulesCsvInputStream() {
+
+        return RuleManagementResources.class.getClassLoader().getResourceAsStream("old_rules_with_translations.csv");
+    }
+
+
+    @SneakyThrows
+    public static String createTempOldRulesCsv(String formattedAsCsv) {
+
+        File csvFile = File.createTempFile("old_rules_with_translations-", ".csv");
+        try (var out = new FileOutputStream(csvFile)) {
+            out.write(formattedAsCsv.getBytes(StandardCharsets.UTF_8));
+        }
+        return csvFile.toString();
+    }
+
+}

redaction-service-v1/rules-management/src/main/java/com/knecon/fforesight/utility/rules/management/factory/DefaultRuleIdentifiersFactory.java

@@ -0,0 +1,26 @@
+package com.knecon.fforesight.utility.rules.management.factory;
+
+import java.util.Arrays;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import com.knecon.fforesight.utility.rules.management.RuleManagementResources;
+import com.knecon.fforesight.utility.rules.management.models.ApplicationType;
+import com.knecon.fforesight.utility.rules.management.models.RuleIdentifier;
+
+import lombok.SneakyThrows;
+import lombok.experimental.UtilityClass;
+
+@UtilityClass
+public class DefaultRuleIdentifiersFactory {
+
+    @SneakyThrows
+    public Set<RuleIdentifier> getDefaultRuleIdentifiers(ApplicationType applicationType) {
+
+        try (var defaultRuleIdentifiers = RuleManagementResources.getDefaultRuleIdentifiesInputStream(applicationType)) {
+            String ruleIdentifierString = new String(defaultRuleIdentifiers.readAllBytes());
+            return Arrays.stream(ruleIdentifierString.split("\n")).map(RuleIdentifier::fromString).collect(Collectors.toSet());
+        }
+    }
+
+}

redaction-service-v1/rules-management/src/main/java/com/knecon/fforesight/utility/rules/management/factory/RuleFileFactory.java

@@ -0,0 +1,120 @@
+package com.knecon.fforesight.utility.rules.management.factory;
+
+import static java.util.Collections.emptySet;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import com.knecon.fforesight.utility.rules.management.RuleManagementResources;
+import com.knecon.fforesight.utility.rules.management.models.ApplicationType;
+import com.knecon.fforesight.utility.rules.management.models.RuleClass;
+import com.knecon.fforesight.utility.rules.management.models.RuleFileBluePrint;
+import com.knecon.fforesight.utility.rules.management.models.RuleIdentifier;
+import com.knecon.fforesight.utility.rules.management.models.RuleType;
+import com.knecon.fforesight.utility.rules.management.models.RuleUnit;
+
+import lombok.SneakyThrows;
+import lombok.experimental.UtilityClass;
+
+@UtilityClass
+public class RuleFileFactory {
+
+    public String createFileFromIdentifiers(String identifiers, ApplicationType applicationType) {
+
+        if (identifiers.isBlank() || identifiers.isEmpty()) {
+            return createFileFromIdentifiers(emptySet(), applicationType);
+        }
+        return createFileFromIdentifiers(Arrays.stream(identifiers.split(",")).map(String::trim).map(RuleIdentifier::fromString).collect(Collectors.toSet()), applicationType);
+    }
+
+
+    public String createFileFromIdentifiers(Set<RuleIdentifier> identifiers, ApplicationType applicationType) {
+
+        return createFileFromIdentifiers(identifiers, true, applicationType);
+    }
+
+
+    public String createFileFromIdentifiers(Set<RuleIdentifier> identifiers, boolean includeDefaults, ApplicationType applicationType) {
+
+        if (includeDefaults) {
+            identifiers.addAll(DefaultRuleIdentifiersFactory.getDefaultRuleIdentifiers(applicationType));
+        }
+        RuleFileBluePrint bluePrint = RuleFileParser.buildBluePrintFromAllRulesFile(applicationType);
+        RuleFileBluePrint filteredBluePrint = bluePrint.buildFilteredBluePrintByRuleIdentifiers(identifiers);
+        return buildRuleString(filteredBluePrint);
+    }
+
+
+    @SneakyThrows
+    public String buildRuleString(RuleFileBluePrint bluePrint) {
+
+        try (var templateInputStream = RuleManagementResources.getTemplateInputStream()) {
+            String template = new String(templateInputStream.readAllBytes(), StandardCharsets.UTF_8);
+            List<RuleType> templateRuleOrder = parseRuleOrder(template);
+            return buildBluePrintWithTemplateRuleOrder(bluePrint, templateRuleOrder);
+        }
+    }
+
+
+    private List<RuleType> parseRuleOrder(String template) {
+
+        String[] values = template.split("\n");
+        return Arrays.stream(values).map(RuleType::fromString).toList();
+    }
+
+
+    private String buildBluePrintWithTemplateRuleOrder(RuleFileBluePrint bluePrint, List<RuleType> ruleOrder) {
+
+        Set<RuleType> additionalRuleTypes = bluePrint.ruleClasses().stream().map(RuleClass::ruleType).filter(ruleType -> !ruleOrder.contains(ruleType)).collect(Collectors.toSet());
+
+        StringBuilder sb = new StringBuilder();
+        sb.append(bluePrint.imports());
+        sb.append("\n\n");
+        sb.append(bluePrint.globals());
+        sb.append("\n\n");
+        sb.append("//------------------------------------ queries ------------------------------------");
+        sb.append("\n\n");
+        sb.append(bluePrint.queries());
+        sb.append("\n\n");
+        for (RuleType ruleBlockType : ruleOrder) {
+            if (ruleBlockType.isWildCard()) {
+                additionalRuleTypes.stream().sorted(Comparator.comparing(RuleType::name)).forEach(ruleType -> writeRuleClass(bluePrint, ruleType, sb));
+                continue;
+            }
+            if (bluePrint.findRuleClassByType(ruleBlockType).isEmpty()) {
+                continue;
+            }
+            writeRuleClass(bluePrint, ruleBlockType, sb);
+        }
+        return sb.toString().trim() + "\n";
+    }
+
+
+    private static void writeRuleClass(RuleFileBluePrint bluePrint, RuleType ruleType, StringBuilder sb) {
+
+        sb.append("//------------------------------------ ");
+        sb.append(ruleType);
+        sb.append(" rules ------------------------------------");
+        sb.append("\n\n");
+        RuleClass ruleClass = bluePrint.findRuleClassByType(ruleType).orElseThrow();
+        List<RuleUnit> sortedRuleUnits = ruleClass.ruleUnits().stream().sorted(Comparator.comparingInt(RuleUnit::unit)).toList();
+        for (RuleUnit unit : sortedRuleUnits) {
+            if (unit.rules().isEmpty()) {
+                continue;
+            }
+            sb.append("// ");
+            sb.append(unit.rules().get(0).identifier().toRuleUnitString());
+            sb.append("\n");
+            unit.rules().stream().sorted(Comparator.comparingInt(rule -> rule.identifier().id())).forEach(rule -> {
+                sb.append(rule.code());
+                sb.append("\n\n");
+            });
+            sb.append("\n");
+        }
+    }
+
+}

redaction-service-v1/rules-management/src/main/java/com/knecon/fforesight/utility/rules/management/factory/RuleFileParser.java

@@ -0,0 +1,110 @@
+package com.knecon.fforesight.utility.rules.management.factory;
+
+import static java.util.stream.Collectors.groupingBy;
+
+import java.io.File;
+import java.nio.charset.StandardCharsets;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.drools.drl.ast.descr.ImportDescr;
+import org.drools.drl.ast.descr.PackageDescr;
+import org.drools.drl.ast.descr.RuleDescr;
+import org.drools.drl.parser.DrlParser;
+import org.kie.internal.builder.conf.LanguageLevelOption;
+
+import com.knecon.fforesight.utility.rules.management.RuleManagementResources;
+import com.knecon.fforesight.utility.rules.management.models.ApplicationType;
+import com.knecon.fforesight.utility.rules.management.models.BasicRule;
+import com.knecon.fforesight.utility.rules.management.models.RuleClass;
+import com.knecon.fforesight.utility.rules.management.models.RuleFileBluePrint;
+import com.knecon.fforesight.utility.rules.management.models.RuleIdentifier;
+import com.knecon.fforesight.utility.rules.management.models.RuleType;
+import com.knecon.fforesight.utility.rules.management.models.RuleUnit;
+import com.knecon.fforesight.utility.rules.management.utils.RuleFileIO;
+
+import lombok.SneakyThrows;
+import lombok.experimental.UtilityClass;
+
+@UtilityClass
+public class RuleFileParser {
+
+    @SneakyThrows
+    public RuleFileBluePrint buildBluePrintFromAllRulesFile(ApplicationType applicationType) {
+
+        try (var rulesInputStream = RuleManagementResources.getAllRulesInputStream(applicationType)) {
+            String rulesString = new String(rulesInputStream.readAllBytes(), StandardCharsets.UTF_8);
+            return buildBluePrintFromRulesString(rulesString);
+        }
+    }
+
+
+    @SneakyThrows
+    public RuleFileBluePrint buildBluePrintFromRulesString(String rulesString) {
+
+        DrlParser parser = new DrlParser(LanguageLevelOption.DRL6);
+        PackageDescr packageDescr = parser.parse(false, rulesString);
+        StringBuilder queryBuilder = new StringBuilder();
+        List<BasicRule> allRules = new LinkedList<>();
+        for (RuleDescr rule : packageDescr.getRules()) {
+            if (rule.isQuery()) {
+                queryBuilder.append(rulesString, rule.getStartCharacter(), rule.getEndCharacter());
+                queryBuilder.append("\n\n");
+                continue;
+            }
+            allRules.add(BasicRule.fromRuleDescr(rule, rulesString));
+        }
+        String imports = rulesString.substring(0, packageDescr.getImports().stream().mapToInt(ImportDescr::getEndCharacter).max().orElseThrow() + 1);
+        String globals = packageDescr.getGlobals()
+                .stream()
+                .map(globalDescr -> rulesString.substring(globalDescr.getStartCharacter(), globalDescr.getEndCharacter()))
+                .collect(Collectors.joining("\n"));
+
+        List<RuleClass> ruleClasses = buildRuleClasses(allRules);
+
+        return new RuleFileBluePrint(imports.trim(), globals.trim(), queryBuilder.toString().trim(), ruleClasses);
+    }
+
+
+    private List<RuleClass> buildRuleClasses(List<BasicRule> allRules) {
+
+        Map<RuleType, List<BasicRule>> rulesPerType = allRules.stream().collect(groupingBy(rule -> rule.identifier().type()));
+        return rulesPerType.keySet().stream().map(type -> new RuleClass(type, groupingByGroup(rulesPerType.get(type)))).collect(Collectors.toList());
+    }
+
+
+    private List<RuleUnit> groupingByGroup(List<BasicRule> rules) {
+
+        Map<Integer, List<BasicRule>> rulesPerUnit = rules.stream().collect(groupingBy(rule -> rule.identifier().unit()));
+        return rulesPerUnit.keySet().stream().sorted().map(unit -> new RuleUnit(unit, rulesPerUnit.get(unit))).collect(Collectors.toList());
+    }
+
+
+    public Set<RuleIdentifier> parseRuleIdentifiersFromFile(String input) {
+
+        return buildBluePrintFromRulesString(RuleFileIO.getRulesString(input)).getAllRuleIdentifiers();
+    }
+
+
+    public Set<RuleIdentifier> parseRuleIdentifiersFromFile(File file) {
+
+        return parseRuleIdentifiersFromFile(file.toString());
+    }
+
+
+    /**
+     * Creates a BluePrint from all redact manager, documine and component rule files
+     *
+     * @return RuleFileBluePrint containing all rules from any all rule files
+     */
+    public static RuleFileBluePrint buildBluePrintFromAllRuleFiles() {
+
+        RuleFileBluePrint bluePrint = buildBluePrintFromAllRulesFile(ApplicationType.DM);
+        bluePrint.addAllRulesFromBluePrint(buildBluePrintFromAllRulesFile(ApplicationType.RM));
+        return bluePrint;
+    }
+
+}

redaction-service-v1/rules-management/src/main/java/com/knecon/fforesight/utility/rules/management/migration/RuleFileMigrator.java

@@ -0,0 +1,43 @@
+package com.knecon.fforesight.utility.rules.management.migration;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+
+import com.knecon.fforesight.utility.rules.management.factory.RuleFileFactory;
+import com.knecon.fforesight.utility.rules.management.factory.RuleFileParser;
+import com.knecon.fforesight.utility.rules.management.models.BasicRule;
+import com.knecon.fforesight.utility.rules.management.models.RuleFileBluePrint;
+import com.knecon.fforesight.utility.rules.management.utils.RuleFileIO;
+
+import lombok.SneakyThrows;
+import lombok.experimental.UtilityClass;
+
+/**
+ * This class is the primary class for migrating Files with the 4.0.0 format to newer versions. This assumes RuleIdentifiers are already formatted.
+ * It will search for any rule with the same Identifier in the base and replace it with the new version. If none is found, the rule is written as is.
+ */
+@UtilityClass
+public class RuleFileMigrator {
+
+    @SneakyThrows
+    public void migrateFile(File ruleFile) {
+
+        RuleFileBluePrint ruleFileBluePrint = RuleFileParser.buildBluePrintFromRulesString(RuleFileIO.getRulesString(ruleFile.getAbsolutePath()));
+        RuleFileBluePrint combinedBluePrint = RuleFileParser.buildBluePrintFromAllRuleFiles();
+
+        for (BasicRule ruleToReplace : ruleFileBluePrint.getAllRules()) {
+            List<BasicRule> rulesToAdd = combinedBluePrint.findRuleByIdentifier(ruleToReplace.identifier());
+            ruleFileBluePrint.removeRule(ruleToReplace.identifier());
+            rulesToAdd.forEach(ruleFileBluePrint::addRule);
+        }
+
+        String migratedRulesString = RuleFileFactory.buildRuleString(ruleFileBluePrint);
+        String migratedFilePath = ruleFile.getAbsolutePath();
+        try (var out = new FileOutputStream(migratedFilePath)) {
+            out.write(migratedRulesString.getBytes(StandardCharsets.UTF_8));
+        }
+    }
+
+}

redaction-service-v1/rules-management/src/main/java/com/knecon/fforesight/utility/rules/management/migration/RuleIdentifierMigrator.java

@@ -0,0 +1,156 @@
+package com.knecon.fforesight.utility.rules.management.migration;
+
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import com.knecon.fforesight.utility.rules.management.RuleManagementResources;
+import com.knecon.fforesight.utility.rules.management.factory.RuleFileFactory;
+import com.knecon.fforesight.utility.rules.management.factory.RuleFileParser;
+import com.knecon.fforesight.utility.rules.management.models.ApplicationType;
+import com.knecon.fforesight.utility.rules.management.models.BasicRule;
+import com.knecon.fforesight.utility.rules.management.models.RuleClass;
+import com.knecon.fforesight.utility.rules.management.models.RuleFileBluePrint;
+import com.knecon.fforesight.utility.rules.management.models.RuleIdentifier;
+import com.knecon.fforesight.utility.rules.management.models.RuleUnit;
+import com.knecon.fforesight.utility.rules.management.translation.OldRulesParser;
+
+import lombok.SneakyThrows;
+import lombok.experimental.UtilityClass;
+
+@UtilityClass
+public class RuleIdentifierMigrator {
+
+    public static void main(String[] args) {
+
+        migrateAllRuleIdentifiers();
+    }
+
+
+    @SneakyThrows
+    public void migrateAllRuleIdentifiers() {
+
+        List<OldRulesParser.OldRulesCsvRecord> parsedRecords = OldRulesParser.getOldRulesCsvRecords(RuleManagementResources.getOldRulesCsvInputStream());
+        RuleFileBluePrint bluePrint = getBluePrint(ApplicationType.RM);
+
+//        migrateIdentifier(RuleIdentifier.fromString("PII.10.0"), RuleIdentifier.fromString("CBI.20.0"), bluePrint, parsedRecords);
+//        migrateIdentifier(RuleIdentifier.fromString("PII.10.1"), RuleIdentifier.fromString("CBI.20.1"), bluePrint, parsedRecords);
+//        migrateIdentifier(RuleIdentifier.fromString("PII.11.0"), RuleIdentifier.fromString("PII.10.0"), bluePrint, parsedRecords);
+//        migrateIdentifier(RuleIdentifier.fromString("PII.12.0"), RuleIdentifier.fromString("PII.11.0"), bluePrint, parsedRecords);
+//        migrateIdentifier(RuleIdentifier.fromString("PII.13.0"), RuleIdentifier.fromString("PII.12.0"), bluePrint, parsedRecords);
+
+        bluePrint = migrateMatchedRuleForAllRules(bluePrint);
+
+        String ruleString = RuleFileFactory.buildRuleString(bluePrint);
+        try (var out = new FileOutputStream("/tmp/all_redact_manager_rules.drl")) {
+            out.write(ruleString.getBytes(StandardCharsets.UTF_8));
+        }
+        String csvString = OldRulesParser.formatAsCsv(parsedRecords);
+        try (var out = new FileOutputStream("/tmp/old_rules_with_translations.csv")) {
+            out.write(csvString.getBytes(StandardCharsets.UTF_8));
+        }
+    }
+
+
+    private static RuleFileBluePrint migrateMatchedRuleForAllRules(RuleFileBluePrint bluePrint) {
+
+        List<BasicRule> migratedRules = bluePrint.ruleClasses()
+                .stream()
+                .map(RuleClass::ruleUnits)
+                .flatMap(Collection::stream)
+                .map(RuleUnit::rules)
+                .flatMap(Collection::stream)
+                .map(RuleIdentifierMigrator::migrateMatchedRule)
+                .toList();
+        RuleFileBluePrint migratedBluePrint = new RuleFileBluePrint(bluePrint.imports(), bluePrint.globals(), bluePrint.queries(), new LinkedList<>());
+        migratedRules.forEach(migratedBluePrint::addRule);
+        return migratedBluePrint;
+    }
+
+
+    private static BasicRule migrateMatchedRule(BasicRule basicRule) {
+
+        String redactionReason = findByRegex("\\.setRedactionReason\\(\"(.*)\"\\)", basicRule.code(), 1);
+        String legalBasis = findByRegex("\\.setLegalBasis\\(\"(.*)\"\\)", basicRule.code(), 1);
+
+        String migratedCode = basicRule.code()
+                .replaceAll("\\.addMatchedRule\\(.*\\)",
+                        Matcher.quoteReplacement(String.format(".addMatchedRule(\"%s\", \"%s\", \"%s\")", basicRule.identifier().toString(), redactionReason, legalBasis)));
+        migratedCode = migratedCode.replaceAll("\\.setMatchedRule\\(.*\\)",
+                Matcher.quoteReplacement(String.format(".addMatchedRule(\"%s\", \"%s\", \"%s\")", basicRule.identifier().toString(), redactionReason, legalBasis)));
+        migratedCode = migratedCode.replaceAll("\\.setRedactionReason\\(\".*\"\\)", "");
+        migratedCode = migratedCode.replaceAll("\\.setLegalBasis\\(\".*\"\\)", "");
+        migratedCode = migratedCode.replaceAll("\\$entity;\n", "");
+        migratedCode = migratedCode.replaceAll("\\$redactionEntity;", "");
+        migratedCode = migratedCode.replaceAll("\\$laboratoryEntity;", "");
+        migratedCode = migratedCode.replaceAll("\\$contactEntity;", "");
+        return new BasicRule(basicRule.identifier(), basicRule.name(), migratedCode);
+    }
+
+
+    private static String findByRegex(String regex, String searchText, int group) {
+
+        Pattern pattern = Pattern.compile(regex);
+        Matcher matcher = pattern.matcher(searchText);
+        if (matcher.find()) {
+            return searchText.substring(matcher.start(group), matcher.end(group));
+        }
+        return "";
+    }
+
+
+    private static RuleFileBluePrint getBluePrint(ApplicationType applicationType) throws IOException {
+
+        RuleFileBluePrint bluePrint;
+        try (var inputStream = RuleManagementResources.getAllRulesInputStream(applicationType)) {
+            String rulesString = new String(inputStream.readAllBytes());
+            bluePrint = RuleFileParser.buildBluePrintFromRulesString(rulesString);
+        }
+        return bluePrint;
+    }
+
+
+    public void migrateIdentifier(RuleIdentifier oldIdentifier, RuleIdentifier newIdentifier, RuleFileBluePrint bluePrint, List<OldRulesParser.OldRulesCsvRecord> records) {
+
+        BasicRule oldRule = bluePrint.findRuleClassByType(oldIdentifier.type()).orElseThrow()
+                .findRuleUnitByInteger(oldIdentifier.unit()).orElseThrow()
+                .rules()
+                .stream()
+                .filter(rule -> rule.identifier().equals(oldIdentifier))
+                .findFirst()
+                .orElseThrow();
+
+        BasicRule newRule = new BasicRule(newIdentifier, oldRule.name(), migrateCode(oldRule.name(), oldRule.code(), oldIdentifier, newIdentifier));
+        bluePrint.removeRule(oldIdentifier);
+        bluePrint.addRule(newRule);
+
+        records.stream()
+                .filter(record -> record.translatesTo().contains(oldIdentifier))
+                .forEach(record -> replaceOldIdentifier(oldIdentifier, newIdentifier, record.translatesTo()));
+    }
+
+
+    private String migrateCode(String name, String code, RuleIdentifier oldIdentifier, RuleIdentifier newIdentifier) {
+
+        return code.replace(String.format(".addMatchedRule(%d);", oldIdentifier.unit()), String.format(".addMatchedRule(%d);", newIdentifier.unit()))
+                .replace(oldIdentifier.toString(), newIdentifier.toString());
+    }
+
+
+    private static void replaceOldIdentifier(RuleIdentifier oldIdentifier, RuleIdentifier newIdentifier, List<RuleIdentifier> oldIdentifiers) {
+
+        oldIdentifiers.remove(oldIdentifier);
+        oldIdentifiers.add(newIdentifier);
+    }
+
+
+    public record Context(RuleFileBluePrint bluePrint, List<OldRulesParser.OldRulesCsvRecord> records) {
+
+    }
+
+}

redaction-service-v1/rules-management/src/main/java/com/knecon/fforesight/utility/rules/management/models/ApplicationType.java

@@ -0,0 +1,17 @@
+package com.knecon.fforesight.utility.rules.management.models;
+
+import lombok.Getter;
+
+public enum ApplicationType {
+
+    RM("RM"),
+    DM("DM");
+
+    @Getter
+    private final String value;
+
+    ApplicationType(String value) {
+
+        this.value = value;
+    }
+}

redaction-service-v1/rules-management/src/main/java/com/knecon/fforesight/utility/rules/management/models/BasicRule.java

@@ -0,0 +1,21 @@
+package com.knecon.fforesight.utility.rules.management.models;
+
+import org.drools.drl.ast.descr.RuleDescr;
+
+import com.knecon.fforesight.utility.rules.management.utils.RuleFileIO;
+
+public record BasicRule(RuleIdentifier identifier, String name, String code) {
+    public static BasicRule fromRuleDescr(RuleDescr rule, String rulesString) {
+
+        RuleIdentifier identifier = RuleIdentifier.fromName(rule.getName());
+        String nameWithoutIdentifier = rule.getName().replace(identifier + ":", "");
+        String code = rulesString.substring(rule.getStartCharacter(), rule.getEndCharacter());
+        return new BasicRule(identifier, nameWithoutIdentifier, code);
+    }
+
+    public String toEscapedCode() {
+
+        return RuleFileIO.escapeAndWrap(code());
+    }
+
+}

redaction-service-v1/rules-management/src/main/java/com/knecon/fforesight/utility/rules/management/models/OldRule.java

@@ -0,0 +1,21 @@
+package com.knecon.fforesight.utility.rules.management.models;
+
+import org.drools.drl.ast.descr.RuleDescr;
+
+public record OldRule(String name, String code) {
+
+    private static final int RULE_PREFIX_LENGTH = "rule \"\"".length();
+
+
+    public static OldRule fromRuleDescr(RuleDescr ruleDescr, String oldRuleString) {
+
+        return new OldRule(ruleDescr.getName(), getCodeSubstring(ruleDescr, oldRuleString));
+    }
+
+
+    private static String getCodeSubstring(RuleDescr rule, String oldRuleString) {
+
+        return oldRuleString.substring(rule.getStartCharacter() + rule.getName().length() + RULE_PREFIX_LENGTH, rule.getEndCharacter());
+    }
+
+}

redaction-service-v1/rules-management/src/main/java/com/knecon/fforesight/utility/rules/management/models/RuleClass.java

@@ -0,0 +1,23 @@
+package com.knecon.fforesight.utility.rules.management.models;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
+public record RuleClass(RuleType ruleType, List<RuleUnit> ruleUnits) {
+
+    public Optional<RuleUnit> findRuleUnitByInteger(Integer unit) {
+
+        return ruleUnits.stream().filter(ruleUnit -> Objects.equals(ruleUnit.unit(), unit)).findFirst();
+    }
+
+
+    public RuleUnit createNewRuleUnit(Integer unit) {
+
+        var ruleUnit = new RuleUnit(unit, new LinkedList<>());
+        ruleUnits.add(ruleUnit);
+        return ruleUnit;
+    }
+
+}

redaction-service-v1/rules-management/src/main/java/com/knecon/fforesight/utility/rules/management/models/RuleFileBluePrint.java

@@ -0,0 +1,121 @@
+package com.knecon.fforesight.utility.rules.management.models;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+public record RuleFileBluePrint(String imports, String globals, String queries, List<RuleClass> ruleClasses) {
+
+    public void removeRule(RuleIdentifier ruleIdentifier) {
+
+        findRuleClassByType(ruleIdentifier.type()).ifPresent(ruleClass -> ruleClass.findRuleUnitByInteger(ruleIdentifier.unit()).ifPresent(ruleUnit -> {
+            ruleUnit.rules().removeIf(rule -> rule.identifier().matches(ruleIdentifier));
+            if (ruleUnit.rules().isEmpty()) {
+                ruleClass.ruleUnits().remove(ruleUnit);
+            }
+            if (ruleClass.ruleUnits().isEmpty()) {
+                ruleClasses().remove(ruleClass);
+            }
+        }));
+
+    }
+
+
+    public Optional<RuleClass> findRuleClassByType(RuleType ruleType) {
+
+        return ruleClasses.stream().filter(ruleClass -> Objects.equals(ruleClass.ruleType(), ruleType)).findFirst();
+    }
+
+
+    public Set<BasicRule> getAllRules() {
+
+        return ruleClasses().stream().map(RuleClass::ruleUnits).flatMap(Collection::stream).map(RuleUnit::rules).flatMap(Collection::stream).collect(Collectors.toSet());
+    }
+
+
+    /**
+     * Adds all rules from a given RuleFileBluePrint to the current instance.
+     *
+     * @param ruleFileBluePrint The RuleFileBluePrint that contains the rules to be added.
+     * @throws IllegalArgumentException If the RuleFileBluePrints have non-matching rules with the same identifier and cannot be merged.
+     */
+    public void addAllRulesFromBluePrint(RuleFileBluePrint ruleFileBluePrint) {
+
+        Set<RuleIdentifier> newRuleIdentifiers = ruleFileBluePrint.getAllRuleIdentifiers();
+        Set<RuleIdentifier> existingRuleIdentifiers = this.getAllRuleIdentifiers();
+        Set<RuleIdentifier> duplicatedRuleIdentifiers = existingRuleIdentifiers.stream().filter(newRuleIdentifiers::contains).collect(Collectors.toSet());
+        for (RuleIdentifier duplicatedRuleIdentifier : duplicatedRuleIdentifiers) {
+            List<BasicRule> thisRules = findRuleByIdentifier(duplicatedRuleIdentifier);
+            List<BasicRule> otherRules = ruleFileBluePrint.findRuleByIdentifier(duplicatedRuleIdentifier);
+            assert thisRules.size() == 1;
+            assert otherRules.size() == 1;
+            if (!thisRules.get(0).equals(otherRules.get(0))) {
+                throw new IllegalArgumentException("RuleFileBluePrints have non matching rules with the same identifier, cannot be merged!");
+            }
+        }
+        newRuleIdentifiers.removeAll(existingRuleIdentifiers);
+        newRuleIdentifiers.forEach(identifierToAdd -> ruleFileBluePrint.findRuleByIdentifier(identifierToAdd).forEach(this::addRule));
+    }
+
+
+    public List<BasicRule> findRuleByIdentifier(RuleIdentifier ruleIdentifier) {
+
+        if (Objects.isNull(ruleIdentifier.unit())) {
+            return findRuleClassByType(ruleIdentifier.type()).map(ruleClass -> ruleClass.ruleUnits().stream().flatMap(ruleUnit -> ruleUnit.rules().stream()).toList())
+                    .orElse(Collections.emptyList());
+        }
+        return findRuleClassByType(ruleIdentifier.type())//
+                .map(ruleClass -> ruleClass.findRuleUnitByInteger(ruleIdentifier.unit())//
+                        .map(ruleUnit -> ruleUnit.rules().stream().filter(rule -> rule.identifier().matches(ruleIdentifier)).toList())//
+                        .orElse(Collections.emptyList()))//
+                .orElse(Collections.emptyList());
+    }
+
+
+    public Set<RuleIdentifier> getAllRuleIdentifiers() {
+
+        return ruleClasses().stream()
+                .map(RuleClass::ruleUnits)
+                .flatMap(Collection::stream)
+                .map(RuleUnit::rules)
+                .flatMap(Collection::stream)
+                .map(BasicRule::identifier)
+                .collect(Collectors.toSet());
+    }
+
+
+    public void addRule(BasicRule rule) {
+
+        RuleClass ruleClass = findRuleClassByType(rule.identifier().type()).orElseGet(() -> createNewRuleClass(rule));
+
+        RuleUnit ruleUnit = ruleClass.findRuleUnitByInteger(rule.identifier().unit()).orElseGet(() -> ruleClass.createNewRuleUnit(rule.identifier().unit()));
+
+        ruleUnit.rules().add(rule);
+    }
+
+
+    public RuleFileBluePrint buildFilteredBluePrintByRuleIdentifiers(Set<RuleIdentifier> identifiers) {
+
+        RuleFileBluePrint filteredBluePrint = new RuleFileBluePrint(imports(), globals(), queries(), new LinkedList<>());
+        ruleClasses().stream()
+                .flatMap(ruleClass -> ruleClass.ruleUnits().stream())
+                .flatMap(ruleUnit -> ruleUnit.rules().stream())
+                .filter(rule -> identifiers.stream().anyMatch(identifier -> rule.identifier().matches(identifier)))
+                .forEach(filteredBluePrint::addRule);
+        return filteredBluePrint;
+    }
+
+
+    private RuleClass createNewRuleClass(BasicRule rule) {
+
+        var newClass = new RuleClass(rule.identifier().type(), new LinkedList<>());
+        ruleClasses.add(newClass);
+        return newClass;
+    }
+
+}

redaction-service-v1/rules-management/src/main/java/com/knecon/fforesight/utility/rules/management/models/RuleIdentifier.java

@@ -0,0 +1,90 @@
+package com.knecon.fforesight.utility.rules.management.models;
+
+import java.util.Arrays;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import lombok.NonNull;
+
+/*
+This is used to filter rules, if the field Integer unit or Integer id is null, the field will match any other RuleIdentifier.
+Therefore, to compare RuleIdentifiers one should always use the function matches.
+ */
+public record RuleIdentifier(@NonNull RuleType type, Integer unit, Integer id) {
+
+    public static RuleIdentifier fromName(String name) {
+
+        String identifier = name.split(":")[0];
+        return fromString(identifier);
+    }
+
+    public static RuleIdentifier fromRuleType(RuleType ruleType) {
+
+        return new RuleIdentifier(ruleType, null, null);
+    }
+
+
+    public static RuleIdentifier fromString(String identifier) {
+        String[] values = identifier.split("\\.");
+        RuleType type = RuleType.fromString(values[0]);
+        Integer group = values.length > 1 ? parseIntOrStar(values[1]) : null;
+        Integer id = values.length > 2 ? parseIntOrStar(values[2]) : null;
+        return new RuleIdentifier(type, group, id);
+    }
+
+    public static Set<RuleIdentifier> fromListOfIdentifiersString(String input) {
+
+        return Arrays.stream(input.split(",")).map(String::trim).map(RuleIdentifier::fromString).collect(Collectors.toSet());
+    }
+
+
+    private static Integer parseIntOrStar(String value) {
+        value = value.replaceAll("\r","");
+        return !value.equals("*") ? Integer.parseInt(value) : null;
+    }
+
+
+    /**
+     * This is used to filter rules, if the field Integer unit or Integer id is null, the field will match any other RuleIdentifier.
+     * Therefore, to compare RuleIdentifiers one should always use the function matches.
+     *
+     * @param ruleIdentifier RuleIdentifier to check if this one matches it.
+     * @return true, if all fields match. If a field is null, it matches any field.
+     */
+    public boolean matches(RuleIdentifier ruleIdentifier) {
+
+        return ruleIdentifier.type().equals(this.type()) && //
+                (Objects.isNull(ruleIdentifier.unit()) || Objects.isNull(this.unit()) || Objects.equals(this.unit(), ruleIdentifier.unit())) && //
+                (Objects.isNull(ruleIdentifier.id()) || Objects.isNull(this.id()) || Objects.equals(this.id(), ruleIdentifier.id()));
+
+    }
+
+
+    @Override
+    public String toString() {
+
+        StringBuilder sb = new StringBuilder();
+        sb.append(type().name());
+        if (Objects.nonNull(unit())) {
+            sb.append(".");
+            sb.append(unit());
+        } else {
+            sb.append(".*");
+        }
+        if (Objects.nonNull(id())) {
+            sb.append(".");
+            sb.append(id());
+        } else {
+            sb.append(".*");
+        }
+        return sb.toString();
+    }
+
+
+    public String toRuleUnitString() {
+
+        return String.format("Rule unit: %s.%d", type.name(), unit);
+    }
+
+}

redaction-service-v1/rules-management/src/main/java/com/knecon/fforesight/utility/rules/management/models/RuleType.java

@@ -0,0 +1,54 @@
+package com.knecon.fforesight.utility.rules.management.models;
+
+import java.util.Map;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.FieldDefaults;
+
+@AllArgsConstructor
+@EqualsAndHashCode(onlyExplicitlyIncluded = true)
+@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+public class RuleType {
+
+    static Map<String, String> fullNameMap = Map.of("SYN", "Syngenta specific",//
+            "ETC", "Other",//
+            "MAN", "Manual changes",//
+            "X", "Entity merging",//
+            "FA", "File attributes",//
+            "LDS", "Local dictionary search",//
+            "TAB", "Table extraction",//
+            "H", "Headlines",//
+            "DOC", "General documine");
+
+    @EqualsAndHashCode.Include
+    String name;
+
+
+    public static RuleType fromString(String value) {
+
+        value = value.replaceAll("\r", "");
+        return new RuleType(value);
+    }
+
+
+    public String name() {
+
+        return name;
+    }
+
+
+    public boolean isWildCard() {
+
+        return name.equals("*");
+    }
+
+
+    @Override
+    public String toString() {
+
+        return fullNameMap.getOrDefault(name, name);
+    }
+
+}

redaction-service-v1/rules-management/src/main/java/com/knecon/fforesight/utility/rules/management/models/RuleUnit.java

@@ -0,0 +1,7 @@
+package com.knecon.fforesight.utility.rules.management.models;
+
+import java.util.List;
+
+public record RuleUnit(Integer unit, List<BasicRule> rules) {
+
+}

redaction-service-v1/rules-management/src/main/java/com/knecon/fforesight/utility/rules/management/translation/OldRulesParser.java

@@ -0,0 +1,192 @@
+package com.knecon.fforesight.utility.rules.management.translation;
+
+import java.io.File;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.io.StringWriter;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.apache.commons.csv.CSVFormat;
+import org.apache.commons.csv.CSVPrinter;
+import org.apache.commons.csv.CSVRecord;
+import org.drools.drl.ast.descr.PackageDescr;
+import org.drools.drl.ast.descr.RuleDescr;
+import org.drools.drl.parser.DrlParser;
+import org.kie.internal.builder.conf.LanguageLevelOption;
+
+import com.knecon.fforesight.utility.rules.management.RuleManagementResources;
+import com.knecon.fforesight.utility.rules.management.factory.RuleFileParser;
+import com.knecon.fforesight.utility.rules.management.models.ApplicationType;
+import com.knecon.fforesight.utility.rules.management.models.BasicRule;
+import com.knecon.fforesight.utility.rules.management.models.OldRule;
+import com.knecon.fforesight.utility.rules.management.models.RuleFileBluePrint;
+import com.knecon.fforesight.utility.rules.management.models.RuleIdentifier;
+import com.knecon.fforesight.utility.rules.management.utils.RuleFileIO;
+
+import lombok.SneakyThrows;
+import lombok.experimental.UtilityClass;
+
+@UtilityClass
+public class OldRulesParser {
+
+    final static List<String> HEADERS = List.of("id", "old rule names", "old rule code", "translates to");
+
+
+    @SneakyThrows
+    public void createSetOfTranslatedRuleIdentifiersForEachFileInTheCsv() {
+
+        List<String> allHeaders = List.of();
+        List<OldRulesCsvRecord> records = getOldRulesCsvRecords(RuleManagementResources.getOldRulesCsvInputStream());
+
+    }
+
+
+    public Set<RuleIdentifier> translateOldRulesFileToNewIdentifiers(File oldRulesFile, ApplicationType applicationType) {
+
+        return translateOldRulesFileToNewIdentifiers(oldRulesFile.toString(), applicationType);
+    }
+
+
+    public Set<RuleIdentifier> translateOldRulesFileToNewIdentifiers(String oldRulesFile, ApplicationType applicationType) {
+
+        return translateOldRulesStringToNewIdentifiers(RuleFileIO.getRulesString(oldRulesFile), applicationType);
+    }
+
+
+    public Set<RuleIdentifier> translateEscapedOldRulesStringToNewIdentifiers(String escapedOldRulesString, ApplicationType applicationType) {
+
+        return translateOldRulesStringToNewIdentifiers(RuleFileIO.unescapeAndUnWrap(escapedOldRulesString), applicationType);
+    }
+
+
+    public Set<RuleIdentifier> translateOldRulesStringToNewIdentifiers(String oldRulesString, ApplicationType applicationType) {
+
+        List<OldRule> oldRules = parseOldRules(oldRulesString);
+        List<OldRulesCsvRecord> records = getOldRulesCsvRecords(RuleManagementResources.getOldRulesCsvInputStream());
+        Map<OldRule, List<RuleIdentifier>> translationPairs = new HashMap<>();
+        for (OldRule oldRule : oldRules) {
+            List<RuleIdentifier> translatedIdentifiers = records.stream()
+                    .filter(oldRulesCsvRecord -> oldRulesCsvRecord.code().equals(oldRule.code()))
+                    .map(OldRulesCsvRecord::translatesTo)
+                    .findAny()
+                    .orElse(Collections.emptyList());
+            translationPairs.put(oldRule, translatedIdentifiers);
+        }
+        boolean allTranslated = true;
+        for (OldRule oldRule : translationPairs.keySet()) {
+            if (translationPairs.get(oldRule).isEmpty()) {
+                allTranslated = false;
+                records.add(new OldRulesCsvRecord(records.size(), oldRule.code(), oldRule.name(), Collections.emptyList()));
+                System.out.printf(
+                        "Rule %s has not been translated yet! %nIt has been added to the bottom of the old_rules_with_translations.csv file. To continue, translate the rule and enter its identifier in the csv, then try again!%n",
+                        oldRule.name());
+            }
+        }
+        if (!allTranslated) {
+            String formattedAsCsv = formatAsCsv(records);
+            String fileLocation = RuleManagementResources.createTempOldRulesCsv(formattedAsCsv);
+            System.out.printf("CSV File with updated values is located at %s%n", fileLocation);
+            throw new IllegalArgumentException("Non translated Rule found!");
+        }
+        RuleFileBluePrint bluePrint = RuleFileParser.buildBluePrintFromAllRulesFile(applicationType);
+
+        translationPairs.forEach((key, value) -> System.out.printf("Rule %s will be translated to %s \n",
+                key.name(),
+                String.format("%s: %s", value, value.stream().map(bluePrint::findRuleByIdentifier).flatMap(Collection::stream).map(BasicRule::name).toList())));
+
+        return Stream.concat(//
+                        Stream.of(RuleIdentifier.fromString("X"), RuleIdentifier.fromString("FA"), RuleIdentifier.fromString("LDS"), RuleIdentifier.fromString("MAN")),//
+                        translationPairs.values().stream().flatMap(Collection::stream))
+                .map(ruleIdentifier -> new RuleIdentifier(ruleIdentifier.type(), ruleIdentifier.unit(), null))
+                .collect(Collectors.toSet());
+    }
+
+
+    @SneakyThrows
+    public String formatAsCsv(List<OldRulesCsvRecord> records) {
+
+        StringWriter sw = new StringWriter();
+        CSVFormat csvFormat = CSVFormat.DEFAULT.builder().setHeader(HEADERS.toArray(String[]::new)).build();
+        try (final CSVPrinter printer = new CSVPrinter(sw, csvFormat)) {
+            for (OldRulesCsvRecord record : records) {
+                printer.printRecord(Stream.of(record.id, RuleFileIO.escapeAndWrap(record.names), RuleFileIO.escapeAndWrap(record.code), record.translatesTo));
+            }
+        }
+        return sw.toString();
+    }
+
+
+    @SneakyThrows
+    private List<OldRule> parseOldRules(String oldRuleString) {
+
+        DrlParser parser = new DrlParser(LanguageLevelOption.DRL6);
+        PackageDescr packageDescr = parser.parse(false, oldRuleString);
+        List<OldRule> oldRules = new LinkedList<>();
+        for (RuleDescr rule : packageDescr.getRules()) {
+            if (!rule.isRule()) {
+                continue;
+            }
+            oldRules.add(OldRule.fromRuleDescr(rule, oldRuleString));
+        }
+        return oldRules;
+    }
+
+
+    @SneakyThrows
+    public List<OldRulesCsvRecord> getOldRulesCsvRecords(InputStream allRulesCsvInputStream) {
+
+        List<OldRulesCsvRecord> parsedRecords = new LinkedList<>();
+        try (Reader reader = new InputStreamReader(allRulesCsvInputStream)) {
+            Iterable<CSVRecord> records = CSVFormat.DEFAULT.withHeader().withSkipHeaderRecord().parse(reader);
+            for (CSVRecord record : records) {
+                String[] values = record.values();
+                parsedRecords.add(new OldRulesCsvRecord(Long.parseLong(values[0]),
+                        RuleFileIO.unescapeAndUnWrap(values[2]),
+                        RuleFileIO.unescapeAndUnWrap(values[1]),
+                        parseRuleIdentifiers(values[3])));
+            }
+        }
+        return parsedRecords;
+    }
+
+
+    private List<RuleIdentifier> parseRuleIdentifiers(String value) {
+
+        if (value.startsWith("[")) {
+            value = value.substring(1);
+        }
+        if (value.endsWith("]")) {
+            value = value.substring(0, value.length() - 1);
+        }
+        if (value.isEmpty() || value.isBlank()) {
+            return Collections.emptyList();
+        }
+        List<RuleIdentifier> ruleIdentifiers = new LinkedList<>();
+        for (String identifier : value.split(", ")) {
+            ruleIdentifiers.add(RuleIdentifier.fromString(identifier));
+        }
+        return ruleIdentifiers;
+    }
+
+
+    private List<Boolean> parseBooleanList(String[] values) {
+
+        return Arrays.stream(values).map(Boolean::parseBoolean).toList();
+    }
+
+
+    public record OldRulesCsvRecord(long id, String code, String names, List<RuleIdentifier> translatesTo) {
+
+    }
+
+}

redaction-service-v1/rules-management/src/main/java/com/knecon/fforesight/utility/rules/management/utils/RuleFileIO.java

@@ -0,0 +1,71 @@
+package com.knecon.fforesight.utility.rules.management.utils;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.stream.Stream;
+
+import com.github.javaparser.utils.StringEscapeUtils;
+
+import lombok.SneakyThrows;
+import lombok.experimental.UtilityClass;
+
+@UtilityClass
+public final class RuleFileIO {
+
+    public String unescapeAndUnWrap(String rulesString) {
+
+        if (rulesString.isBlank() || rulesString.isEmpty()) {
+            return rulesString;
+        }
+        rulesString = rulesString.substring(1, rulesString.length() - 1);
+        rulesString = rulesString.translateEscapes();
+        return rulesString;
+    }
+
+
+    @SneakyThrows
+    public String unescapeAndUnWrap(File rulesFile) {
+
+        try (var inputStream = new FileInputStream(rulesFile)) {
+            return unescapeAndUnWrap(new String(inputStream.readAllBytes()));
+        }
+    }
+
+
+    public String escape(String rulesString) {
+
+        return StringEscapeUtils.escapeJava(rulesString);
+    }
+
+
+    public String escapeAndWrap(String rulesString) {
+
+        rulesString = StringEscapeUtils.escapeJava(rulesString);
+        rulesString = "\"" + rulesString + "\"";
+        return rulesString;
+    }
+
+
+    @SneakyThrows
+    public String getRulesString(String input) {
+
+        String rulesString;
+        try (var inputStream = new FileInputStream(input)) {
+            rulesString = new String(inputStream.readAllBytes(), StandardCharsets.UTF_8);
+            if (input.endsWith(".txt") && rulesString.startsWith("\"")) {
+                rulesString = RuleFileIO.unescapeAndUnWrap(rulesString);
+            }
+        }
+        return rulesString;
+    }
+
+    @SneakyThrows
+    public Stream<File> streamAllRuleFilesInDirectory(Path input){
+
+        return Files.walk(input).filter(path -> path.getFileName().toString().equals("rules.txt") || path.getFileName().toString().equals("rules.drl")).map(Path::toFile);
+    }
+
+}

redaction-service-v1/rules-management/src/main/resources/default_rule_identifiers.txt

@@ -0,0 +1,16 @@
+MAN.0.*
+MAN.1.*
+MAN.2.*
+MAN.3.0
+MAN.3.1
+MAN.3.2
+MAN.4.*
+X.0.0
+X.1.0
+X.2.0
+X.3.0
+X.4.0
+X.5.0
+X.6.*
+FA.*.*
+LDS.*.*

redaction-service-v1/rules-management/src/main/resources/default_rule_identifiers_dm.txt

@@ -0,0 +1,9 @@
+MAN.*.*
+X.0.0
+X.2.0
+X.3.0
+X.4.0
+X.5.0
+X.7.0
+FA.*.*
+LDS.*.*

redaction-service-v1/rules-management/src/main/resources/old_rules_with_translations.csv

@@ -0,0 +1,234 @@
+id,old rule names,old rule code,translates to
+0,"""0: Add CBI_author from ai 5""","""\n    when\n        Section(aiMatchesType(\""CARDINAL\""))\n    then\n        section.addAiEntities(\""CARDINAL\"", \""cardinal\"");\n    end""",[AI.2.0]
+1,"""0: Add CBI_author from ai 3""","""\n    when\n        Section(aiMatchesType(\""POSTAL\""))\n    then\n        section.addAiEntities(\""POSTAL\"", \""postal\"");\n    end""",[AI.2.0]
+2,"""0: Add CBI_author from ai 6""","""\n    when\n        Section(aiMatchesType(\""CITY\""))\n    then\n        section.addAiEntities(\""CITY\"", \""city\"");\n    end""",[AI.2.0]
+3,"""0: Add CBI_author from ai 7""","""\n    when\n        Section(aiMatchesType(\""STATE\""))\n    then\n        section.addAiEntities(\""STATE\"", \""state\"");\n    end""",[AI.2.0]
+4,"""0: Add CBI_author from ai 2""","""\n    when\n        Section(aiMatchesType(\""STREET\""))\n    then\n        section.addAiEntities(\""STREET\"", \""street\"");\n    end""",[AI.2.0]
+5,"""0: Recommend CTL/BL laboratory that start with BL or CTL""","""\n    when\n        Section(searchText.contains(\""CT\"") || searchText.contains(\""BL\""))\n    then\n        /* Regular expression: ((\\b((([Cc]T(([1ILli\\/])| L|~P))|(BL))[\\. ]?([\\dA-Ziltphz~\\/.:!]| ?[\\(',][Ppi](\\(e)?|([\\(-?']\\/))+( ?[\\(\\/\\dA-Znasieg]+)?)\\b( ?\\/? ?\\d+)?)|(\\bCT[L1i]\\b)) */\n        section.addRecommendationByRegEx(\""((\\\\b((([Cc]T(([1ILli\\\\/])| L|~P))|(BL))[\\\\. ]?([\\\\dA-Ziltphz~\\\\/.:!]| ?[\\\\(',][Ppi](\\\\(e)?|([\\\\(-?']\\\\/))+( ?[\\\\(\\\\/\\\\dA-Znasieg]+)?)\\\\b( ?\\\\/? ?\\\\d+)?)|(\\\\bCT[L1i]\\\\b))\"", true, 0, \""CBI_address\"");\n    end""",[SYN.1.0]
+6,"""0: Add CBI_author from ai 4""","""\n    when\n        Section(aiMatchesType(\""COUNTRY\""))\n    then\n        section.addAiEntities(\""COUNTRY\"", \""country\"");\n    end""",[AI.2.0]
+7,"""0: Combine address parts from ai to CBI_address (org is mandatory)""","""\n    when\n        Section(aiMatchesType(\""ORG\""))\n    then\n        section.combineAiTypes(\""ORG\"", \""STREET,POSTAL,COUNTRY,CARDINAL,CITY,STATE\"", 20, \""CBI_address\"", 3, false);\n    end""",[AI.1.0]
+8,"""0: Combine address parts from ai to CBI_address (city is mandatory)""","""\n    when\n        Section(aiMatchesType(\""CITY\""))\n    then\n        section.combineAiTypes(\""CITY\"", \""ORG,STREET,POSTAL,COUNTRY,CARDINAL,STATE\"", 20, \""CBI_address\"", 3, false);\n    end""",[AI.1.0]
+9,"""0: Combine address parts from ai to CBI_address (street is mandatory)""","""\n    when\n        Section(aiMatchesType(\""STREET\""))\n    then\n        section.combineAiTypes(\""STREET\"", \""ORG,POSTAL,COUNTRY,CARDINAL,CITY,STATE\"", 20, \""CBI_address\"", 3, false);\n    end""",[AI.1.0]
+10,"""0: Add CBI_author from ai, 1: Add CBI_author from ai""","""\n    when\n        Section(aiMatchesType(\""CBI_author\""))\n    then\n        section.addAiEntities(\""CBI_author\"", \""CBI_author\"");\n    end""",[AI.0.0]
+11,"""0: Add CBI_author from ai 8""","""\n    when\n        Section(aiMatchesType(\""ORG\""))\n    then\n        section.addAiEntities(\""ORG\"", \""org\"");\n    end""",[AI.2.0]
+12,"""1: Redacted because Section contains Vertebrate""","""\n    when\n        Section(matchesType(\""vertebrate\""))\n    then\n        section.redact(\""CBI_author\"", 1, \""Vertebrate found\"", \""Reg (EC) No 1107/2009 Art. 63 (2g)\"");\n        section.redact(\""CBI_address\"", 1, \""Vertebrate found\"", \""Reg (EC) No 1107/2009 Art. 63 (2g)\"");\n    end""",[CBI.3.0]
+13,"""5: Do not redact genitive CBI_author, 7: Do not redact genitive CBI_author, 1: Do not redact genitive CBI_author""","""\n    when\n        Section(matchesType(\""CBI_author\""))\n    then\n        section.expandToFalsePositiveByRegEx(\""CBI_author\"", \""['’’'ʼˈ´`‘′ʻ’']s\"", false, 0);\n    end""",[CBI.2.0]
+14,"""1: Redact CBI Authors (Non vertebrate study)""","""\n    when\n        Section(!fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && matchesType(\""CBI_author\""))\n    then\n        section.redact(\""CBI_author\"", 1, \""Author found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n    end""",[CBI.0.0]
+15,"""2: Combine ai types CBI_author from ai""","""\n    when\n        Section(aiMatchesType(\""ORG\""))\n    then\n        section.combineAiTypes(\""ORG\"", \""STREET,POSTAL,COUNTRY,CARDINAL,CITY,STATE\"", 20, \""CBI_address\"", 2, false);\n    end""",[AI.1.0]
+16,"""2: Not Redacted because Section contains no Vertebrate""","""\n    when\n        Section(!matchesType(\""vertebrate\""))\n    then\n        section.redactNot(\""CBI_author\"", 2, \""No Vertebrate found\"");\n        section.redactNot(\""CBI_address\"", 2, \""No Vertebrate found\"");\n    end""",[CBI.3.0]
+17,"""2: Redact CBI Authors (Vertebrate study)""","""\n    when\n        Section(fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && matchesType(\""CBI_author\""))\n    then\n        section.redact(\""CBI_author\"", 2, \""Author found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n    end""",[CBI.0.0]
+18,"""2: Redacted because Section contains Vertebrate""","""\n    when\n        Section(matchesType(\""vertebrate\""))\n    then\n        section.redact(\""CBI_author\"", 2, \""Vertebrate found\"", \""Reg (EC) No 1107/2009 Art. 63 (2g)\"");\n        section.redact(\""CBI_address\"", 2, \""Vertebrate found\"", \""Reg (EC) No 1107/2009 Art. 63 (2g)\"");\n    end""",[CBI.3.0]
+19,"""3: Redact CBI Authors (Non vertebrate study)""","""\n    when\n        Section(!fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && matchesType(\""CBI_author\""))\n    then\n        section.redact(\""CBI_author\"", 3, \""Author found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n    end""",[CBI.0.0]
+20,"""3: Not Redacted because Section contains no Vertebrate""","""\n    when\n        Section(!matchesType(\""vertebrate\""))\n    then\n        section.redactNot(\""CBI_author\"", 3, \""No Vertebrate found\"");\n        section.redactNot(\""CBI_address\"", 3, \""No Vertebrate found\"");\n    end""",[CBI.3.2]
+21,"""3: Do not redact Names and Addresses if no redaction Indicator is contained""","""\n    when\n        Section(matchesType(\""vertebrate\""), matchesType(\""no_redaction_indicator\""))\n    then\n        section.redactNot(\""CBI_author\"", 3, \""Vertebrate and No Redaction Indicator found\"");\n        section.redactNot(\""CBI_address\"", 3, \""Vertebrate and No Redaction Indicator found\"");\n    end""",[CBI.4.0]
+22,"""3: Redact not CBI Address (Non vertebrate study)""","""\n    when\n        Section(!fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && matchesType(\""CBI_address\""))\n    then\n        section.redactNot(\""CBI_address\"", 3, \""Address found for non vertebrate study\"");\n    end""",[CBI.1.0]
+23,"""3: Redact not CBI Address (Non vertebrate study)""","""\n    when\n        Section(!fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && matchesType(\""CBI_address\""))\n    then\n        section.redactNot(\""CBI_address\"", 3, \""Address found for non vertebrate study\"");\n        section.ignoreRecommendations(\""CBI_address\"");\n    end""",[CBI.1.0]
+24,"""4: Redact Names and Addresses if no_redaction_indicator and redaction_indicator is contained""","""\n    when\n        Section(matchesType(\""vertebrate\""), matchesType(\""no_redaction_indicator\""), matchesType(\""redaction_indicator\""))\n    then\n        section.redact(\""CBI_author\"", 4, \""Vertebrate and Redaction Indicator found\"", \""Reg (EC) No 1107/2009 Art. 63 (2g)\"");\n        section.redact(\""CBI_address\"", 4, \""Vertebrate and Redaction Indicator found\"", \""Reg (EC) No 1107/2009 Art. 63 (2g)\"");\n    end""",[CBI.5.0]
+25,"""4: Redact CBI Address (Vertebrate study)""","""\n    when\n        Section(fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && matchesType(\""CBI_address\""))\n    then\n        section.redact(\""CBI_address\"", 4, \""Address found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n    end""",[CBI.1.1]
+26,"""4: Redact CBI Authors (Vertebrate study)""","""\n    when\n        Section(fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && matchesType(\""CBI_author\""))\n    then\n        section.redact(\""CBI_author\"", 4, \""Author found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n    end""",[CBI.0.0]
+27,"""4: Do not redact Names and Addresses if no redaction Indicator is contained""","""\n    when\n        Section(matchesType(\""vertebrate\""), matchesType(\""no_redaction_indicator\""))\n    then\n        section.redactNot(\""CBI_author\"", 4, \""Vertebrate and No Redaction Indicator found\"");\n        section.redactNot(\""CBI_address\"", 4, \""Vertebrate and No Redaction Indicator found\"");\n    end""",[CBI.4.0]
+28,"""5: Do not redact Names and Addresses if no redaction Indicator is contained""","""\n    when\n        Section(matchesType(\""vertebrate\""), matchesType(\""published_information\""))\n    then\n        section.redactNotAndReference(\""CBI_author\"",\""published_information\"", 5, \""Published Information found\"");\n        section.redactNotAndReference(\""CBI_address\"",\""published_information\"", 5, \""Published Information found\"");\n    end""",[CBI.4.0]
+29,"""5: Redact Names and Addresses if no_redaction_indicator and redaction_indicator is contained""","""\n    when\n        Section(matchesType(\""vertebrate\""), matchesType(\""no_redaction_indicator\""), matchesType(\""redaction_indicator\""))\n    then\n        section.redact(\""CBI_author\"", 5, \""Vertebrate and Redaction Indicator found\"", \""Reg (EC) No 1107/2009 Art. 63 (2g)\"");\n        section.redact(\""CBI_address\"", 5, \""Vertebrate and Redaction Indicator found\"", \""Reg (EC) No 1107/2009 Art. 63 (2g)\"");\n    end""",[CBI.5.0]
+30,"""5: Redact not CBI Address (Non vertebrate study)""","""\n    when\n        Section(!fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && matchesType(\""CBI_address\""))\n    then\n        section.redactNot(\""CBI_address\"", 5, \""Address found for non vertebrate study\"");\n        section.ignoreRecommendations(\""CBI_address\"");\n    end""",[CBI.1.0]
+31,"""6: Do not redact Names and Addresses if no redaction Indicator is contained""","""\n    when\n        Section(matchesType(\""vertebrate\""), matchesType(\""published_information\""))\n    then\n        section.redactNotAndReference(\""CBI_author\"",\""published_information\"", 6, \""Published Information found\"");\n        section.redactNotAndReference(\""CBI_address\"",\""published_information\"", 6, \""Published Information found\"");\n    end""",[CBI.4.0]
+32,"""6: Redact CBI Address (Vertebrate study)""","""\n    when\n        Section(fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && matchesType(\""CBI_address\""))\n    then\n        section.redact(\""CBI_address\"", 6, \""Address found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n    end""",[CBI.1.1]
+33,"""6: Redact Author(s) cells in Tables with Author(s) header (Non vertebrate study)""","""\n    when\n        Section(!fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && hasTableHeader(\""Author(s)\"") && !hasTableHeader(\""Vertebrate study Y/N\""))\n    then\n        section.redactCell(\""Author(s)\"", 6, \""CBI_author\"", false, \""Author found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n    end""","[CBI.9.0, CBI.11.0]"
+34,"""6: Not redacted because Vertebrate Study = N""","""\n    when\n        Section(rowEquals(\""Vertebrate study Y/N\"", \""N\"") || rowEquals(\""Vertebrate study Y/N\"", \""No\""))\n    then\n        section.redactNotCell(\""Author(s)\"", 6, \""CBI_author\"", true, \""Not redacted because row is not a vertebrate study\"");\n        section.redactNot(\""CBI_author\"", 6, \""Not redacted because row is not a vertebrate study\"");\n        section.redactNot(\""CBI_address\"", 6, \""Not redacted because row is not a vertebrate study\"");\n        section.highlightCell(\""Vertebrate study Y/N\"", 6, \""hint_only\"");\n    end""",[CBI.12.0]
+35,"""7: Redact Author(s) cells in Tables with Author(s) header (Vertebrate study)""","""\n    when\n        Section(fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && hasTableHeader(\""Author(s)\"") && !hasTableHeader(\""Vertebrate study Y/N\""))\n    then\n        section.redactCell(\""Author(s)\"", 7, \""CBI_author\"", false, \""Author found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n    end""","[CBI.10.0, CBI.11.0]"
+36,"""7: Not redacted because Vertebrate Study = N""","""\n    when\n        Section(rowEquals(\""Vertebrate study Y/N\"", \""N\"") || rowEquals(\""Vertebrate study Y/N\"", \""No\""))\n    then\n        section.redactNotCell(\""Author(s)\"", 7, \""CBI_author\"", true, \""Not redacted because row is not a vertebrate study\"");\n        section.redactNot(\""CBI_author\"", 7, \""Not redacted because row is not a vertebrate study\"");\n        section.redactNot(\""CBI_address\"", 7, \""Not redacted because row is not a vertebrate study\"");\n        section.highlightCell(\""Vertebrate study Y/N\"", 7, \""hint_only\"");\n    end""",[CBI.12.0]
+37,"""7: Redact if must redact entry is found""","""\n    when\n        Section(matchesType(\""must_redact\""))\n    then\n        section.redact(\""CBI_author\"", 7, \""must_redact entry was found.\"", \""Reg (EC) No 1107/2009 Art. 63 (2g)\"");\n        section.redact(\""CBI_address\"", 7, \""must_redact entry was found.\"", \""Reg (EC) No 1107/2009 Art. 63 (2g)\"");\n    end""",[CBI.8.0]
+38,"""8: Redact Authors and Addresses in Reference Table if it is a Vertebrate study""","""\n    when\n        Section(rowEquals(\""Vertebrate study Y/N\"", \""Y\"") || rowEquals(\""Vertebrate study Y/N\"", \""Yes\""))\n    then\n        section.redactCell(\""Author(s)\"", 8, \""CBI_author\"", true, \""Redacted because row is a vertebrate study\"", \""Reg (EC) No 1107/2009 Art. 63 (2g)\"");\n        section.redact(\""CBI_address\"", 8, \""Redacted because row is a vertebrate study\"", \""Reg (EC) No 1107/2009 Art. 63 (2g)\"");\n        section.highlightCell(\""Vertebrate study Y/N\"", 8, \""must_redact\"");\n    end""",[CBI.12.0]
+39,"""8: Redact if must redact entry is found""","""\n    when\n        Section(matchesType(\""must_redact\""))\n    then\n        section.redact(\""CBI_author\"", 8, \""Specification of impurity of the active substance was found.\"", \""Reg (EC) No 1107/2009 Art. 63 (2b)\"");\n        section.redact(\""CBI_address\"", 8, \""Specification of impurity of the active substance was found.\"", \""Reg (EC) No 1107/2009 Art. 63 (2b)\"");\n    end""",[CBI.8.0]
+40,"""8: Redact Author cells in Tables with Author header (Non vertebrate study)""","""\n    when\n        Section(!fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && hasTableHeader(\""Author\"") && !hasTableHeader(\""Vertebrate study Y/N\""))\n    then\n        section.redactCell(\""Author\"", 8, \""CBI_author\"", false, \""Author found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n    end""","[CBI.9.0, CBI.11.0]"
+41,"""8: Redact Author(s) cells in Tables with Author(s) header (Non vertebrate study)""","""\n    when\n        Section(!fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && hasTableHeader(\""Author(s)\"") && !hasTableHeader(\""Vertebrate study Y/N\""))\n    then\n        section.redactCell(\""Author(s)\"", 8, \""CBI_author\"", false, \""Author found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n    end""","[CBI.9.0, CBI.11.0]"
+42,"""9: Redact Author(s) cells in Tables with Author(s) header (Vertebrate study)""","""\n    when\n        Section(fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && hasTableHeader(\""Author(s)\"") && !hasTableHeader(\""Vertebrate study Y/N\""))\n    then\n        section.redactCell(\""Author(s)\"", 9, \""CBI_author\"", false, \""Author found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n    end""","[CBI.10.0, CBI.11.0]"
+43,"""9: Redact Author cells in Tables with Author header (Vertebrate study)""","""\n    when\n        Section(fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && hasTableHeader(\""Author\"") && !hasTableHeader(\""Vertebrate study Y/N\""))\n    then\n        section.redactCell(\""Author\"", 9, \""CBI_author\"", false, \""Author found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n    end""","[CBI.10.0, CBI.11.0]"
+44,"""9: Redact sponsor company""","""\n    when\n        Section(searchText.toLowerCase().contains(\""batches produced at\""))\n    then\n        section.redactIfPrecededBy(\""batches produced at\"", \""CBI_sponsor\"", 9, \""Redacted because it represents a sponsor company\"", \""Reg (EC) No 1107/2009 Art. 63 (2g)\"");\n        section.addHintAnnotation(\""batches produced at\"", \""must_redact\"");\n    end""",[CBI.14.0]
+45,"""9: Redact Authors and Addresses in Reference Table if it is a Vertebrate study""","""\n    when\n        Section(rowEquals(\""Vertebrate study Y/N\"", \""Y\"") || rowEquals(\""Vertebrate study Y/N\"", \""Yes\""))\n    then\n        section.redactCell(\""Author(s)\"", 9, \""CBI_author\"", true, \""Redacted because row is a vertebrate study\"", \""Reg (EC) No 1107/2009 Art. 63 (2g)\"");\n        section.redact(\""CBI_address\"", 9, \""Redacted because row is a vertebrate study\"", \""Reg (EC) No 1107/2009 Art. 63 (2g)\"");\n        section.highlightCell(\""Vertebrate study Y/N\"", 9, \""must_redact\"");\n    end""",[CBI.12.0]
+46,"""10: Redact and recommand Authors in Tables with Vertebrate study Y/N header (Non vertebrate study)""","""\n    when\n        Section(!fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && (rowEquals(\""Vertebrate study Y/N\"", \""Y\"") || rowEquals(\""Vertebrate study Y/N\"", \""Yes\"") || rowEquals(\""Vertebrate study Y/N\"", \""N\"") || rowEquals(\""Vertebrate study Y/N\"", \""No\"")))\n    then\n        section.redactCell(\""Author(s)\"", 10, \""CBI_author\"", true, \""Author found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n    end""","[CBI.9.0, CBI.11.0]"
+47,"""10: Redact determination of residues""","""\n    when\n        Section((\n            searchText.toLowerCase.contains(\""determination of residues\"") ||\n            searchText.toLowerCase.contains(\""determination of total residues\"")\n        ) && (\n            searchText.toLowerCase.contains(\""livestock\"") ||\n            searchText.toLowerCase.contains(\""live stock\"") ||\n            searchText.toLowerCase.contains(\""tissue\"") ||\n            searchText.toLowerCase.contains(\""tissues\"") ||\n            searchText.toLowerCase.contains(\""liver\"") ||\n            searchText.toLowerCase.contains(\""muscle\"") ||\n            searchText.toLowerCase.contains(\""bovine\"") ||\n            searchText.toLowerCase.contains(\""ruminant\"") ||\n            searchText.toLowerCase.contains(\""ruminants\"")\n        ))\n    then\n        section.redact(\""CBI_author\"", 10, \""Determination of residues was found.\"", \""Reg (EC) No 1107/2009 Art. 63 (2g)\"");\n        section.redact(\""CBI_address\"", 10, \""Determination of residues was found.\"", \""Reg (EC) No 1107/2009 Art. 63 (2g)\"");\n        section.addHintAnnotation(\""determination of residues\"", \""must_redact\"");\n        section.addHintAnnotation(\""determination of total residues\"", \""must_redact\"");\n        section.addHintAnnotation(\""livestock\"", \""must_redact\"");\n        section.addHintAnnotation(\""live stock\"", \""must_redact\"");\n        section.addHintAnnotation(\""tissue\"", \""must_redact\"");\n        section.addHintAnnotation(\""tissues\"", \""must_redact\"");\n        section.addHintAnnotation(\""liver\"", \""must_redact\"");\n        section.addHintAnnotation(\""muscle\"", \""must_redact\"");\n        section.addHintAnnotation(\""bovine\"", \""must_redact\"");\n        section.addHintAnnotation(\""ruminant\"", \""must_redact\"");\n        section.addHintAnnotation(\""ruminants\"", \""must_redact\"");\n    end""",[CBI.15.0]
+48,"""10: Redact Author cells in Tables with Author header (Non vertebrate study)""","""\n    when\n        Section(!fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && hasTableHeader(\""Author\"") && !hasTableHeader(\""Vertebrate study Y/N\""))\n    then\n        section.redactCell(\""Author\"", 10, \""CBI_author\"", false, \""Author found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n    end""","[CBI.9.0, CBI.11.0]"
+49,"""10: Redact sponsor company""","""\n    when\n        Section(searchText.toLowerCase().contains(\""batches produced at\""))\n    then\n        section.redactIfPrecededBy(\""batches produced at\"", \""CBI_sponsor\"", 10, \""Redacted because it represents a sponsor company\"", \""Reg (EC) No 1107/2009 Art. 63 (2g)\"");\n        section.addHintAnnotation(\""batches produced at\"", \""must_redact\"");\n    end""",[CBI.14.0]
+50,"""11: Redact and recommand Authors in Tables with Vertebrate study Y/N header (Vertebrate study)""","""\n    when\n        Section(fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && (rowEquals(\""Vertebrate study Y/N\"", \""Y\"") || rowEquals(\""Vertebrate study Y/N\"", \""Yes\"") || rowEquals(\""Vertebrate study Y/N\"", \""N\"") || rowEquals(\""Vertebrate study Y/N\"", \""No\"")))\n    then\n        section.redactCell(\""Author(s)\"", 11, \""CBI_author\"", true, \""Author found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n    end""","[CBI.10.0, CBI.11.0]"
+51,"""11: Redact if CTL/* or BL/*  was found""","""\n    when\n        Section(searchText.contains(\""CTL/\"") || searchText.contains(\""BL/\""))\n    then\n        section.redact(\""CBI_author\"", 11, \""Laboraty for vertebrate studies found\"", \""Reg (EC) No 1107/2009 Art. 63 (2g)\"");\n        section.redact(\""CBI_address\"", 11, \""Laboraty for vertebrate studies found\"", \""Reg (EC) No 1107/2009 Art. 63 (2g)\"");\n        section.addHintAnnotation(\""CTL\"", \""must_redact\"");\n        section.addHintAnnotation(\""BL\"", \""must_redact\"");\n    end""",[SYN.0.0]
+52,"""11: Redact determination of residues""","""\n    when\n        Section((\n            searchText.toLowerCase.contains(\""determination of residues\"") ||\n            searchText.toLowerCase.contains(\""determination of total residues\"")\n        ) && (\n            searchText.toLowerCase.contains(\""livestock\"") ||\n            searchText.toLowerCase.contains(\""live stock\"") ||\n            searchText.toLowerCase.contains(\""tissue\"") ||\n            searchText.toLowerCase.contains(\""tissues\"") ||\n            searchText.toLowerCase.contains(\""liver\"") ||\n            searchText.toLowerCase.contains(\""muscle\"") ||\n            searchText.toLowerCase.contains(\""bovine\"") ||\n            searchText.toLowerCase.contains(\""ruminant\"") ||\n            searchText.toLowerCase.contains(\""ruminants\"")\n        ))\n    then\n        section.redact(\""CBI_author\"", 11, \""Determination of residues was found.\"", \""Reg (EC) No 1107/2009 Art. 63 (2g)\"");\n        section.redact(\""CBI_address\"", 11, \""Determination of residues was found.\"", \""Reg (EC) No 1107/2009 Art. 63 (2g)\"");\n        section.addHintAnnotation(\""determination of residues\"", \""must_redact\"");\n        section.addHintAnnotation(\""determination of total residues\"", \""must_redact\"");\n        section.addHintAnnotation(\""livestock\"", \""must_redact\"");\n        section.addHintAnnotation(\""live stock\"", \""must_redact\"");\n        section.addHintAnnotation(\""tissue\"", \""must_redact\"");\n        section.addHintAnnotation(\""tissues\"", \""must_redact\"");\n        section.addHintAnnotation(\""liver\"", \""must_redact\"");\n        section.addHintAnnotation(\""muscle\"", \""must_redact\"");\n        section.addHintAnnotation(\""bovine\"", \""must_redact\"");\n        section.addHintAnnotation(\""ruminant\"", \""must_redact\"");\n        section.addHintAnnotation(\""ruminants\"", \""must_redact\"");\n    end""",[CBI.15.0]
+53,"""11: Redact Author cells in Tables with Author header (Vertebrate study)""","""\n    when\n        Section(fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && hasTableHeader(\""Author\"") && !hasTableHeader(\""Vertebrate study Y/N\""))\n    then\n        section.redactCell(\""Author\"", 11, \""CBI_author\"", false, \""Author found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n    end""","[CBI.10.0, CBI.11.0]"
+54,"""12: Redact and add recommendation for et al. author""","""\n    when\n        Section(searchText.contains(\""et al\""))\n    then\n\t\tsection.redactAndRecommendByRegEx(\""\\\\b([A-ZÄÖÜ][^\\\\s\\\\.,]+( [A-ZÄÖÜ]{1,2}\\\\.?)?( ?[A-ZÄÖÜ]\\\\.?)?) et al\\\\.?\"", false, 1, \""CBI_author\"", 12, \""Author found\"", \""Reg (EC) No 1107/2009 Art. 63 (2g)\"");\n    end""",[CBI.16.0]
+55,"""12: Redact and recommand Authors in Tables with Vertebrate study Y/N header (Non vertebrate study)""","""\n    when\n        Section(!fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && (rowEquals(\""Vertebrate study Y/N\"", \""Y\"") || rowEquals(\""Vertebrate study Y/N\"", \""Yes\"") || rowEquals(\""Vertebrate study Y/N\"", \""N\"") || rowEquals(\""Vertebrate study Y/N\"", \""No\"")))\n    then\n        section.redactCell(\""Author(s)\"", 12, \""CBI_author\"", true, \""Author found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n    end""","[CBI.9.0, CBI.11.0]"
+56,"""12: Recommend CTL/BL laboratory""","""\n    when\n        Section(searchText.contains(\""CT\"") || searchText.contains(\""BL\""))\n    then\n        section.addRecommendationByRegEx(\""((\\\\b((([Cc]T(([1ILli\\\\/])| L|~P))|(BL))[\\\\. ]?([\\\\dA-Ziltphz~\\\\/.:!]| ?[\\\\(',][Ppi](\\\\(e)?|([\\\\(-?']\\\\/))+( ?[\\\\(\\\\/\\\\dA-Znasieg]+)?)\\\\b( ?\\\\/? ?\\\\d+)?)|(\\\\bCT[L1i]\\\\b))\"", true, 0, \""CBI_address\"");\n    end""",[SYN.1.0]
+57,"""12: Redact if CTL/* or BL/*  was found (Non vertebrate study)""","""\n    when\n        Section(!fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && (searchText.contains(\""CTL/\"") || searchText.contains(\""BL/\"")))\n    then\n        section.addHintAnnotation(\""CTL\"", \""hint_only\"");\n        section.addHintAnnotation(\""BL\"", \""hint_only\"");\n    end""",[SYN.0.0]
+58,"""13: Redact and recommand Authors in Tables with Vertebrate study Y/N header (Vertebrate study)""","""\n    when\n        Section(fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && (rowEquals(\""Vertebrate study Y/N\"", \""Y\"") || rowEquals(\""Vertebrate study Y/N\"", \""Yes\"") || rowEquals(\""Vertebrate study Y/N\"", \""N\"") || rowEquals(\""Vertebrate study Y/N\"", \""No\"")))\n    then\n        section.redactCell(\""Author(s)\"", 13, \""CBI_author\"", true, \""Author found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n    end""","[CBI.10.0, CBI.11.0]"
+59,"""14: Add recommendation for Addresses in Test Organism sections, 13: Add recommendation for Addresses in Test Organism sections""","""\n    when\n        Section(searchText.contains(\""Species:\"") && searchText.contains(\""Source:\""))\n    then\n\t\tsection.recommendLineAfter(\""Source:\"", \""CBI_address\"");\n    end""",[CBI.17.0]
+60,"""13: Redact and add recommendation for et al. author""","""\n    when\n        Section(searchText.contains(\""et al\""))\n    then\n\t\tsection.redactAndRecommendByRegEx(\""\\\\b([A-ZÄÖÜ][^\\\\s\\\\.,]+( [A-ZÄÖÜ]{1,2}\\\\.?)?( ?[A-ZÄÖÜ]\\\\.?)?) et al\\\\.?\"", false, 1, \""CBI_author\"", 13, \""Author found\"", \""Reg (EC) No 1107/2009 Art. 63 (2g)\"");\n    end""",[CBI.16.0]
+61,"""13: Redact if CTL/* or BL/*  was found (Vertebrate study)""","""\n    when\n        Section(fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && (searchText.contains(\""CTL/\"") || searchText.contains(\""BL/\"")))\n    then\n        section.addRedaction(\""CTL\"", \""must_redact\"", 13, \""Laboratory for vertebrate studies found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"" );\n        section.addRedaction(\""BL\"", \""must_redact\"", 13, \""Laboratory for vertebrate studies found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"" );\n    end""",[SYN.0.0]
+62,"""15: Add recommendation for Addresses in Test Animals sections, 14: Add recommendation for Addresses in Test Animals sections""","""\n    when\n        Section(searchText.contains(\""Species\"") && searchText.contains(\""Source\""))\n    then\n\t\tsection.recommendLineAfter(\""Source\"", \""CBI_address\"");\n    end""",[CBI.17.0]
+63,"""14: Redact addresses that start with BL or CTL""","""\n    when\n        Section(searchText.contains(\""BL\"") || searchText.contains(\""CT\""))\n    then\n        section.addRecommendationByRegEx(\""((\\\\b((([Cc]T(([1ILli\\\\/])| L|~P))|(BL))[\\\\. ]?([\\\\dA-Ziltphz~\\\\/.:!]| ?[\\\\(',][Ppi](\\\\(e)?|([\\\\(-?']\\\\/))+( ?[\\\\(\\\\/\\\\dA-Znasieg]+)?)\\\\b( ?\\\\/? ?\\\\d+)?)|(\\\\bCT[L1i]\\\\b))\"", true, 0, \""CBI_address\"");\n    end""",[SYN.1.0]
+64,"""14: Redacted PII Personal Identification Information""","""\n    when\n        Section(matchesType(\""PII\""))\n    then\n        section.redact(\""PII\"", 14, \""PII (Personal Identification Information) found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n    end""","[PII.0.0, PII.0.1]"
+65,"""14: Redact and add recommendation for et al. author (Non vertebrate study)""","""\n    when\n        Section(!fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && searchText.contains(\""et al\""))\n    then\n        section.redactAndRecommendByRegEx(\""\\\\b([A-ZÄÖÜ][^\\\\s\\\\.,]+( [A-ZÄÖÜ]{1,2}\\\\.?)?( ?[A-ZÄÖÜ]\\\\.?)?) et al\\\\.?\"", false, 1, \""CBI_author\"", 14, \""Author found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n    end""",[CBI.16.0]
+66,"""15: Redact Emails by RegEx""","""\n    when\n        Section(searchText.contains(\""@\""))\n    then\n        section.redactByRegEx(\""\\\\b[A-Z0-9._%+-]+@[A-Z0-9.-]+\\\\.[A-Z]{2,4}\\\\b\"", true, 0, \""PII\"", 15, \""PII (Personal Identification Information) found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n    end""","[PII.1.0, PII.1.1]"
+67,"""15: Redact and add recommendation for et al. author (Non vertebrate study)""","""\n    when\n        Section(!fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && searchText.contains(\""et al\""))\n    then\n        section.redactAndRecommendByRegEx(\""\\\\b([A-ZÄÖÜ][^\\\\s\\\\.,]+( [A-ZÄÖÜ]{1,2}\\\\.?)?( ?[A-ZÄÖÜ]\\\\.?)?) et al\\\\.?\"", false, 1, \""CBI_author\"", 15, \""Author found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n    end""",[CBI.16.0]
+68,"""15: Redact and add recommendation for et al. author (Vertebrate study)""","""\n    when\n        Section(fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && searchText.contains(\""et al\""))\n    then\n        section.redactAndRecommendByRegEx(\""\\\\b([A-ZÄÖÜ][^\\\\s\\\\.,]+( [A-ZÄÖÜ]{1,2}\\\\.?)?( ?[A-ZÄÖÜ]\\\\.?)?) et al\\\\.?\"", false, 1, \""CBI_author\"", 15, \""Author found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n    end""",[CBI.16.0]
+69,"""16: Redacted PII Personal Identification Information""","""\n    when\n        Section(matchesType(\""PII\""))\n    then\n        section.redact(\""PII\"", 16, \""PII (Personal Identification Information) found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n    end""","[PII.0.0, PII.0.1]"
+70,"""16: Redact and add recommendation for et al. author (Vertebrate study)""","""\n    when\n        Section(fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && searchText.contains(\""et al\""))\n    then\n        section.redactAndRecommendByRegEx(\""\\\\b([A-ZÄÖÜ][^\\\\s\\\\.,]+( [A-ZÄÖÜ]{1,2}\\\\.?)?( ?[A-ZÄÖÜ]\\\\.?)?) et al\\\\.?\"", false, 1, \""CBI_author\"", 16, \""Author found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n    end""",[CBI.16.0]
+71,"""16: Redact contact information""","""\n    when\n       Section(text.contains(\""Contact point:\"")\n       || text.contains(\""Phone:\"")\n       || text.contains(\""Fax:\"")\n       || text.contains(\""Tel.:\"")\n       || text.contains(\""Tel:\"")\n       || text.contains(\""E-mail:\"")\n       || text.contains(\""Email:\"")\n       || text.contains(\""e-mail:\"")\n       || text.contains(\""E-mail address:\"")\n       || text.contains(\""Alternative contact:\"")\n       || text.contains(\""Telephone number:\"")\n       || text.contains(\""Telephone No:\"")\n       || text.contains(\""Fax number:\"")\n       || text.contains(\""Telephone:\"")\n       || text.contains(\""European contact:\""))\n    then\n          section.redactLineAfter(\""Contact point:\"", \""PII\"", 16, true, \""Contact information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n              section.redactLineAfter(\""Phone:\"", \""PII\"", 16, true, \""Contact information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n              section.redactLineAfter(\""Fax:\"", \""PII\"", 16, true, \""Contact information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n              section.redactLineAfter(\""Tel.:\"", \""PII\"", 16, true, \""Contact information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n              section.redactLineAfter(\""Tel:\"", \""PII\"", 16, true, \""Contact information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n              section.redactLineAfter(\""E-mail:\"", \""PII\"", 16, true, \""Contact information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n              section.redactLineAfter(\""Email:\"", \""PII\"", 16, true, \""Contact information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n              section.redactLineAfter(\""e-mail:\"", \""PII\"", 16, true, \""Contact information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n              section.redactLineAfter(\""E-mail address:\"", \""PII\"", 16, true, \""Contact information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n              section.redactLineAfter(\""Contact:\"", \""PII\"", 16, true, \""Contact information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n              section.redactLineAfter(\""Alternative contact:\"", \""PII\"", 16, true, \""Contact information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n              section.redactLineAfter(\""Telephone number:\"", \""PII\"", 16, true, \""Contact information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n              section.redactLineAfter(\""Telephone No:\"", \""PII\"", 16, true, \""Contact information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n              section.redactLineAfter(\""Fax number:\"", \""PII\"", 16, true, \""Contact information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n              section.redactLineAfter(\""Telephone:\"", \""PII\"", 16, true, \""Contact information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n              section.redactBetween(\""No:\"", \""Fax\"", \""PII\"", 16, true, \""Contact information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n              section.redactBetween(\""Contact:\"", \""Tel.:\"", \""PII\"", 16, true, \""Contact information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n              section.redactLineAfter(\""European contact:\"",  \""PII\"", 16, true, \""Contact information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n     end""","[PII.4.0, PII.4.1, PII.6.0, PII.6.1]"
+72,"""16: Add recommendation for Addresses in Test Organism sections, 17: Add recommendation for Addresses in Test Organism sections""","""\n    when\n        Section(fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && searchText.contains(\""Species:\"") && searchText.contains(\""Source:\""))\n    then\n        section.recommendLineAfter(\""Source:\"", \""CBI_address\"");\n    end""",[CBI.17.0]
+73,"""17: Redact Emails by RegEx""","""\n    when\n        Section(searchText.contains(\""@\""))\n    then\n        section.redactByRegEx(\""\\\\b([A-Za-z0-9._%+\\\\-]+@[A-Za-z0-9.\\\\-]+\\\\.[A-Za-z\\\\-]{1,23}[A-Za-z])\\\\b\"", true, 1, \""PII\"", 17, \""PII (Personal Identification Information) found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n    end""","[PII.1.0, PII.1.1]"
+74,"""17: Add recommendation for Addresses in Test Animals sections, 18: Add recommendation for Addresses in Test Animals sections""","""\n    when\n        Section(fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && searchText.contains(\""Species\"") && searchText.contains(\""Source\""))\n    then\n        section.recommendLineAfter(\""Source\"", \""CBI_address\"");\n    end""",[CBI.17.0]
+75,"""17: Redact contact information if applicant is found""","""\n    when\n        Section(headlineContainsWord(\""applicant\"") || text.contains(\""Applicant\"") || headlineContainsWord(\""Primary contact\"") || headlineContainsWord(\""Alternative contact\"") || text.contains(\""Telephone number:\""))\n    then\n        section.redactLineAfter(\""Contact point:\"", \""PII\"", 17, true, \""Applicant information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n        section.redactLineAfter(\""Phone:\"", \""PII\"", 17, true, \""Applicant information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n        section.redactLineAfter(\""Fax:\"", \""PII\"", 17, true, \""Applicant information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n        section.redactLineAfter(\""Tel.:\"", \""PII\"", 17, true, \""Applicant information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n        section.redactLineAfter(\""Tel:\"", \""PII\"", 17, true, \""Applicant information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n        section.redactLineAfter(\""E-mail:\"", \""PII\"", 17, true, \""Applicant information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n        section.redactLineAfter(\""Email:\"", \""PII\"", 17, true, \""Applicant information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n        section.redactLineAfter(\""e-mail:\"", \""PII\"", 17, true, \""Applicant information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n        section.redactLineAfter(\""E-mail address:\"", \""PII\"", 17, true, \""Applicant information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n        section.redactLineAfter(\""Contact:\"", \""PII\"", 17, true, \""Applicant information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n        section.redactLineAfter(\""Alternative contact:\"", \""PII\"", 17, true, \""Applicant information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n        section.redactLineAfter(\""Telephone number:\"", \""PII\"", 17, true, \""Applicant information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n        section.redactLineAfter(\""Telephone No:\"", \""PII\"", 17, true, \""Applicant information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n        section.redactLineAfter(\""Fax number:\"", \""PII\"", 17, true, \""Applicant information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n        section.redactLineAfter(\""Telephone:\"", \""PII\"", 17, true, \""Applicant information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n        section.redactBetween(\""No:\"", \""Fax\"", \""PII\"", 17, true, \""Applicant information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n        section.redactBetween(\""Contact:\"", \""Tel.:\"", \""PII\"", 17, true, \""Applicant information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n        section.redactLineAfter(\""European contact:\"",  \""PII\"", 17, true, \""Applicant information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n    end""",[PII.7.0]
+76,"""18: Do not redact Names and Addresses if Published Information found""","""\n    when\n        Section(matchesType(\""published_information\""))\n    then\n        section.redactNotAndReference(\""CBI_author\"",\""published_information\"", 18, \""Published Information found\"");\n        section.redactNotAndReference(\""CBI_address\"",\""published_information\"", 18, \""Published Information found\"");\n    end""",[CBI.7.0]
+77,"""18: Redact contact information if Producer is found""","""\n    when\n        Section(text.toLowerCase().contains(\""producer of the plant protection\"") || text.toLowerCase().contains(\""producer of the active substance\"") || text.contains(\""Manufacturer of the active substance\"") || text.contains(\""Manufacturer:\"") || text.contains(\""Producer or producers of the active substance\""))\n    then\n        section.redactLineAfter(\""Contact:\"", \""PII\"", 18, true, \""Producer was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n        section.redactLineAfter(\""Telephone:\"", \""PII\"", 18, true, \""Producer was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n        section.redactLineAfter(\""Phone:\"", \""PII\"", 18, true, \""Producer was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n        section.redactLineAfter(\""Fax:\"", \""PII\"", 18, true, \""Producer was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n        section.redactLineAfter(\""E-mail:\"", \""PII\"", 18, true, \""Producer was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n        section.redactLineAfter(\""Contact:\"", \""PII\"", 18, true, \""Producer was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n        section.redactLineAfter(\""Fax number:\"", \""PII\"", 18, true, \""Producer was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n        section.redactLineAfter(\""Telephone number:\"", \""PII\"", 18, true, \""Producer was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n        section.redactLineAfter(\""Tel:\"", \""PII\"", 18, true, \""Producer was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n        section.redactBetween(\""No:\"", \""Fax\"", \""PII\"", 18, true, \""Producer was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n    end""",[PII.8.0]
+78,"""18: Redact contact information""","""\n    when\n       Section(text.contains(\""Contact point:\"")\n       || text.contains(\""Phone:\"")\n       || text.contains(\""Fax:\"")\n       || text.contains(\""Tel.:\"")\n       || text.contains(\""Tel:\"")\n       || text.contains(\""E-mail:\"")\n       || text.contains(\""Email:\"")\n       || text.contains(\""e-mail:\"")\n       || text.contains(\""E-mail address:\"")\n       || text.contains(\""Alternative contact:\"")\n       || text.contains(\""Telephone number:\"")\n       || text.contains(\""Telephone No:\"")\n       || text.contains(\""Fax number:\"")\n       || text.contains(\""Telephone:\"")\n       || text.contains(\""Phone No.\"")\n       || text.contains(\""European contact:\""))\n    then\n          section.redactLineAfter(\""Contact point:\"", \""PII\"", 18, true, \""Contact information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n              section.redactLineAfter(\""Phone:\"", \""PII\"", 18, true, \""Contact information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n              section.redactLineAfter(\""Fax:\"", \""PII\"", 18, true, \""Contact information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n              section.redactLineAfter(\""Tel.:\"", \""PII\"", 18, true, \""Contact information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n              section.redactLineAfter(\""Tel:\"", \""PII\"", 18, true, \""Contact information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n              section.redactLineAfter(\""E-mail:\"", \""PII\"", 18, true, \""Contact information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n              section.redactLineAfter(\""Email:\"", \""PII\"", 18, true, \""Contact information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n              section.redactLineAfter(\""e-mail:\"", \""PII\"", 18, true, \""Contact information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n              section.redactLineAfter(\""E-mail address:\"", \""PII\"", 18, true, \""Contact information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n              section.redactLineAfter(\""Contact:\"", \""PII\"", 18, true, \""Contact information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n              section.redactLineAfter(\""Alternative contact:\"", \""PII\"", 18, true, \""Contact information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n              section.redactLineAfter(\""Telephone number:\"", \""PII\"", 18, true, \""Contact information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n              section.redactLineAfter(\""Telephone No:\"", \""PII\"", 18, true, \""Contact information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n              section.redactLineAfter(\""Fax number:\"", \""PII\"", 18, true, \""Contact information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n              section.redactLineAfter(\""Telephone:\"", \""PII\"", 18, true, \""Contact information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n              section.redactLineAfter(\""Phone No.\"", \""PII\"", 18, true, \""Contact information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n              section.redactBetween(\""No:\"", \""Fax\"", \""PII\"", 18, true, \""Contact information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n              section.redactBetween(\""Contact:\"", \""Tel.:\"", \""PII\"", 18, true, \""Contact information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n              section.redactLineAfter(\""European contact:\"",  \""PII\"", 18, true, \""Contact information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n     end""","[PII.4.0, PII.4.1, PII.6.0, PII.6.1]"
+79,"""19: Redact contact information if applicant is found""","""\n    when\n        Section(headlineContainsWord(\""applicant\"") || text.contains(\""Applicant\"") || headlineContainsWord(\""Primary contact\"") || headlineContainsWord(\""Alternative contact\"") || text.contains(\""Telephone number:\""))\n    then\n        section.redactLineAfter(\""Contact point:\"", \""PII\"", 19, true, \""Applicant information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n        section.redactLineAfter(\""Phone:\"", \""PII\"", 19, true, \""Applicant information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n        section.redactLineAfter(\""Fax:\"", \""PII\"", 19, true, \""Applicant information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n        section.redactLineAfter(\""Tel.:\"", \""PII\"", 19, true, \""Applicant information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n        section.redactLineAfter(\""Tel:\"", \""PII\"", 19, true, \""Applicant information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n        section.redactLineAfter(\""E-mail:\"", \""PII\"", 19, true, \""Applicant information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n        section.redactLineAfter(\""Email:\"", \""PII\"", 19, true, \""Applicant information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n        section.redactLineAfter(\""e-mail:\"", \""PII\"", 19, true, \""Applicant information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n        section.redactLineAfter(\""E-mail address:\"", \""PII\"", 19, true, \""Applicant information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n        section.redactLineAfter(\""Contact:\"", \""PII\"", 19, true, \""Applicant information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n        section.redactLineAfter(\""Alternative contact:\"", \""PII\"", 19, true, \""Applicant information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n        section.redactLineAfter(\""Telephone number:\"", \""PII\"", 19, true, \""Applicant information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n        section.redactLineAfter(\""Telephone No:\"", \""PII\"", 19, true, \""Applicant information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n        section.redactLineAfter(\""Fax number:\"", \""PII\"", 19, true, \""Applicant information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n        section.redactLineAfter(\""Telephone:\"", \""PII\"", 19, true, \""Applicant information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n        section.redactLineAfter(\""Phone No.\"", \""PII\"", 19, true, \""Applicant information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n        section.redactBetween(\""No:\"", \""Fax\"", \""PII\"", 19, true, \""Applicant information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n        section.redactBetween(\""Contact:\"", \""Tel.:\"", \""PII\"", 19, true, \""Applicant information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n        section.redactLineAfter(\""European contact:\"",  \""PII\"", 19, true, \""Applicant information was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n    end""",[PII.7.0]
+80,"""19: Redact AUTHOR(S)""","""\n    when\n        Section(searchText.contains(\""AUTHOR(S):\""))\n    then\n        section.redactLinesBetween(\""AUTHOR(S):\"", \""COMPLETION DATE:\"", \""PII\"", 19, true, \""AUTHOR(S) was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n    end""","[PII.9.0, PII.9.1]"
+81,"""19: Redacted PII Personal Identification Information (Non vertebrate study)""","""\n    when\n        Section(!fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && matchesType(\""PII\""))\n    then\n        section.redact(\""PII\"", 19, \""PII (Personal Identification Information) found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n    end""",[PII.0.0]
+82,"""19: Redacted PII Personal Identification Information (Non vertebrate study)""","""\n    when\n        Section(!fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && matchesType(\""PII\""))\n    then\n        section.redact(\""PII\"", 19, \""Personal information found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n    end""",[PII.0.0]
+83,"""19: Do not redact Names and Addresses if Published Information found""","""\n    when\n        Section(matchesType(\""published_information\""))\n    then\n        section.redactNotAndReference(\""CBI_author\"",\""published_information\"", 19, \""Published Information found\"");\n        section.redactNotAndReference(\""CBI_address\"",\""published_information\"", 19, \""Published Information found\"");\n    end""",[CBI.7.0]
+84,"""20: Redact contact information if Producer is found""","""\n    when\n        Section(text.toLowerCase().contains(\""producer of the plant protection\"") || text.toLowerCase().contains(\""producer of the active substance\"") || text.contains(\""Manufacturer of the active substance\"") || text.contains(\""Manufacturer:\"") || text.contains(\""Producer or producers of the active substance\""))\n    then\n        section.redactLineAfter(\""Contact:\"", \""PII\"", 20, true, \""Producer was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n        section.redactLineAfter(\""Telephone:\"", \""PII\"", 20, true, \""Producer was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n        section.redactLineAfter(\""Phone:\"", \""PII\"", 20, true, \""Producer was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n        section.redactLineAfter(\""Fax:\"", \""PII\"", 20, true, \""Producer was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n        section.redactLineAfter(\""E-mail:\"", \""PII\"", 20, true, \""Producer was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n        section.redactLineAfter(\""Contact:\"", \""PII\"", 20, true, \""Producer was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n        section.redactLineAfter(\""Fax number:\"", \""PII\"", 20, true, \""Producer was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n        section.redactLineAfter(\""Telephone number:\"", \""PII\"", 20, true, \""Producer was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n        section.redactLineAfter(\""Tel:\"", \""PII\"", 20, true, \""Producer was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n        section.redactLineAfter(\""Phone No.\"", \""PII\"", 20, true, \""Producer was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n        section.redactBetween(\""No:\"", \""Fax\"", \""PII\"", 20, true, \""Producer was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n    end""",[PII.8.0]
+85,"""20: Redact PERFORMING LABORATORY""","""\n    when\n        Section(searchText.contains(\""PERFORMING LABORATORY:\""))\n    then\n        section.redactBetween(\""PERFORMING LABORATORY:\"", \""LABORATORY PROJECT ID:\"", \""PII\"", 20, true, \""PERFORMING LABORATORY was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n    end""","[CBI.20.0, CBI.20.1]"
+86,"""20: Redacted PII Personal Identification Information (Vertebrate study)""","""\n    when\n        Section(fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && matchesType(\""PII\""))\n    then\n        section.redact(\""PII\"", 20, \""Personal information found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n    end""",[PII.0.1]
+87,"""20: Redacted PII Personal Identification Information (Vertebrate study)""","""\n    when\n        Section(fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && matchesType(\""PII\""))\n    then\n        section.redact(\""PII\"", 20, \""PII (Personal Identification Information) found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n    end""",[PII.0.1]
+88,"""21: Redact Emails by RegEx (Non vertebrate study)""","""\n    when\n        Section(!fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && searchText.contains(\""@\""))\n    then\n        section.redactByRegEx(\""\\\\b[A-Z0-9._%+-]+@[A-Z0-9.-]+\\\\.[A-Z]{2,4}\\\\b\"", true, 0, \""PII\"", 21, \""PII (Personal Identification Information) found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n    end""",[PII.1.0]
+89,"""21: Redact Emails by RegEx (Non vertebrate study)""","""\n    when\n        Section(!fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && searchText.contains(\""@\""))\n    then\n        section.redactByRegEx(\""\\\\b([A-Za-z0-9._%+\\\\-]+@[A-Za-z0-9.\\\\-]+\\\\.[A-Za-z\\\\-]{1,23}[A-Za-z])\\\\b\"", true, 1, \""PII\"", 21, \""Personal information found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n    end""",[PII.1.0]
+90,"""21: Redact On behalf of Sequani Ltd.:""","""\n    when\n        Section(searchText.contains(\""On behalf of Sequani Ltd.: Name Title\""))\n    then\n        section.redactBetween(\""On behalf of Sequani Ltd.: Name Title\"", \""On behalf of\"", \""PII\"", 21, false , \""PII (Personal Identification Information) found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n    end""",[PII.11.0]
+91,"""21: Redact AUTHOR(S)""","""\n    when\n        Section(searchText.contains(\""AUTHOR(S):\""))\n    then\n        section.redactLinesBetween(\""AUTHOR(S):\"", \""COMPLETION DATE:\"", \""PII\"", 21, true, \""AUTHOR(S) was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n    end""","[PII.9.0, PII.9.1]"
+92,"""22: Redact Emails by RegEx (Vertebrate study)""","""\n    when\n        Section(fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && searchText.contains(\""@\""))\n    then\n        section.redactByRegEx(\""\\\\b[A-Z0-9._%+-]+@[A-Z0-9.-]+\\\\.[A-Z]{2,4}\\\\b\"", true, 0, \""PII\"", 22, \""PII (Personal Identification Information) found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n    end""",[PII.1.1]
+93,"""22: Redact Emails by RegEx (Vertebrate study)""","""\n    when\n        Section(fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && searchText.contains(\""@\""))\n    then\n        section.redactByRegEx(\""\\\\b([A-Za-z0-9._%+\\\\-]+@[A-Za-z0-9.\\\\-]+\\\\.[A-Za-z\\\\-]{1,23}[A-Za-z])\\\\b\"", true, 1, \""PII\"", 22, \""Personal information found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n    end""",[PII.1.1]
+94,"""22: Redact PERFORMING LABORATORY""","""\n    when\n        Section(searchText.contains(\""PERFORMING LABORATORY:\""))\n    then\n        section.redactBetween(\""PERFORMING LABORATORY:\"", \""LABORATORY PROJECT ID:\"", \""PII\"", 22, true, \""PERFORMING LABORATORY was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n    end""","[CBI.20.0, CBI.20.1]"
+95,"""22: Redact On behalf of Syngenta Ltd.:""","""\n    when\n        Section(searchText.contains(\""On behalf of Syngenta Ltd.: Name Title\""))\n    then\n        section.redactBetween(\""On behalf of Syngenta Ltd.: Name Title\"", \""Study dates\"", \""PII\"", 22, false , \""PII (Personal Identification Information) found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n    end""",[PII.11.0]
+96,"""23: Redact contact information (Non vertebrate study)""","""\n    when\n       Section(!fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && (text.contains(\""Contact point:\"")\n       || text.contains(\""Phone:\"")\n       || text.contains(\""Fax:\"")\n       || text.contains(\""Tel.:\"")\n       || text.contains(\""Tel:\"")\n       || text.contains(\""E-mail:\"")\n       || text.contains(\""Email:\"")\n       || text.contains(\""e-mail:\"")\n       || text.contains(\""E-mail address:\"")\n       || text.contains(\""Alternative contact:\"")\n       || text.contains(\""Telephone number:\"")\n       || text.contains(\""Telephone No:\"")\n       || text.contains(\""Fax number:\"")\n       || text.contains(\""Telephone:\"")\n       || text.contains(\""Phone No.\"")\n       || text.contains(\""European contact:\"")))\n    then\n          section.redactLineAfter(\""Contact point:\"", \""PII\"", 23, true, \""Contact information was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""Phone:\"", \""PII\"", 23, true, \""Contact information was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""Fax:\"", \""PII\"", 23, true, \""Contact information was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""Tel.:\"", \""PII\"", 23, true, \""Contact information was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""Tel:\"", \""PII\"", 23, true, \""Contact information was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""E-mail:\"", \""PII\"", 23, true, \""Contact information was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""Email:\"", \""PII\"", 23, true, \""Contact information was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""e-mail:\"", \""PII\"", 23, true, \""Contact information was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""E-mail address:\"", \""PII\"", 23, true, \""Contact information was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""Contact:\"", \""PII\"", 23, true, \""Contact information was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""Alternative contact:\"", \""PII\"", 23, true, \""Contact information was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""Telephone number:\"", \""PII\"", 23, true, \""Contact information was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""Telephone No:\"", \""PII\"", 23, true, \""Contact information was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""Fax number:\"", \""PII\"", 23, true, \""Contact information was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""Telephone:\"", \""PII\"", 23, true, \""Contact information was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""Phone No.\"", \""PII\"", 23, true, \""Contact information was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n              section.redactBetween(\""No:\"", \""Fax\"", \""PII\"", 23, true, \""Contact information was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n              section.redactBetween(\""Contact:\"", \""Tel.:\"", \""PII\"", 23, true, \""Contact information was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""European contact:\"",  \""PII\"", 23, true, \""Contact information was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n     end""","[PII.5.0, PII.6.0]"
+97,"""23: Redact contact information (Non vertebrate study)""","""\n    when\n       Section(!fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && (text.contains(\""Contact point:\"")\n            || text.contains(\""Contact:\"")\n            || text.contains(\""Alternative contact:\"")\n            || (text.contains(\""No:\"") && text.contains(\""Fax\""))\n            || (text.contains(\""Contact:\"") && text.contains(\""Tel.:\""))\n            || text.contains(\""European contact:\"")\n        ))\n    then\n        section.redactLineAfter(\""Contact point:\"", \""PII\"", 23, true, \""Personal information found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""Contact:\"", \""PII\"", 23, true, \""Personal information found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""Alternative contact:\"", \""PII\"", 23, true, \""Personal information found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n        section.redactBetween(\""No:\"", \""Fax\"", \""PII\"", 23, true, \""Personal information found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n        section.redactBetween(\""Contact:\"", \""Tel.:\"", \""PII\"", 23, true, \""Personal information found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""European contact:\"",  \""PII\"", 23, true, \""Personal information found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n     end""","[PII.4.0, PII.6.0]"
+98,"""24: Redact contact information (Vertebrate study)""","""\n    when\n       Section(fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && (text.contains(\""Contact point:\"")\n            || text.contains(\""Contact:\"")\n            || text.contains(\""Alternative contact:\"")\n            || (text.contains(\""No:\"") && text.contains(\""Fax\""))\n            || (text.contains(\""Contact:\"") && text.contains(\""Tel.:\""))\n            || text.contains(\""European contact:\"")\n        ))\n    then\n        section.redactLineAfter(\""Contact point:\"", \""PII\"", 24, true, \""Personal information found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""Contact:\"", \""PII\"", 24, true, \""Personal information found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""Alternative contact:\"", \""PII\"", 24, true, \""Personal information found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactBetween(\""No:\"", \""Fax\"", \""PII\"", 24, true, \""Personal information found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactBetween(\""Contact:\"", \""Tel.:\"", \""PII\"", 24, true, \""Personal information found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""European contact:\"",  \""PII\"", 24, true, \""Personal information found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n     end""","[PII.5.1, PII.6.1]"
+99,"""24: Redact contact information (Vertebrate study)""","""\n    when\n       Section(fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && (text.contains(\""Contact point:\"")\n       || text.contains(\""Phone:\"")\n       || text.contains(\""Fax:\"")\n       || text.contains(\""Tel.:\"")\n       || text.contains(\""Tel:\"")\n       || text.contains(\""E-mail:\"")\n       || text.contains(\""Email:\"")\n       || text.contains(\""e-mail:\"")\n       || text.contains(\""E-mail address:\"")\n       || text.contains(\""Alternative contact:\"")\n       || text.contains(\""Telephone number:\"")\n       || text.contains(\""Telephone No:\"")\n       || text.contains(\""Fax number:\"")\n       || text.contains(\""Telephone:\"")\n       || text.contains(\""Phone No.\"")\n       || text.contains(\""European contact:\"")))\n    then\n          section.redactLineAfter(\""Contact point:\"", \""PII\"", 24, true, \""Contact information was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""Phone:\"", \""PII\"", 24, true, \""Contact information was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""Fax:\"", \""PII\"", 24, true, \""Contact information was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""Tel.:\"", \""PII\"", 24, true, \""Contact information was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""Tel:\"", \""PII\"", 24, true, \""Contact information was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""E-mail:\"", \""PII\"", 24, true, \""Contact information was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""Email:\"", \""PII\"", 24, true, \""Contact information was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""e-mail:\"", \""PII\"", 24, true, \""Contact information was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""E-mail address:\"", \""PII\"", 24, true, \""Contact information was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""Contact:\"", \""PII\"", 24, true, \""Contact information was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""Alternative contact:\"", \""PII\"", 24, true, \""Contact information was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""Telephone number:\"", \""PII\"", 24, true, \""Contact information was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""Telephone No:\"", \""PII\"", 24, true, \""Contact information was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""Fax number:\"", \""PII\"", 24, true, \""Contact information was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""Telephone:\"", \""PII\"", 24, true, \""Contact information was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""Phone No.\"", \""PII\"", 24, true, \""Contact information was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n              section.redactBetween(\""No:\"", \""Fax\"", \""PII\"", 24, true, \""Contact information was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n              section.redactBetween(\""Contact:\"", \""Tel.:\"", \""PII\"", 24, true, \""Contact information was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""European contact:\"",  \""PII\"", 24, true, \""Contact information was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n     end""","[PII.4.1, PII.6.1]"
+100,"""25: Redact Phone and Fax by RegEx""","""\n    when\n        Section(!fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && (\n               text.contains(\""Contact\"")\n            || text.contains(\""Telephone\"")\n            || text.contains(\""Phone\"")\n            || text.contains(\""Ph.\"")\n            || text.contains(\""Fax\"")\n            || text.contains(\""Tel\"")\n            || text.contains(\""Ter\"")\n            || text.contains(\""Cell\"")\n            || text.contains(\""Mobile\"")\n            || text.contains(\""Fel\"")\n            || text.contains(\""Fer\"")\n        ))\n    then\n        section.redactByRegEx(\""\\\\b(contact|telephone|phone|fax|tel|ter|cell|mobile|fel|fer)[a-zA-Z\\\\s]{0,10}[:.\\\\s]{0,3}([\\\\+\\\\d\\\\(][\\\\s\\\\d\\\\(\\\\)\\\\-\\\\/\\\\.]{4,100}\\\\d)\\\\b\"", true, 2, \""PII\"", 25, \""Personal information found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n    end""",[PII.2.0]
+101,"""25: Redact Phone and Fax by RegEx (Non vertebrate study)""","""\n    when\n        Section(!fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && (\n               text.contains(\""Contact\"")\n            || text.contains(\""Telephone\"")\n            || text.contains(\""Phone\"")\n            || text.contains(\""Fax\"")\n            || text.contains(\""Tel\"")\n            || text.contains(\""Ter\"")\n            || text.contains(\""Mobile\"")\n            || text.contains(\""Fel\"")\n            || text.contains(\""Fer\"")\n        ))\n    then\n        section.redactByRegEx(\""\\\\b(contact|telephone|phone|fax|tel|ter|mobile|fel|fer)[a-zA-Z\\\\s]{0,10}[:.\\\\s]{0,3}([\\\\+\\\\d\\\\(][\\\\s\\\\d\\\\(\\\\)\\\\-\\\\/\\\\.]{4,100}\\\\d)\\\\b\"", true, 2, \""PII\"", 25, \""Personal information found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n    end""",[PII.2.0]
+102,"""25: Redact contact information if applicant is found (Non vertebrate study)""","""\n    when\n        Section(!fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && (headlineContainsWord(\""applicant\"") || text.contains(\""Applicant\"") || headlineContainsWord(\""Primary contact\"") || headlineContainsWord(\""Alternative contact\"") || text.contains(\""Telephone number:\"")))\n    then\n        section.redactLineAfter(\""Contact point:\"", \""PII\"", 25, true, \""Applicant information was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""Phone:\"", \""PII\"", 25, true, \""Applicant information was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""Fax:\"", \""PII\"", 25, true, \""Applicant information was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""Tel.:\"", \""PII\"", 25, true, \""Applicant information was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""Tel:\"", \""PII\"", 25, true, \""Applicant information was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""E-mail:\"", \""PII\"", 25, true, \""Applicant information was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""Email:\"", \""PII\"", 25, true, \""Applicant information was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""e-mail:\"", \""PII\"", 25, true, \""Applicant information was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""E-mail address:\"", \""PII\"", 25, true, \""Applicant information was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""Contact:\"", \""PII\"", 25, true, \""Applicant information was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""Alternative contact:\"", \""PII\"", 25, true, \""Applicant information was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""Telephone number:\"", \""PII\"", 25, true, \""Applicant information was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""Telephone No:\"", \""PII\"", 25, true, \""Applicant information was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""Fax number:\"", \""PII\"", 25, true, \""Applicant information was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""Telephone:\"", \""PII\"", 25, true, \""Applicant information was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""Phone No.\"", \""PII\"", 25, true, \""Applicant information was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n        section.redactBetween(\""No:\"", \""Fax\"", \""PII\"", 25, true, \""Applicant information was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n        section.redactBetween(\""Contact:\"", \""Tel.:\"", \""PII\"", 25, true, \""Applicant information was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""European contact:\"",  \""PII\"", 25, true, \""Applicant information was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n    end""",[PII.7.0]
+103,"""33: Purity Hint, 34: Purity Hint, 50: Purity Hint, 25: Purity Hint, 39: Purity Hint""","""\n    when\n        Section(searchText.toLowerCase().contains(\""purity\""))\n    then\n\t    section.addHintAnnotationByRegEx(\""(purity ?( of|\\\\(.{1,20}\\\\))?( ?:)?) .{0,5}[\\\\d\\\\.]+( .{0,4}\\\\.)? ?%\"", true, 1, \""hint_only\"");\n    end""",[ETC.0.0]
+104,"""25: Redact Purity""","""\n    when\n        Section(searchText.contains(\""purity\""))\n    then\n\t    section.redactByRegEx(\""purity ?:? (([\\\\d\\\\.]+)( .{0,4}\\\\.)? ?%)\"", true, 1, \""purity\"", 17, \""Purity found\"", \""Reg (EC) No 1107/2009 Art. 63 (2a)\"");\n    end""",[ETC.1.0]
+105,"""26: Redact Phone and Fax by RegEx (Vertebrate study)""","""\n    when\n        Section(fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && (\n               text.contains(\""Contact\"")\n            || text.contains(\""Telephone\"")\n            || text.contains(\""Phone\"")\n            || text.contains(\""Ph.\"")\n            || text.contains(\""Fax\"")\n            || text.contains(\""Tel\"")\n            || text.contains(\""Ter\"")\n            || text.contains(\""Cell\"")\n            || text.contains(\""Mobile\"")\n            || text.contains(\""Fel\"")\n            || text.contains(\""Fer\"")\n        ))\n    then\n        section.redactByRegEx(\""\\\\b(contact|telephone|phone|fax|tel|ter|cell|mobile|fel|fer)[a-zA-Z\\\\s]{0,10}[:.\\\\s]{0,3}([\\\\+\\\\d\\\\(][\\\\s\\\\d\\\\(\\\\)\\\\-\\\\/\\\\.]{4,100}\\\\d)\\\\b\"", true, 2, \""PII\"", 26, \""Personal information found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n    end""",[PII.2.1]
+106,"""26: Redact contact information if applicant is found (Vertebrate study)""","""\n    when\n        Section(fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && (headlineContainsWord(\""applicant\"") || text.contains(\""Applicant\"") || headlineContainsWord(\""Primary contact\"") || headlineContainsWord(\""Alternative contact\"") || text.contains(\""Telephone number:\"")))\n    then\n        section.redactLineAfter(\""Contact point:\"", \""PII\"", 26, true, \""Applicant information was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""Phone:\"", \""PII\"", 26, true, \""Applicant information was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""Fax:\"", \""PII\"", 26, true, \""Applicant information was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""Tel.:\"", \""PII\"", 26, true, \""Applicant information was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""Tel:\"", \""PII\"", 26, true, \""Applicant information was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""E-mail:\"", \""PII\"", 26, true, \""Applicant information was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""Email:\"", \""PII\"", 26, true, \""Applicant information was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""e-mail:\"", \""PII\"", 26, true, \""Applicant information was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""E-mail address:\"", \""PII\"", 26, true, \""Applicant information was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""Contact:\"", \""PII\"", 26, true, \""Applicant information was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""Alternative contact:\"", \""PII\"", 26, true, \""Applicant information was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""Telephone number:\"", \""PII\"", 26, true, \""Applicant information was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""Telephone No:\"", \""PII\"", 26, true, \""Applicant information was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""Fax number:\"", \""PII\"", 26, true, \""Applicant information was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""Telephone:\"", \""PII\"", 26, true, \""Applicant information was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""Phone No.\"", \""PII\"", 26, true, \""Applicant information was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactBetween(\""No:\"", \""Fax\"", \""PII\"", 26, true, \""Applicant information was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactBetween(\""Contact:\"", \""Tel.:\"", \""PII\"", 26, true, \""Applicant information was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""European contact:\"",  \""PII\"", 26, true, \""Applicant information was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n    end""",[PII.7.0]
+107,"""26: Redact signatures""","""\n    when\n        Section(matchesImageType(\""signature\""))\n    then\n        section.redactImage(\""signature\"", 26, \""Signature found\"", \""Reg (EC) No 1107/2009 Art. 63 (2g)\"");\n    end""",[ETC.2.0]
+108,"""26: Redact Phone and Fax by RegEx (Vertebrate study)""","""\n    when\n        Section(fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && (\n               text.contains(\""Contact\"")\n            || text.contains(\""Telephone\"")\n            || text.contains(\""Phone\"")\n            || text.contains(\""Fax\"")\n            || text.contains(\""Tel\"")\n            || text.contains(\""Ter\"")\n            || text.contains(\""Mobile\"")\n            || text.contains(\""Fel\"")\n            || text.contains(\""Fer\"")\n        ))\n    then\n        section.redactByRegEx(\""\\\\b(contact|telephone|phone|fax|tel|ter|mobile|fel|fer)[a-zA-Z\\\\s]{0,10}[:.\\\\s]{0,3}([\\\\+\\\\d\\\\(][\\\\s\\\\d\\\\(\\\\)\\\\-\\\\/\\\\.]{4,100}\\\\d)\\\\b\"", true, 2, \""PII\"", 26, \""Personal information found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n    end""",[PII.2.1]
+109,"""27: Redact AUTHOR(S) (Non vertebrate study)""","""\n    when\n        Section(!fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"")\n            && searchText.contains(\""AUTHOR(S):\"")\n            && searchText.contains(\""COMPLETION DATE:\"")\n            && !searchText.contains(\""STUDY COMPLETION DATE:\"")\n        )\n    then\n        section.redactLinesBetween(\""AUTHOR(S):\"", \""COMPLETION DATE:\"", \""PII\"", 27, true, \""Author found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n    end""",[PII.9.0]
+110,"""27: Redact Logos""","""\n    when\n        Section(matchesImageType(\""logo\""))\n    then\n        section.redactImage(\""logo\"", 27, \""Logo found\"", \""Reg (EC) No 1107/2009 Art. 63 (2g)\"");\n    end""",[ETC.3.0]
+111,"""27: Redact contact information if Producer is found (Non vertebrate study)""","""\n    when\n        Section(!fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && (text.toLowerCase().contains(\""producer of the plant protection\"") || text.toLowerCase().contains(\""producer of the active substance\"") || text.contains(\""Manufacturer of the active substance\"") || text.contains(\""Manufacturer:\"") || text.contains(\""Producer or producers of the active substance\"")))\n    then\n        section.redactLineAfter(\""Contact:\"", \""PII\"", 27, true, \""Producer was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""Telephone:\"", \""PII\"", 27, true, \""Producer was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""Phone:\"", \""PII\"", 27, true, \""Producer was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""Fax:\"", \""PII\"", 27, true, \""Producer was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""E-mail:\"", \""PII\"", 27, true, \""Producer was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""Contact:\"", \""PII\"", 27, true, \""Producer was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""Fax number:\"", \""PII\"", 27, true, \""Producer was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""Telephone number:\"", \""PII\"", 27, true, \""Producer was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""Tel:\"", \""PII\"", 27, true, \""Producer was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""Phone No.\"", \""PII\"", 27, true, \""Producer was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n        section.redactBetween(\""No:\"", \""Fax\"", \""PII\"", 27, true, \""Producer was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n    end""",[PII.8.0]
+112,"""28: Redact contact information if Producer is found (Vertebrate study)""","""\n    when\n        Section(fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && (text.toLowerCase().contains(\""producer of the plant protection\"") || text.toLowerCase().contains(\""producer of the active substance\"") || text.contains(\""Manufacturer of the active substance\"") || text.contains(\""Manufacturer:\"") || text.contains(\""Producer or producers of the active substance\"")))\n    then\n        section.redactLineAfter(\""Contact:\"", \""PII\"", 28, true, \""Producer was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""Telephone:\"", \""PII\"", 28, true, \""Producer was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""Phone:\"", \""PII\"", 28, true, \""Producer was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""Fax:\"", \""PII\"", 28, true, \""Producer was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""E-mail:\"", \""PII\"", 28, true, \""Producer was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""Contact:\"", \""PII\"", 28, true, \""Producer was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""Fax number:\"", \""PII\"", 28, true, \""Producer was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""Telephone number:\"", \""PII\"", 28, true, \""Producer was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""Tel:\"", \""PII\"", 28, true, \""Producer was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""Phone No.\"", \""PII\"", 28, true, \""Producer was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactBetween(\""No:\"", \""Fax\"", \""PII\"", 28, true, \""Producer was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n    end""",[PII.8.0]
+113,"""28: Redact AUTHOR(S) (Vertebrate study)""","""\n    when\n        Section(fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"")\n            && searchText.contains(\""AUTHOR(S):\"")\n            && searchText.contains(\""COMPLETION DATE:\"")\n            && !searchText.contains(\""STUDY COMPLETION DATE:\"")\n        )\n    then\n        section.redactLinesBetween(\""AUTHOR(S):\"", \""COMPLETION DATE:\"", \""PII\"", 28, true, \""AUTHOR(S) was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n    end""",[PII.9.0]
+114,"""28: Redact dossier dictionary match""","""\n    when\n        Section(matchesType(\""dossier_redaction\""))\n    then\n        section.redact(\""dossier_redaction\"", 28, \""Specification of impurity found\"", \""Reg (EC) No 1107/2009 Art. 63 (2b)\"");\n    end""","[ETC.4.0, ETC.4.1, ETC.4.2]"
+115,"""29: Redact AUTHOR(S) (Non vertebrate study)""","""\n    when\n        Section(!fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && searchText.contains(\""AUTHOR(S):\"") && searchText.contains(\""COMPLETION DATE:\"") && !searchText.contains(\""STUDY COMPLETION DATE:\""))\n    then\n        section.redactLinesBetween(\""AUTHOR(S):\"", \""COMPLETION DATE:\"", \""PII\"", 29, true, \""AUTHOR(S) was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n    end""",[PII.9.0]
+116,"""34: Ignore dossier_redaction entries if confidentiality is not 'confidential', 51: Ignore dossier_redaction entries if confidential, 29: Ignore dossier_redaction unless confidential, 40: Ignore dossier_redaction entries if confidential""","""\n    when\n        Section(!fileAttributeByLabelEqualsIgnoreCase(\""Confidentiality\"",\""confidential\"") && matchesType(\""dossier_redaction\""));\n    then\n        section.ignore(\""dossier_redaction\"");\n    end""",[ETC.5.0]
+117,"""29: Redact AUTHOR(S) (Non vertebrate study)""","""\n    when\n        Section(!fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"")\n            && searchText.contains(\""AUTHOR(S):\"")\n            && searchText.contains(\""STUDY COMPLETION DATE:\"")\n        )\n    then\n        section.redactLinesBetween(\""AUTHOR(S):\"", \""STUDY COMPLETION DATE:\"", \""PII\"", 29, true, \""AUTHOR(S) was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n    end""",[PII.9.0]
+118,"""30: Redact AUTHOR(S) (Vertebrate study)""","""\n    when\n        Section(fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"")\n            && searchText.contains(\""AUTHOR(S):\"")\n            && searchText.contains(\""STUDY COMPLETION DATE:\"")\n        )\n    then\n        section.redactLinesBetween(\""AUTHOR(S):\"", \""STUDY COMPLETION DATE:\"", \""PII\"", 30, true, \""AUTHOR(S) was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n    end""",[PII.9.1]
+119,"""30: Redacted PII Personal Identification Information (Non vertebrate study)""","""\n    when\n        Section(!fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && matchesType(\""PII\""))\n    then\n        section.redact(\""PII\"", 30, \""PII (Personal Identification Information) found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n    end""",[PII.0.0]
+120,"""30: Redact AUTHOR(S) (Vertebrate study)""","""\n    when\n        Section(fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && searchText.contains(\""AUTHOR(S):\"") && searchText.contains(\""COMPLETION DATE:\"") && !searchText.contains(\""STUDY COMPLETION DATE:\""))\n    then\n        section.redactLinesBetween(\""AUTHOR(S):\"", \""COMPLETION DATE:\"", \""PII\"", 30, true, \""AUTHOR(S) was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n    end""",[PII.9.1]
+121,"""31: Redacted PII Personal Identification Information (Vertebrate study)""","""\n    when\n        Section(fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && matchesType(\""PII\""))\n    then\n        section.redact(\""PII\"", 31, \""PII (Personal Identification Information) found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n    end""",[PII.0.1]
+122,"""31: Redact AUTHOR(S) (Non vertebrate study)""","""\n    when\n        Section(!fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && searchText.contains(\""AUTHOR(S):\"") && searchText.contains(\""STUDY COMPLETION DATE:\""))\n    then\n        section.redactLinesBetween(\""AUTHOR(S):\"", \""STUDY COMPLETION DATE:\"", \""PII\"", 31, true, \""AUTHOR(S) was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n    end""",[PII.9.0]
+123,"""31: Redact PERFORMING LABORATORY (Non vertebrate study)""","""\n    when\n        Section(!fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"")\n            && searchText.contains(\""PERFORMING LABORATORY:\"")\n        )\n    then\n        section.redactBetween(\""PERFORMING LABORATORY:\"", \""LABORATORY PROJECT ID:\"", \""CBI_address\"", 31, true, \""PERFORMING LABORATORY was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n        section.redactNot(\""CBI_address\"", 31, \""Performing laboratory found for non vertebrate study\"");\n    end""",[CBI.20.0]
+124,"""32: Redact PERFORMING LABORATORY (Vertebrate study)""","""\n    when\n        Section(fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"")\n            && searchText.contains(\""PERFORMING LABORATORY:\""))\n    then\n        section.redactBetween(\""PERFORMING LABORATORY:\"", \""LABORATORY PROJECT ID:\"", \""CBI_address\"", 32, true, \""PERFORMING LABORATORY was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n    end""",[CBI.20.1]
+125,"""32: Redact Emails by RegEx (Non vertebrate study)""","""\n    when\n        Section(!fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && searchText.contains(\""@\""))\n    then\n        section.redactByRegEx(\""\\\\b([A-Za-z0-9._%+\\\\-]+@[A-Za-z0-9.\\\\-]+\\\\.[A-Za-z\\\\-]{1,23}[A-Za-z])\\\\b\"", true, 1, \""PII\"", 32, \""PII (Personal Identification Information) found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n    end""",[PII.1.0]
+126,"""32: Redact AUTHOR(S) (Vertebrate study)""","""\n    when\n        Section(fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && searchText.contains(\""AUTHOR(S):\"") && searchText.contains(\""STUDY COMPLETION DATE:\""))\n    then\n        section.redactLinesBetween(\""AUTHOR(S):\"", \""STUDY COMPLETION DATE:\"", \""PII\"", 32, true, \""AUTHOR(S) was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n    end""",[PII.9.1]
+127,"""33: Redact Emails by RegEx (Vertebrate study)""","""\n    when\n        Section(fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && searchText.contains(\""@\""))\n    then\n        section.redactByRegEx(\""\\\\b([A-Za-z0-9._%+\\\\-]+@[A-Za-z0-9.\\\\-]+\\\\.[A-Za-z\\\\-]{1,23}[A-Za-z])\\\\b\"", true, 1, \""PII\"", 33, \""PII (Personal Identification Information) found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n    end""",[PII.1.1]
+128,"""33: Redact study director abbreviation""","""\n    when\n        Section((searchText.contains(\""KATH\"") || searchText.contains(\""BECH\"") || searchText.contains(\""KML\"")))\n    then\n        section.redactWordPartByRegEx(\""((KATH)|(BECH)|(KML)) ?(\\\\d{4})\"", true, 0, 1, \""PII\"", 34, \""Personal information found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n     end""",[PII.10.0]
+129,"""33: Redact PERFORMING LABORATORY (Non vertebrate study)""","""\n    when\n        Section(!fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && searchText.contains(\""PERFORMING LABORATORY:\""))\n    then\n        section.redactBetween(\""PERFORMING LABORATORY:\"", \""LABORATORY PROJECT ID:\"", \""CBI_address\"", 33, true, \""PERFORMING LABORATORY was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n        section.redactNot(\""CBI_address\"", 33, \""Performing laboratory found for non vertebrate study\"");\n    end""",[CBI.20.0]
+130,"""34: Redact PERFORMING LABORATORY (Vertebrate study)""","""\n    when\n        Section(fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && searchText.contains(\""PERFORMING LABORATORY:\""))\n    then\n        section.redactBetween(\""PERFORMING LABORATORY:\"", \""LABORATORY PROJECT ID:\"", \""CBI_address\"", 34, true, \""PERFORMING LABORATORY was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n    end""",[CBI.20.1]
+131,"""34: Redact telephone numbers by RegEx (Non vertebrate study)""","""\n    when\n        Section(!fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && containsRegEx(\""[+]\\\\d{1,}\"", true))\n    then\n        section.redactByRegEx(\""((([+]\\\\d{1,3} (\\\\d{7,12})\\\\b)|([+]\\\\d{1,3}(\\\\d{3,12})\\\\b|[+]\\\\d{1,3}([ -]\\\\(?\\\\d{1,6}\\\\)?){2,4})|[+]\\\\d{1,3} ?((\\\\d{2,6}\\\\)?)([ -]\\\\d{2,6}){1,4}))(-\\\\d{1,3})?\\\\b)\"", true, 1, \""PII\"", 34, \""PII (Personal Identification Information) found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n    end""",[PII.3.0]
+132,"""35: Redact telephone numbers by RegEx (Vertebrate study)""","""\n    when\n        Section(fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && containsRegEx(\""[+]\\\\d{1,}\"", true))\n    then\n        section.redactByRegEx(\""((([+]\\\\d{1,3} (\\\\d{7,12})\\\\b)|([+]\\\\d{1,3}(\\\\d{3,12})\\\\b|[+]\\\\d{1,3}([ -]\\\\(?\\\\d{1,6}\\\\)?){2,4})|[+]\\\\d{1,3} ?((\\\\d{2,6}\\\\)?)([ -]\\\\d{2,6}){1,4}))(-\\\\d{1,3})?\\\\b)\"", true, 1, \""PII\"", 35, \""PII (Personal Identification Information) found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n    end""",[PII.3.1]
+133,"""35: Redact signatures (Non vertebrate study)""","""\n    when\n        Section(!fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && matchesImageType(\""signature\""))\n    then\n        section.redactImage(\""signature\"", 35, \""Signature found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n    end""",[ETC.2.0]
+134,"""36: Redact signatures (Vertebrate study)""","""\n    when\n        Section(fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && matchesImageType(\""signature\""))\n    then\n        section.redactImage(\""signature\"", 36, \""Signature found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n    end""",[ETC.2.0]
+135,"""37: Redact contact information (Non vertebrate study)""","""\n    when\n       Section(!fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && (text.contains(\""Contact point:\"")\n       || text.contains(\""Phone:\"")\n       || text.contains(\""Fax:\"")\n       || text.contains(\""Tel.:\"")\n       || text.contains(\""Tel:\"")\n       || text.contains(\""E-mail:\"")\n       || text.contains(\""Email:\"")\n       || text.contains(\""e-mail:\"")\n       || text.contains(\""E-mail address:\"")\n       || text.contains(\""Alternative contact:\"")\n       || text.contains(\""Telephone number:\"")\n       || text.contains(\""Telephone No:\"")\n       || text.contains(\""Fax number:\"")\n       || text.contains(\""Telephone:\"")\n       || text.contains(\""Phone No.\"")\n       || text.contains(\""European contact:\"")))\n    then\n          section.redactLineAfter(\""Contact point:\"", \""PII\"", 37, true, \""Contact information was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""Phone:\"", \""PII\"", 37, true, \""Contact information was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""Fax:\"", \""PII\"", 37, true, \""Contact information was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""Tel.:\"", \""PII\"", 37, true, \""Contact information was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""Tel:\"", \""PII\"", 37, true, \""Contact information was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""E-mail:\"", \""PII\"", 37, true, \""Contact information was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""Email:\"", \""PII\"", 37, true, \""Contact information was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""e-mail:\"", \""PII\"", 37, true, \""Contact information was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""E-mail address:\"", \""PII\"", 37, true, \""Contact information was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""Contact:\"", \""PII\"", 37, true, \""Contact information was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""Alternative contact:\"", \""PII\"", 37, true, \""Contact information was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""Telephone number:\"", \""PII\"", 37, true, \""Contact information was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""Telephone No:\"", \""PII\"", 37, true, \""Contact information was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""Fax number:\"", \""PII\"", 37, true, \""Contact information was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""Telephone:\"", \""PII\"", 37, true, \""Contact information was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""Phone No.\"", \""PII\"", 37, true, \""Contact information was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n              section.redactBetween(\""No:\"", \""Fax\"", \""PII\"", 37, true, \""Contact information was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n              section.redactBetween(\""Contact:\"", \""Tel.:\"", \""PII\"", 37, true, \""Contact information was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""European contact:\"",  \""PII\"", 37, true, \""Contact information was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n     end""","[PII.4.0, PII.6.0]"
+136,"""38: Redact contact information (Vertebrate study)""","""\n    when\n       Section(fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && (text.contains(\""Contact point:\"")\n       || text.contains(\""Phone:\"")\n       || text.contains(\""Fax:\"")\n       || text.contains(\""Tel.:\"")\n       || text.contains(\""Tel:\"")\n       || text.contains(\""E-mail:\"")\n       || text.contains(\""Email:\"")\n       || text.contains(\""e-mail:\"")\n       || text.contains(\""E-mail address:\"")\n       || text.contains(\""Alternative contact:\"")\n       || text.contains(\""Telephone number:\"")\n       || text.contains(\""Telephone No:\"")\n       || text.contains(\""Fax number:\"")\n       || text.contains(\""Telephone:\"")\n       || text.contains(\""Phone No.\"")\n       || text.contains(\""European contact:\"")))\n    then\n          section.redactLineAfter(\""Contact point:\"", \""PII\"", 38, true, \""Contact information was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""Phone:\"", \""PII\"", 38, true, \""Contact information was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""Fax:\"", \""PII\"", 38, true, \""Contact information was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""Tel.:\"", \""PII\"", 38, true, \""Contact information was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""Tel:\"", \""PII\"", 38, true, \""Contact information was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""E-mail:\"", \""PII\"", 38, true, \""Contact information was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""Email:\"", \""PII\"", 38, true, \""Contact information was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""e-mail:\"", \""PII\"", 38, true, \""Contact information was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""E-mail address:\"", \""PII\"", 38, true, \""Contact information was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""Contact:\"", \""PII\"", 38, true, \""Contact information was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""Alternative contact:\"", \""PII\"", 38, true, \""Contact information was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""Telephone number:\"", \""PII\"", 38, true, \""Contact information was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""Telephone No:\"", \""PII\"", 38, true, \""Contact information was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""Fax number:\"", \""PII\"", 38, true, \""Contact information was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""Telephone:\"", \""PII\"", 38, true, \""Contact information was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""Phone No.\"", \""PII\"", 38, true, \""Contact information was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n              section.redactBetween(\""No:\"", \""Fax\"", \""PII\"", 38, true, \""Contact information was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n              section.redactBetween(\""Contact:\"", \""Tel.:\"", \""PII\"", 38, true, \""Contact information was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n              section.redactLineAfter(\""European contact:\"",  \""PII\"", 38, true, \""Contact information was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n     end""","[PII.4.1, PII.6.1]"
+137,"""39: Redact AUTHOR(S) (Non vertebrate study)""","""\n    when\n        Section(!fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && searchText.contains(\""AUTHOR(S):\"") && searchText.contains(\""COMPLETION DATE:\"") && !searchText.contains(\""STUDY COMPLETION DATE:\""))\n    then\n        section.redactLinesBetween(\""AUTHOR(S):\"", \""COMPLETION DATE:\"", \""PII\"", 39, true, \""AUTHOR(S) was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n    end""",[PII.9.0]
+138,"""40: Redact AUTHOR(S) (Vertebrate study)""","""\n    when\n        Section(fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && searchText.contains(\""AUTHOR(S):\"") && searchText.contains(\""COMPLETION DATE:\"") && !searchText.contains(\""STUDY COMPLETION DATE:\""))\n    then\n        section.redactLinesBetween(\""AUTHOR(S):\"", \""COMPLETION DATE:\"", \""PII\"", 40, true, \""AUTHOR(S) was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n    end""",[PII.9.1]
+139,"""41: Redact signatures (Non vertebrate study)""","""\n    when\n        Section(!fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && matchesImageType(\""signature\""))\n    then\n        section.redactImage(\""signature\"", 41, \""Signature found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n    end""",[ETC.2.0]
+140,"""41: Redact AUTHOR(S) (Non vertebrate study)""","""\n    when\n        Section(!fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && searchText.contains(\""AUTHOR(S):\"") && searchText.contains(\""STUDY COMPLETION DATE:\""))\n    then\n        section.redactLinesBetween(\""AUTHOR(S):\"", \""STUDY COMPLETION DATE:\"", \""PII\"", 41, true, \""AUTHOR(S) was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n    end""",[PII.9.0]
+141,"""42: Redact signatures (Vertebrate study)""","""\n    when\n        Section(fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && matchesImageType(\""signature\""))\n    then\n        section.redactImage(\""signature\"", 42, \""Signature found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n    end""",[ETC.2.0]
+142,"""42: Redact AUTHOR(S) (Vertebrate study)""","""\n    when\n        Section(fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && searchText.contains(\""AUTHOR(S):\"") && searchText.contains(\""STUDY COMPLETION DATE:\""))\n    then\n        section.redactLinesBetween(\""AUTHOR(S):\"", \""STUDY COMPLETION DATE:\"", \""PII\"", 42, true, \""AUTHOR(S) was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n    end""",[PII.9.1]
+143,"""43: Redact PERFORMING LABORATORY (Non vertebrate study)""","""\n    when\n        Section(!fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && searchText.contains(\""PERFORMING LABORATORY:\""))\n    then\n        section.redactBetween(\""PERFORMING LABORATORY:\"", \""LABORATORY PROJECT ID:\"", \""CBI_address\"", 43, true, \""PERFORMING LABORATORY was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n        section.redactNot(\""CBI_address\"", 43, \""Performing laboratory found for non vertebrate study\"");\n    end""",[CBI.20.0]
+144,"""43: Redact Logos (Vertebrate study)""","""\n    when\n        Section(fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && matchesImageType(\""logo\""))\n    then\n        section.redactImage(\""logo\"", 43, \""Logo found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n    end""",[ETC.3.0]
+145,"""44: Redact PERFORMING LABORATORY (Vertebrate study)""","""\n    when\n        Section(fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && searchText.contains(\""PERFORMING LABORATORY:\""))\n    then\n        section.redactBetween(\""PERFORMING LABORATORY:\"", \""LABORATORY PROJECT ID:\"", \""CBI_address\"", 44, true, \""PERFORMING LABORATORY was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n    end""",[CBI.20.1]
+146,"""52: Redact signatures (Non vertebrate study)""","""\n    when\n        Section(!fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && matchesImageType(\""signature\""))\n    then\n        section.redactImage(\""signature\"", 52, \""Signature found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n    end""",[ETC.2.0]
+147,"""53: Redact signatures (Vertebrate study)""","""\n    when\n        Section(fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && matchesImageType(\""signature\""))\n    then\n        section.redactImage(\""signature\"", 53, \""Signature found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n    end""",[ETC.2.0]
+148,"""54: Redact Logos (Vertebrate study)""","""\n    when\n        Section(fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && matchesImageType(\""logo\""))\n    then\n        section.redactImage(\""logo\"", 54, \""Logo found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n    end""",[ETC.3.0]
+149,"""0: Expand CBI Authors with firstname initials""","""\n    when\n        Section(matchesType(\""CBI_author\""))\n    then\n        section.expandByRegEx(\""CBI_author\"", \""(,? [A-Z]\\\\.?( ?[A-Z]\\\\.?)?( ?[A-Z]\\\\.?)?\\\\b\\\\.?)\"", false, 1);\n    end""",[CBI.18.0]
+150,"""0: Expand CBI Authors with firstname initials""","""\n    when\n        Section(matchesType(\""CBI_author\""))\n    then\n        section.expandByRegEx(\""CBI_author\"", \""(,? [A-Z]\\\\.?( ?[A-Z]\\\\.?)?( ?[A-Z]\\\\.?)?\\\\b\\\\.?)\"", false, 1, \""[^\\\\s]+\"");\n    end""",[CBI.18.0]
+151,"""0: Expand CBI_author and PII matches with salutation prefix""","""\n    when\n        Section((matchesType(\""CBI_author\"") || matchesType(\""PII\"")) && (\n            searchText.contains(\""Mr\"")\n            || searchText.contains(\""Mrs\"")\n            || searchText.contains(\""Ms\"")\n            || searchText.contains(\""Miss\"")\n            || searchText.contains(\""Sir\"")\n            || searchText.contains(\""Madam\"")\n            || searchText.contains(\""Madame\"")\n            || searchText.contains(\""Mme\"")\n        ))\n    then\n        section.expandByPrefixRegEx(\""CBI_author\"", \""\\\\b(Mrs?|Ms|Miss|Sir|Madame?|Mme)\\\\s?\\\\.?\\\\s*\"", false, 0);\n        section.expandByPrefixRegEx(\""PII\"", \""\\\\b(Mrs?|Ms|Miss|Sir|Madame?|Mme)\\\\s?\\\\.?\\\\s*\"", false, 0);\n    end""","[CBI.19.0, PII.12.0]"
+152,"""102: Guidelines FileAttributes""","""\n    when\n        Section((text.contains(\""DATA REQUIREMENT(S):\"") || text.contains(\""TEST GUIDELINE(S):\"")) && (text.contains(\""OECD\"") || text.contains(\""EPA\"") || text.contains(\""OPPTS\"")))\n    then\n        section.addFileAttribute(\""OECD Number\"", \""OECD (No\\\\.? )?\\\\d{3}( \\\\(\\\\d{4}\\\\))?\"", false, 0);\n    end""",[ETC.7.0]
+153,"""28: Redact Logos""","""\n    when\n        Section(matchesImageType(\""logo\""))\n    then\n        section.redactImage(\""logo\"", 28, \""Logo found\"", \""Reg (EC) No 1107/2009 Art. 63 (2g)\"");\n    end""",[ETC.3.0]
+154,"""8: Redact Author cells in Tables with Author header (Non vertebrate study)""","""\n    when\n        Section(hasTableHeader(\""h5.1\""))\n    then\n        section.redactCell(\""h5.1\"", 8, \""CBI_author\"", false, \""Author found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n    end""","[CBI.9.0, CBI.11.0]"
+155,"""30: Ignore dossier_redactions if confidential""","""\n    when\n        Section(!fileAttributeByLabelEqualsIgnoreCase(\""Confidentiality\"",\""confidential\"") && matchesType(\""dossier_redactions\""));\n    then\n        section.ignore(\""dossier_redactions\"");\n    end""",[ETC.5.0]
+156,"""27: Redact formula""","""\n    when\n        Section(matchesImageType(\""formula\""))\n    then\n        section.redactImage(\""formula\"", 27, \""Formula found\"", \""Reg (EC) No 1107/2009 Art. 63 (2g)\"");\n    end""",[ETC.8.0]
+157,"""5: Do not redact Names and Addresses if no redaction Indicator is contained""","""\n    when\n        Section(matchesType(\""vertebrate\""), matchesType(\""published_information\""))\n    then\n        section.redactNotAndReference(\""CBI_author\"",\""published_information\"", 5, \""Vertebrate and Published Information found\"");\n        section.redactNotAndReference(\""CBI_address\"",\""published_information\"", 5, \""Vertebrate and Published Information found\"");\n    end""",[CBI.4.0]
+158,"""29: Redact Dossier Redactions""","""\n     when\n         Section(matchesType(\""dossier_redactions\""))\n     then\n         section.redact(\""dossier_redactions\"", 29, \""Dossier Redaction found\"", \""Article 39(1)(2) of Regulation (EC) No 178/2002\"");\n     end""","[ETC.4.0, ETC.4.1, ETC.4.2]"
+159,"""10: Redact determination of residues""","""\n    when\n        Section((\n            searchText.toLowerCase.contains(\""determination of residues\"") ||\n            searchText.toLowerCase.contains(\""determination of total residues\"")\n        ) && (\n            searchText.toLowerCase.contains(\""livestock\"") ||\n            searchText.toLowerCase.contains(\""live stock\"") ||\n            searchText.toLowerCase.contains(\""tissue\"") ||\n            searchText.toLowerCase.contains(\""tissues\"") ||\n            searchText.toLowerCase.contains(\""liver\"") ||\n            searchText.toLowerCase.contains(\""muscle\"") ||\n            searchText.toLowerCase.contains(\""bovine\"") ||\n            searchText.toLowerCase.contains(\""ruminant\"") ||\n            searchText.toLowerCase.contains(\""ruminants\"")\n        ))\n    then\n        section.redact(\""CBI_author\"", 10, \""Determination of residues was found.\"", \""Reg (EC) No 1107/2009 Art. 63 (2g)\"");\n        section.redact(\""CBI_address\"", 10, \""Determination of residues was found.\"", \""Reg (EC) No 1107/2009 Art. 63 (2g)\"");\n        section.addHintAnnotation(\""determination of residues\"", \""must_redact\"");\n        section.addHintAnnotation(\""livestock\"", \""must_redact\"");\n        section.addHintAnnotation(\""live stock\"", \""must_redact\"");\n        section.addHintAnnotation(\""tissue\"", \""must_redact\"");\n        section.addHintAnnotation(\""tissues\"", \""must_redact\"");\n        section.addHintAnnotation(\""liver\"", \""must_redact\"");\n        section.addHintAnnotation(\""muscle\"", \""must_redact\"");\n        section.addHintAnnotation(\""bovine\"", \""must_redact\"");\n        section.addHintAnnotation(\""ruminant\"", \""must_redact\"");\n        section.addHintAnnotation(\""ruminants\"", \""must_redact\"");\n    end""",[CBI.15.0]
+160,"""19: Redact AUTHOR(S)""","""\n    when\n        Section(searchText.contains(\""AUTHOR(S):\"") && fileAttributeByPlaceholderEquals(\""{fileattributes.vertebrateStudy}\"", \""true\""))\n    then\n        section.redactLinesBetween(\""AUTHOR(S):\"", \""COMPLETION DATE:\"", \""PII\"", 19, true, \""AUTHOR(S) was found\"", \""Reg (EC) No 1107/2009 Art. 63 (2e)\"");\n    end""",[PII.9.1]
+161,"""101: Redact CAS numbers""","""\n    when\n        Section(hasTableHeader(\""Sample #\""))\n    then\n        section.redactCell(\""Sample #\"", 8, \""PII\"", true, \""Redacted because row is a vertebrate study\"", \""Reg (EC) No 1107/2009 Art. 63 (2g)\"");\n    end""",[ETC.6.0]
+162,"""21: Redact Emails by RegEx""","""\n    when\n        Section(searchText.contains(\""@\""))\n    then\n        section.redactByRegEx(\""\\\\b([A-Za-z0-9._%+\\\\-]+@[A-Za-z0-9.\\\\-]+\\\\.[A-Za-z\\\\-]{1,23}[A-Za-z])\\\\b\"", true, 1, \""PII\"", 21, \""PII (Personal Identification Information) found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n    end""","[PII.1.0, PII.1.1]"
+163,"""32: Redact signatures""","""\n    when\n        Section(matchesImageType(\""signature\""))\n    then\n        section.redactImage(\""signature\"", 32, \""Signature found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n    end""","[ETC.2.0, ETC.2.1]"
+164,"""11: Do not redact Names and Addresses if Published Information found""","""\n    when\n        Section(matchesType(\""published_information\""))\n    then\n        section.redactNotAndReference(\""CBI_author\"",\""published_information\"", 11, \""Published Information found\"");\n        section.redactNotAndReference(\""CBI_address\"",\""published_information\"", 11, \""Published Information found\"");\n    end""","[CBI.7.0, CBI.7.1]"
+165,"""9: Add recommendation for Addresses in Test Organism sections""","""\n    when\n        Section(searchText.contains(\""Species:\"") && searchText.contains(\""Source:\""))\n    then\n        section.recommendLineAfter(\""Source:\"", \""CBI_address\"");\n    end""",[CBI.17.1]
+166,"""5: Redact Author cells in Tables with Author header""","""\n    when\n        Section(hasTableHeader(\""Author\"") && !hasTableHeader(\""Vertebrate study Y/N\""))\n    then\n        section.redactCell(\""Author\"", 5, \""CBI_author\"", false, \""Author found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n    end""","[CBI.9.1, CBI.10.1]"
+167,"""21: Redact Phone and Fax by RegEx""","""\n    when\n        Section(\n               text.contains(\""Telephone\"")\n            || text.contains(\""Phone\"")\n            || text.contains(\""Ph.\"")\n            || text.contains(\""Fax\"")\n            || text.contains(\""Tel\"")\n            || text.contains(\""Ter\"")\n            || text.contains(\""Cell\"")\n            || text.contains(\""Mobile\"")\n            || text.contains(\""Fel\"")\n            || text.contains(\""Fer\"")\n        )\n    then\n        section.redactByRegEx(\""\\\\b(telephone|phone|fax|tel|ter|cell|mobile|fel|fer)[:.\\\\s]{0,3}((\\\\(?\\\\+?[0-9])(\\\\(?[0-9\\\\/.\\\\-\\\\s]+\\\\)?)*([0-9]+\\\\)?))\\\\b\"", true, 2, \""PII\"", 23, \""PII (Personal Identification Information) found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n    end""","[PII.2.0, PII.2.1]"
+168,"""2: Redact CBI Address""","""\n    when\n        Section(matchesType(\""CBI_address\""))\n    then\n        section.redact(\""CBI_address\"", 4, \""Address found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n    end""",[CBI.1.1]
+169,"""25: Redact AUTHOR(S)""","""\n    when\n        Section(searchText.contains(\""AUTHOR(S):\"")\n        && searchText.contains(\""COMPLETION DATE:\"")\n        && !searchText.contains(\""STUDY COMPLETION DATE:\""))\n    then\n        section.redactLinesBetween(\""AUTHOR(S):\"", \""COMPLETION DATE:\"", \""PII\"", 25, true, \""AUTHOR(S) was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n    end""","[PII.9.0, PII.9.1]"
+170,"""6: Redact and recommand Authors in Tables with Vertebrate study Y/N header""","""\n    when\n        Section(rowEquals(\""Vertebrate study Y/N\"", \""Y\"") || rowEquals(\""Vertebrate study Y/N\"", \""Yes\"") || rowEquals(\""Vertebrate study Y/N\"", \""N\"") || rowEquals(\""Vertebrate study Y/N\"", \""No\""))\n    then\n        section.redactCell(\""Author(s)\"", 6, \""CBI_author\"", true, \""Author found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n    end""","[CBI.9.0, CBI.9.1, CBI.10.0, CBI.10.1, CBI.11.0, CBI.12.0, CBI.12.1]"
+171,"""22: Redact contact information""","""\n    when\n        Section(text.contains(\""Contact point:\"")\n            || text.contains(\""Phone:\"")\n            || text.contains(\""Fax:\"")\n            || text.contains(\""Tel.:\"")\n            || text.contains(\""Tel:\"")\n            || text.contains(\""E-mail:\"")\n            || text.contains(\""Email:\"")\n            || text.contains(\""e-mail:\"")\n            || text.contains(\""E-mail address:\"")\n            || text.contains(\""Contact:\"")\n            || text.contains(\""Alternative contact:\"")\n            || text.contains(\""Telephone number:\"")\n            || text.contains(\""Telephone No:\"")\n            || text.contains(\""Fax number:\"")\n            || text.contains(\""Telephone:\"")\n            || text.contains(\""Phone No.\"")\n            || (text.contains(\""No:\"") && text.contains(\""Fax\""))\n            || (text.contains(\""Contact:\"") && text.contains(\""Tel.:\""))\n            || text.contains(\""European contact:\"")\n        )\n    then\n        section.redactLineAfter(\""Contact point:\"", \""PII\"", 22, true, \""PII (Personal Identification Information) found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""Phone:\"", \""PII\"", 22, true, \""PII (Personal Identification Information) found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""Fax:\"", \""PII\"", 22, true, \""PII (Personal Identification Information) found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""Tel.:\"", \""PII\"", 22, true, \""PII (Personal Identification Information) found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""Tel:\"", \""PII\"", 22, true, \""PII (Personal Identification Information) found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""E-mail:\"", \""PII\"", 22, true, \""PII (Personal Identification Information) found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""Email:\"", \""PII\"", 22, true, \""PII (Personal Identification Information) found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""e-mail:\"", \""PII\"", 22, true, \""PII (Personal Identification Information) found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""E-mail address:\"", \""PII\"", 22, true, \""PII (Personal Identification Information) found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""Contact:\"", \""PII\"", 22, true, \""PII (Personal Identification Information) found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""Alternative contact:\"", \""PII\"", 22, true, \""PII (Personal Identification Information) found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""Telephone number:\"", \""PII\"", 22, true, \""PII (Personal Identification Information) found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""Telephone No:\"", \""PII\"", 22, true, \""PII (Personal Identification Information) found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""Fax number:\"", \""PII\"", 22, true, \""PII (Personal Identification Information) found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""Telephone:\"", \""PII\"", 22, true, \""PII (Personal Identification Information) found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""Phone No.\"", \""PII\"", 22, true, \""PII (Personal Identification Information) found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactBetween(\""No:\"", \""Fax\"", \""PII\"", 22, true, \""PII (Personal Identification Information) found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactBetween(\""Contact:\"", \""Tel.:\"", \""PII\"", 22, true, \""PII (Personal Identification Information) found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactLineAfter(\""European contact:\"",  \""PII\"", 22, true, \""PII (Personal Identification Information) found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n     end""","[PII.4.0, PII.4.1, PII.5.0, PII.5.1, PII.6.0, PII.6.1, PII.7.0, PII.7.1, PII.8.0, PII.8.1]"
+172,"""20: Redacted PII Personal Identification Information""","""\n    when\n        Section(matchesType(\""PII\""))\n    then\n        section.redact(\""PII\"", 20, \""PII (Personal Identification Information) found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n    end""","[PII.0.0, PII.0.1]"
+173,"""1: Redact CBI Authors""","""\n    when\n        Section(matchesType(\""CBI_author\""))\n    then\n        section.redact(\""CBI_author\"", 1, \""Author found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n    end""","[CBI.0.0, CBI.0.1]"
+174,"""4: Redact Author(s) cells in Tables with Author(s) header""","""\n    when\n        Section(hasTableHeader(\""Author(s)\"") && !hasTableHeader(\""Vertebrate study Y/N\""))\n    then\n        section.redactCell(\""Author(s)\"", 4, \""CBI_author\"", false, \""Author found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n    end""","[CBI.9.0, CBI.10.0]"
+175,"""8: Redact and add recommendation for et al. author""","""\n    when\n        Section(searchText.contains(\""et al\""))\n    then\n        section.redactAndRecommendByRegEx(\""\\\\b([A-ZÄÖÜ][^\\\\s\\\\.,]+( [A-ZÄÖÜ]{1,2}\\\\.?)?( ?[A-ZÄÖÜ]\\\\.?)?) et al\\\\.?\"", false, 1, \""CBI_author\"", 15, \""Author found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n    end""","[CBI.16.0, CBI.16.1]"
+176,"""26: Redact AUTHOR(S)""","""\n    when\n        Section(searchText.contains(\""AUTHOR(S):\"") && searchText.contains(\""STUDY COMPLETION DATE:\""))\n    then\n        section.redactLinesBetween(\""AUTHOR(S):\"", \""STUDY COMPLETION DATE:\"", \""PII\"", 26, true, \""AUTHOR(S) was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n    end""","[PII.9.0, PII.9.1]"
+177,"""27: Redact PERFORMING LABORATORY""","""\n    when\n        Section(searchText.contains(\""PERFORMING LABORATORY:\""))\n    then\n        section.redactBetween(\""PERFORMING LABORATORY:\"", \""LABORATORY PROJECT ID:\"", \""CBI_address\"", 27, true, \""PERFORMING LABORATORY was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n    end""","[CBI.20.0, CBI.20.1]"
+178,"""10: Add recommendation for Addresses in Test Animals sections""","""\n    when\n        Section(searchText.contains(\""Species\"") && searchText.contains(\""Source\""))\n    then\n        section.recommendLineAfter(\""Source\"", \""CBI_address\"");\n    end""","[CBI.17.0, CBI.17.1]"
+179,"""33: Redact Logos""","""\n    when\n        Section(matchesImageType(\""logo\""))\n    then\n        section.redactImage(\""logo\"", 33, \""Logo found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n    end""","[ETC.3.0, ETC.3.1]"
+180,"""26: Redact Phone and Fax by RegEx (Vertebrate study)""","""\n    when\n        Section(fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && (\n               text.contains(\""Contact\"")\n            || text.contains(\""Telephone\"")\n            || text.contains(\""Phone\"")\n            || text.contains(\""Ph.\"")\n            || text.contains(\""Fax\"")\n            || text.contains(\""Tel\"")\n            || text.contains(\""Ter\"")\n            || text.contains(\""Mobile\"")\n            || text.contains(\""Fel\"")\n            || text.contains(\""Fer\"")\n        ))\n    then\n        section.redactByRegEx(\""\\\\b(contact|telephone|phone|ph\\\\.|fax|tel|ter|mobile|fel|fer)[a-zA-Z\\\\s]{0,10}[:.\\\\s]{0,3}([\\\\+\\\\d\\\\(][\\\\s\\\\d\\\\(\\\\)\\\\-\\\\/\\\\.]{4,100}\\\\d)\\\\b\"", true, 2, \""PII\"", 26, \""Personal information found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n    end""",[PII.2.1]
+181,"""25: Redact Phone and Fax by RegEx (Non vertebrate study)""","""\n    when\n        Section(!fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && (\n               text.contains(\""Contact\"")\n            || text.contains(\""Telephone\"")\n            || text.contains(\""Phone\"")\n            || text.contains(\""Ph.\"")\n            || text.contains(\""Fax\"")\n            || text.contains(\""Tel\"")\n            || text.contains(\""Ter\"")\n            || text.contains(\""Mobile\"")\n            || text.contains(\""Fel\"")\n            || text.contains(\""Fer\"")\n        ))\n    then\n        section.redactByRegEx(\""\\\\b(contact|telephone|phone|ph\\\\.|fax|tel|ter|mobile|fel|fer)[a-zA-Z\\\\s]{0,10}[:.\\\\s]{0,3}([\\\\+\\\\d\\\\(][\\\\s\\\\d\\\\(\\\\)\\\\-\\\\/\\\\.]{4,100}\\\\d)\\\\b\"", true, 2, \""PII\"", 25, \""Personal information found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n    end""",[PII.2.0]
+182,"""10: Add recommendation for Addresses in Test Animals sections""","""\n    when\n        Section(searchText.contains(\""Species\"") && searchText.contains(\""Source\""))\n    then\n\t\tsection.recommendLineAfter(\""Source\"", \""PII\"");\n    end""","[CBI.17.0, CBI.17.1]"
+183,"""0: Combine address parts from AI to addresses as PII (org is mandatory)""","""\n    when\n        Section(aiMatchesType(\""ORG\""))\n    then\n        section.combineAiTypes(\""ORG\"", \""STREET,POSTAL,COUNTRY,CARDINAL,CITY,STATE\"", 20, \""PII\"", 3, false);\n    end""",[AI.1.0]
+184,"""0: Combine address parts from AI to addresses as PII (street is mandatory)""","""\n    when\n        Section(aiMatchesType(\""STREET\""))\n    then\n        section.combineAiTypes(\""STREET\"", \""ORG,POSTAL,COUNTRY,CARDINAL,CITY,STATE\"", 20, \""PII\"", 3, false);\n    end""",[AI.1.0]
+185,"""18: Redact AUTHOR(S)""","""\n    when\n        Section(searchText.contains(\""AUTHOR(S):\"") && searchText.contains(\""STUDY COMPLETION DATE:\""))\n    then\n        section.redactLinesBetween(\""AUTHOR(S):\"", \""STUDY COMPLETION DATE:\"", \""PII\"", 18, true, \""AUTHOR(S) was found\"", \""Article 4(1)(b), Regulation (EC) No 1049/2001 (Personal data)\"");\n    end""","[PII.9.0, PII.9.1]"
+186,"""0: Combine address parts from AI to addresses as PII (city is mandatory)""","""\n    when\n        Section(aiMatchesType(\""CITY\""))\n    then\n        section.combineAiTypes(\""CITY\"", \""ORG,STREET,POSTAL,COUNTRY,CARDINAL,STATE\"", 20, \""PII\"", 3, false);\n    end""",[AI.1.0]
+187,"""24: Redact signatures""","""\n    when\n        Section(matchesImageType(\""signature\""))\n    then\n        section.redactImage(\""signature\"", 24, \""Signature found\"", \""Article 4(1)(b), Regulation (EC) No 1049/2001 (Personal data)\"");\n    end""","[ETC.2.0, ETC.2.1]"
+188,"""13: Redact Emails by RegEx""","""\n    when\n        Section(searchText.contains(\""@\""))\n    then\n        section.redactByRegEx(\""\\\\b([A-Za-z0-9._%+\\\\-]+@[A-Za-z0-9.\\\\-]+\\\\.[A-Za-z\\\\-]{1,23}[A-Za-z])\\\\b\"", true, 1, \""PII\"", 13, \""PII (Personal Identification Information) found\"", \""Article 4(1)(b), Regulation (EC) No 1049/2001 (Personal data)\"");\n    end""","[PII.1.0, PII.1.1]"
+189,"""4: Redact Author(s) cells in Tables with Author(s) header""","""\n    when\n        Section(hasTableHeader(\""Author(s)\"") && !hasTableHeader(\""Vertebrate study Y/N\""))\n    then\n        section.redactCell(\""Author(s)\"", 4, \""PII\"", false, \""Author found\"", \""Article 4(1)(b), Regulation (EC) No 1049/2001 (Personal data)\"");\n    end""","[CBI.9.0, CBI.10.0, CBI.11.0]"
+190,"""25: Redact Logos""","""\n    when\n        Section(matchesImageType(\""logo\""))\n    then\n        section.redactImage(\""logo\"", 25, \""Logo found\"", \""Article 4(1)(b), Regulation (EC) No 1049/2001 (Personal data)\"");\n    end""","[ETC.3.0, ETC.3.1]"
+191,"""11: Do not redact Names and Addresses if Published Information found""","""\n    when\n        Section(matchesType(\""published_information\""))\n    then\n        section.redactNot(\""PII\"", 11, \""Published Information found\"");\n        section.redactNot(\""PII\"", 11, \""Published Information found\"");\n    end""","[CBI.7.0, CBI.7.1, CBI.6.0, CBI.6.1]"
+192,"""2: Do not redact genitive PIIs""","""\n    when\n        Section(matchesType(\""PII\""))\n    then\n        section.expandToFalsePositiveByRegEx(\""PII\"", \""['’’'ʼˈ´`‘′ʻ’']s\"", false, 0);\n    end""",[CBI.2.0]
+193,"""5: Redact Author cells in Tables with Author header""","""\n    when\n        Section(hasTableHeader(\""Author\"") && !hasTableHeader(\""Vertebrate study Y/N\""))\n    then\n        section.redactCell(\""Author\"", 5, \""PII\"", false, \""Author found\"", \""Article 4(1)(b), Regulation (EC) No 1049/2001 (Personal data)\"");\n    end""","[CBI.9.1, CBI.10.1, CBI.12.0]"
+194,"""19: Redact PERFORMING LABORATORY""","""\n    when\n        Section(searchText.contains(\""PERFORMING LABORATORY:\""))\n    then\n        section.redactBetween(\""PERFORMING LABORATORY:\"", \""LABORATORY PROJECT ID:\"", \""PII\"", 19, true, \""PERFORMING LABORATORY was found\"", \""Article 4(1)(b), Regulation (EC) No 1049/2001 (Personal data)\"");\n    end""","[CBI.20.0, CBI.20.1]"
+195,"""0: Recommend authors from AI as PII""","""\n    when\n        Section(aiMatchesType(\""CBI_author\""))\n    then\n        section.addAiEntities(\""CBI_author\"", \""PII\"");\n    end""",[AI.3.0]
+196,"""9: Add recommendation for Addresses in Test Organism sections""","""\n    when\n        Section(searchText.contains(\""Species:\"") && searchText.contains(\""Source:\""))\n    then\n\t\tsection.recommendLineAfter(\""Source:\"", \""PII\"");\n    end""",[CBI.17.1]
+197,"""1: Redacted PII Personal Identification Information""","""\n    when\n        Section(matchesType(\""PII\""))\n    then\n        section.redact(\""PII\"", 1, \""Personal information found\"", \""Article 4(1)(b), Regulation (EC) No 1049/2001 (Personal data)\"");\n    end""","[PII.0.0, PII.0.1]"
+198,"""8: Redact and add recommendation for et al. author""","""\n    when\n        Section(searchText.contains(\""et al\""))\n    then\n\t\tsection.redactAndRecommendByRegEx(\""\\\\b([A-ZÄÖÜ][^\\\\s\\\\.,]+( [A-ZÄÖÜ]{1,2}\\\\.?)?( ?[A-ZÄÖÜ]\\\\.?)?) et al\\\\.?\"", false, 1, \""PII\"", 8, \""Author found\"", \""Article 4(1)(b), Regulation (EC) No 1049/2001 (Personal data)\"");\n    end""","[CBI.16.0, CBI.16.1]"
+199,"""14: Redact contact information""","""\n    when\n        Section(text.contains(\""Contact point:\"")\n            || text.contains(\""Phone:\"")\n            || text.contains(\""Fax:\"")\n            || text.contains(\""Tel.:\"")\n            || text.contains(\""Tel:\"")\n            || text.contains(\""E-mail:\"")\n            || text.contains(\""Email:\"")\n            || text.contains(\""e-mail:\"")\n            || text.contains(\""E-mail address:\"")\n            || text.contains(\""Contact:\"")\n            || text.contains(\""Alternative contact:\"")\n            || text.contains(\""Telephone number:\"")\n            || text.contains(\""Telephone No:\"")\n            || text.contains(\""Fax number:\"")\n            || text.contains(\""Telephone:\"")\n            || text.contains(\""Phone No.\"")\n            || (text.contains(\""No:\"") && text.contains(\""Fax\""))\n            || (text.contains(\""Contact:\"") && text.contains(\""Tel.:\""))\n            || text.contains(\""European contact:\"")\n        )\n    then\n        section.redactLineAfter(\""Contact point:\"", \""PII\"", 14, true, \""Personal information found\"", \""Article 4(1)(b), Regulation (EC) No 1049/2001 (Personal data)\"");\n        section.redactLineAfter(\""Phone:\"", \""PII\"", 14, true, \""Personal information found\"", \""Article 4(1)(b), Regulation (EC) No 1049/2001 (Personal data)\"");\n        section.redactLineAfter(\""Fax:\"", \""PII\"", 14, true, \""Personal information found\"", \""Article 4(1)(b), Regulation (EC) No 1049/2001 (Personal data)\"");\n        section.redactLineAfter(\""Tel.:\"", \""PII\"", 14, true, \""Personal information found\"", \""Article 4(1)(b), Regulation (EC) No 1049/2001 (Personal data)\"");\n        section.redactLineAfter(\""Tel:\"", \""PII\"", 14, true, \""Personal information found\"", \""Article 4(1)(b), Regulation (EC) No 1049/2001 (Personal data)\"");\n        section.redactLineAfter(\""E-mail:\"", \""PII\"", 14, true, \""Personal information found\"", \""Article 4(1)(b), Regulation (EC) No 1049/2001 (Personal data)\"");\n        section.redactLineAfter(\""Email:\"", \""PII\"", 14, true, \""Personal information found\"", \""Article 4(1)(b), Regulation (EC) No 1049/2001 (Personal data)\"");\n        section.redactLineAfter(\""e-mail:\"", \""PII\"", 14, true, \""Personal information found\"", \""Article 4(1)(b), Regulation (EC) No 1049/2001 (Personal data)\"");\n        section.redactLineAfter(\""E-mail address:\"", \""PII\"", 14, true, \""Personal information found\"", \""Article 4(1)(b), Regulation (EC) No 1049/2001 (Personal data)\"");\n        section.redactLineAfter(\""Contact:\"", \""PII\"", 14, true, \""Personal information found\"", \""Article 4(1)(b), Regulation (EC) No 1049/2001 (Personal data)\"");\n        section.redactLineAfter(\""Alternative contact:\"", \""PII\"", 14, true, \""Personal information found\"", \""Article 4(1)(b), Regulation (EC) No 1049/2001 (Personal data)\"");\n        section.redactLineAfter(\""Telephone number:\"", \""PII\"", 14, true, \""Personal information found\"", \""Article 4(1)(b), Regulation (EC) No 1049/2001 (Personal data)\"");\n        section.redactLineAfter(\""Telephone No:\"", \""PII\"", 14, true, \""Personal information found\"", \""Article 4(1)(b), Regulation (EC) No 1049/2001 (Personal data)\"");\n        section.redactLineAfter(\""Fax number:\"", \""PII\"", 14, true, \""Personal information found\"", \""Article 4(1)(b), Regulation (EC) No 1049/2001 (Personal data)\"");\n        section.redactLineAfter(\""Telephone:\"", \""PII\"", 14, true, \""Personal information found\"", \""Article 4(1)(b), Regulation (EC) No 1049/2001 (Personal data)\"");\n        section.redactLineAfter(\""Phone No.\"", \""PII\"", 14, true, \""Personal information found\"", \""Article 4(1)(b), Regulation (EC) No 1049/2001 (Personal data)\"");\n        section.redactBetween(\""No:\"", \""Fax\"", \""PII\"", 14, true, \""Personal information found\"", \""Article 4(1)(b), Regulation (EC) No 1049/2001 (Personal data)\"");\n        section.redactBetween(\""Contact:\"", \""Tel.:\"", \""PII\"", 14, true, \""Personal information found\"", \""Article 4(1)(b), Regulation (EC) No 1049/2001 (Personal data)\"");\n        section.redactLineAfter(\""European contact:\"",  \""PII\"", 14, true, \""Personal information found\"", \""Article 4(1)(b), Regulation (EC) No 1049/2001 (Personal data)\"");\n     end""","[PII.4.0, PII.4.1, PII.6.0, PII.6.1]"
+200,"""17: Redact AUTHOR(S)""","""\n    when\n        Section(searchText.contains(\""AUTHOR(S):\""))\n    then\n        section.redactLinesBetween(\""AUTHOR(S):\"", \""COMPLETION DATE:\"", \""PII\"", 17, true, \""AUTHOR(S) was found\"", \""Article 4(1)(b), Regulation (EC) No 1049/2001 (Personal data)\"");\n    end""","[PII.9.0, PII.9.1]"
+201,"""6: Redact and recommand Authors in Tables with Vertebrate study Y/N header""","""\n    when\n        Section(rowEquals(\""Vertebrate study Y/N\"", \""Y\"") || rowEquals(\""Vertebrate study Y/N\"", \""Yes\"") || rowEquals(\""Vertebrate study Y/N\"", \""N\"") || rowEquals(\""Vertebrate study Y/N\"", \""No\""))\n    then\n        section.redactCell(\""Author(s)\"", 6, \""PII\"", false, \""Author found\"", \""Article 4(1)(b), Regulation (EC) No 1049/2001 (Personal data)\"");\n    end""","[CBI.11.0, CBI.12.2, CBI.12.1]"
+202,"""27: Redact Logos""","""\n    °when\n        Section(matchesImageType(\""logo\""))\n    then\n        //section.redactImage(\""logo\"", 27, \""Logo found\"", \""Reg (EC) No 1107/2009 Art. 63 (2g)\"");\n        section.redactNotImage(\""logo\"", 27, \""No Logos in preGFL documents\"");\n    end""","[ETC.3.0, ETC.3.1]"
+203,"""27: Redact Logos""","""\n    when\n        Section(matchesImageType(\""logo\""))\n    then\n        //section.redactImage(\""logo\"", 27, \""Logo found\"", \""Reg (EC) No 1107/2009 Art. 63 (2g)\"");\n        section.redactNotImage(\""logo\"", 27, \""No Logos in preGFL documents\"");\n    end""","[ETC.3.0, ETC.3.1]"
+204,"""10a: Redact Addresses in Reference Tables for vertebrate studies in non-vertebrate documents""","""\n    when\n        Section(hasTableHeader(\""Vertebrate study Y/N\"") && (rowEquals(\""Vertebrate study Y/N\"", \""Y\"") || rowEquals(\""Vertebrate study Y/N\"", \""Yes\"")))\n    then\n        section.redact(\""CBI_address\"", 10, \""Redacted because row is a vertebrate study\"", \""Reg (EC) No 1107/2009 Art. 63 (2g)\"");\n    end""",[CBI.22.0]
+205,"""27a: Redact AUTHOR(S) (Non vertebrate study)""","""\n    when\n        Section(!fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"")\n            && searchText.toUpperCase().contains(\""AUTHOR(S)\"")\n            && !searchText.toUpperCase().contains(\""AUTHOR(S):\"")\n            && searchText.toUpperCase().contains(\""COMPLETION DATE\"")\n            && !searchText.toUpperCase().contains(\""STUDY COMPLETION DATE\"")\n        )\n    then\n        section.redactLinesBetween(\""AUTHOR(S)\"", \""COMPLETION DATE\"", \""CBI_author\"", 27, true, \""Author found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n        section.redactLinesBetween(\""Author(s)\"", \""Completion Date\"", \""CBI_author\"", 27, true, \""Author found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n        section.redactLinesBetween(\""AUTHOR(S)\\n\"", \""COMPLETION DATE\"", \""CBI_author\"", 27, true, \""Author found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n        section.redactLinesBetween(\""Author(s)\\n\"", \""Completion Date\"", \""CBI_author\"", 27, true, \""Author found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n    end""",[PII.9.0]
+206,"""29b: Redact short Authors section""","""\n    when\n        Section(\n            !fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"")\n            && searchText.toLowerCase().contains(\""author(s)\"")\n            && searchText.length() < 50\n            && sectionNumber <= 20\n            && !aiMatchesType(\""CBI_Author\"")\n        )\n    then\n        section.redactByRegEx(\""(?<=author\\\\(?s\\\\)?\\\\s\\\\n?)([\\\\p{Lu}\\\\p{L} ]{5,15}(,|\\\\n)?){1,3}\"",true,0,\""CBI_author\"",29,\""AUTHOR(S) was found\"",\""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n    end""",[CBI.21.0]
+207,"""28a: Redact AUTHOR(S) (Vertebrate study)""","""\n    when\n        Section(fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"")\n            && searchText.toUpperCase().contains(\""AUTHOR(S)\"")\n            && !searchText.toUpperCase().contains(\""AUTHOR(S):\"")\n            && searchText.toUpperCase().contains(\""COMPLETION DATE\"")\n            && !searchText.toUpperCase().contains(\""STUDY COMPLETION DATE\"")\n        )\n    then\n        section.redactLinesBetween(\""AUTHOR(S)\"", \""COMPLETION DATE\"", \""CBI_author\"", 28, true, \""AUTHOR(S) was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactLinesBetween(\""Author(s)\"", \""Completion Date\"", \""CBI_author\"", 28, true, \""Author(s) was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactLinesBetween(\""AUTHOR(S)\\n\"", \""COMPLETION DATE\"", \""CBI_author\"", 28, true, \""AUTHOR(S) was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactLinesBetween(\""Author(s)\\n\"", \""Completion Date\"", \""CBI_author\"", 28, true, \""Author(s) was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n    end""",[PII.9.1]
+208,"""65: Redact Skipped Impurities""","""\n    when\n        Section((fileAttributeByLabelEqualsIgnoreCase(\""Redact Skipped Impurities\"",\""Yes\"") || fileAttributeByLabelEqualsIgnoreCase(\""Redact Skipped Impurities\"",\""Y\"")) && matchesType(\""skipped_impurities\""))\n    then\n        section.redact(\""skipped_impurities\"", 65, \""Occasional Impurity found\"", \""Article 63(2)(b) of Regulation (EC) No 1107/2009\"");\n    end""",[ETC.9.0]
+209,"""19c: Recommend first line in table cell with name and address of owner""","""\n    when\n        Section(searchText.toLowerCase().contains(\""trial site\"") && hasTableHeader(\""Name and Address of Owner / Tenant\""))\n    then\n        section.redactCell(\""Name and Address of Owner / Tenant\"",19,\""PII\"",true,\""Trial Site owner and address found\"",\""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n    end""",[ETC.11.0]
+210,"""67: Redact Product Composition Information""","""\n    when\n        Section(matchesType(\""product_composition\""))\n    then\n        section.redact(\""product_composition\"",67, \""Product Composition Information found\"",\""Article 63(2)(d) of Regulation (EC) No 1107/2009\"");\n    end""",[ETC.10.0]
+211,"""25: Redact Phone and Fax by RegEx (Non vertebrate study)""","""\n    when\n        Section(!fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && (\n               text.contains(\""Contact\"")\n            || text.contains(\""Telephone\"")\n            || text.contains(\""Téléphone\"")\n            || text.contains(\""Phone\"")\n            || text.contains(\""Fax\"")\n            || text.contains(\""Tel\"")\n            || text.contains(\""Ter\"")\n            || text.contains(\""Mobile\"")\n            || text.contains(\""Fel\"")\n            || text.contains(\""Fer\"")\n        ))\n    then\n        section.redactByRegEx(\""\\\\b(contact|t\\\\p{Ll}l\\\\p{Ll}phone|phone|fax|tel|ter|mobile|fel|fer)[a-zA-Z\\\\s\\\\.]{0,10}[:.\\\\s]{0,3}([\\\\+\\\\d\\\\(O][\\\\s\\\\d\\\\(\\\\)\\\\-\\\\/\\\\.O]{4,100}\\\\d)\\\\b\"", true, 2, \""PII\"", 25, \""Personal information found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n    end""",[PII.2.0]
+212,"""19a: recommend title prefixed words as PII""","""\n    when\n        Section(\n            searchText.contains(\""Dr \"")\n            || searchText.contains(\""PD Dr \"")\n            || searchText.contains(\""Prof. Dr \"")\n            || searchText.contains(\""Dr. med. vet \"")\n            || searchText.contains(\""Dr. rer. nat \"")\n            || searchText.contains(\""PhD \"")\n            || searchText.contains(\""BSc \"")\n            || searchText.contains(\""(FH) \"")\n            || searchText.contains(\""Mr \"")\n            || searchText.contains(\""Mrs \"")\n            || searchText.contains(\""Ms \"")\n            || searchText.contains(\""Miss \"")\n            || searchText.contains(\""Dr.\"")\n            || searchText.contains(\""PD Dr.\"")\n            || searchText.contains(\""Prof. Dr.\"")\n            || searchText.contains(\""Dr. med. vet.\"")\n            || searchText.contains(\""Dr. rer. nat.\"")\n            || searchText.contains(\""PhD.\"")\n            || searchText.contains(\""BSc.\"")\n            || searchText.contains(\""(FH).\"")\n            || searchText.contains(\""Mr.\"")\n            || searchText.contains(\""Mrs.\"")\n            || searchText.contains(\""Ms.\"")\n            || searchText.contains(\""Miss.\"")\n        )\n    then\n        section.addRecommendationByRegEx(\""((Dr|PD Dr|Prof. Dr|Dr. med. vet|Dr. rer. nat|PhD|BSc|\\\\(FH\\\\)|Mr|Mrs|Ms|Miss)[.\\\\s]{1,2})([\\\\p{Lu}][\\\\p{L}\\\\-.]{1,20}\\\\s[\\\\p{Lu}][\\\\p{L}\\\\-.]{1,20})\"", false, 3, \""PII\"");\n    end""",[PII.14.0]
+213,"""0: Combine address parts from ai to CBI_address (city is mandatory)""","""\n    when\n        Section(aiMatchesType(\""CITY\""))\n    then\n        section.combineAiTypes(\""CITY\"", \""ORG,DEPARTMENT,STREET,POSTAL,COUNTRY,CARDINAL,STATE\"", 20, \""CBI_address\"", 3, false);\n    end""",[AI.1.0]
+214,"""29: Redact AUTHOR(S) (Non vertebrate study)""","""\n    when\n        Section(!fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"")\n            && searchText.toUpperCase().contains(\""AUTHOR(S):\"")\n            && searchText.toUpperCase().contains(\""STUDY COMPLETION DATE:\"")\n        )\n    then\n        section.redactLinesBetween(\""AUTHOR(S):\"", \""STUDY COMPLETION DATE:\"", \""CBI_author\"", 29, true, \""AUTHOR(S) was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n        section.redactLinesBetween(\""Author(s):\"", \""Study Completion Date:\"", \""CBI_author\"", 29, true, \""AUTHOR(S) was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n        section.redactLinesBetween(\""Author(s):\"", \""Study completion Date:\"", \""CBI_author\"", 29, true, \""AUTHOR(S) was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n        section.redactLinesBetween(\""AUTHOR(S):\\n\"", \""STUDY COMPLETION DATE:\"", \""CBI_author\"", 29, true, \""AUTHOR(S) was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n        section.redactLinesBetween(\""Author(s):\\n\"", \""Study Completion Date:\"", \""CBI_author\"", 29, true, \""AUTHOR(S) was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n        section.redactLinesBetween(\""Author(s):\\n\"", \""Study completion Date:\"", \""CBI_author\"", 29, true, \""AUTHOR(S) was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n    end""",[PII.9.0]
+215,"""22: Redact Emails by RegEx (Vertebrate study)""","""\n    when\n        Section(fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && searchText.contains(\""@\""))\n    then\n        section.redactByRegEx(\""\\\\b([A-Za-z0-9._%+\\\\-]+@\\\\s?[A-Za-z0-9.\\\\-]+\\\\.[A-Za-z\\\\-]{1,23}[A-Za-z])\\\\b\"", true, 1, \""PII\"", 22, \""Personal information found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n    end""",[PII.1.1]
+216,"""27: Redact AUTHOR(S) (Non vertebrate study)""","""\n    when\n        Section(!fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"")\n            && searchText.toUpperCase().contains(\""AUTHOR(S):\"")\n            && searchText.toUpperCase().contains(\""COMPLETION DATE:\"")\n            && !searchText.toUpperCase().contains(\""STUDY COMPLETION DATE:\"")\n        )\n    then\n        section.redactLinesBetween(\""AUTHOR(S):\"", \""COMPLETION DATE:\"", \""CBI_author\"", 27, true, \""Author found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n        section.redactLinesBetween(\""Author(s):\"", \""Completion Date:\"", \""CBI_author\"", 27, true, \""Author found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n        section.redactLinesBetween(\""AUTHOR(S):\\n\"", \""COMPLETION DATE:\"", \""CBI_author\"", 27, true, \""Author found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n        section.redactLinesBetween(\""Author(s):\\n\"", \""Completion Date:\"", \""CBI_author\"", 27, true, \""Author found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n    end""",[PII.9.0]
+217,"""21a: Redact typoed Emails with indicator""","""\n    when\n        Section(searchText.contains(\""@\"") || searchText.toLowerCase().contains(\""mail\""))\n    then\n        section.redactByRegEx(\""mail[:\\\\.\\\\s]{1,2}([\\\\w\\\\/\\\\-\\\\{\\\\(\\\\. ]{3,20                                                       }(@|a|f)\\\\s?[\\\\w\\\\/\\\\-\\\\{\\\\(\\\\. ]{3,20}(\\\\. \\\\w{2,4}\\\\b|\\\\.\\\\B|\\\\.\\\\w{1,4}\\\\b))\"",true,1,\""PII\"",21,\""Personal information found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n    end""",[PII.1.2]
+218,"""0: Combine address parts from ai to CBI_address (department is mandatory)""","""\n    when\n        Section(aiMatchesType(\""DEPARTMENT\""))\n    then\n        section.combineAiTypes(\""DEPARTMENT\"", \""ORG,STREET,POSTAL,COUNTRY,CARDINAL,CITY,STATE\"", 20, \""CBI_address\"", 3, false);\n    end""",[AI.1.0]
+219,"""0: Combine address parts from ai to CBI_address (street is mandatory)""","""\n    when\n        Section(aiMatchesType(\""STREET\""))\n    then\n        section.combineAiTypes(\""STREET\"", \""ORG,DEPARTMENT,POSTAL,COUNTRY,CARDINAL,CITY,STATE\"", 20, \""CBI_address\"", 3, false);\n    end""",[AI.1.0]
+220,"""19b: Add recommendation for PII after Contact Person""","""\n    when\n        Section(searchText.toLowerCase().contains(\""contact person:\""))\n    then\n        section.recommendLineAfter(\""Contact Person\"", \""PII\"");\n        section.recommendLineAfter(\""Contact person\"", \""PII\"");\n        section.recommendLineAfter(\""contact person\"", \""PII\"");\n        section.recommendLineAfter(\""Contact Person:\"", \""PII\"");\n        section.recommendLineAfter(\""Contact person:\"", \""PII\"");\n        section.recommendLineAfter(\""contact person:\"", \""PII\"");\n    end""",[PII.13.0]
+221,"""0: Combine address parts from ai to CBI_address (org is mandatory)""","""\n    when\n        Section(aiMatchesType(\""ORG\""))\n    then\n        section.combineAiTypes(\""ORG\"", \""DEPARTMENT,STREET,POSTAL,COUNTRY,CARDINAL,CITY,STATE\"", 20, \""CBI_address\"", 3, false);\n    end""",[AI.1.0]
+222,"""25a: Redact phone numbers without indicators""","""\n    when\n        Section(text.contains(\""+\""))\n    then\n        section.redactByRegEx(\""(\\\\+[\\\\dO]{1,2} )(\\\\([\\\\dO]{1,3}\\\\))?[\\\\d\\\\-O ]{8,15}\"",false,0,\""PII\"",25,\""Personal information found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n    end""",[PII.2.2]
+223,"""34: Dossier""","""\n    when\n        Section(matchesType(\""dossier_redaction\""))\n    then\n        section.redact(\""dossier_redaction\"", 34, \""Dossier redaction found\"", \""Article 63(2)(a) of Regulation (EC) No 1107/2009 (making reference to Article 39 of Regulation EC No  178/2002)\"");\n    end""","[ETC.4.0, ETC.4.1, ETC.4.2]"
+224,"""30: Redact AUTHOR(S) (Vertebrate study)""","""\n    when\n        Section(fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"")\n            && searchText.toUpperCase().contains(\""AUTHOR(S):\"")\n            && searchText.toUpperCase().contains(\""STUDY COMPLETION DATE:\"")\n        )\n    then\n        section.redactLinesBetween(\""AUTHOR(S):\"", \""STUDY COMPLETION DATE:\"", \""CBI_author\"", 30, true, \""AUTHOR(S) was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactLinesBetween(\""Author(s):\"", \""Study Completion Date:\"", \""CBI_author\"", 30, true, \""AUTHOR(S) was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactLinesBetween(\""Author(s):\"", \""Study completion Date:\"", \""CBI_author\"", 30, true, \""AUTHOR(S) was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactLinesBetween(\""AUTHOR(S):\\n\"", \""STUDY COMPLETION DATE:\"", \""CBI_author\"", 30, true, \""AUTHOR(S) was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactLinesBetween(\""Author(s):\\n\"", \""Study Completion Date:\"", \""CBI_author\"", 30, true, \""AUTHOR(S) was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactLinesBetween(\""Author(s):\\n\"", \""Study completion Date:\"", \""CBI_author\"", 30, true, \""AUTHOR(S) was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n    end""",[PII.9.1]
+225,"""30a: Redact AUTHOR(S) (Vertebrate study)""","""\n    when\n        Section(fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"")\n            && searchText.toUpperCase().contains(\""AUTHOR(S)\"")\n            && !searchText.toUpperCase().contains(\""AUTHOR(S):\"")\n            && searchText.toUpperCase().contains(\""STUDY COMPLETION DATE\"")\n        )\n    then\n        section.redactLinesBetween(\""AUTHOR(S)\"", \""STUDY COMPLETION DATE\"", \""CBI_author\"", 30, true, \""AUTHOR(S) was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactLinesBetween(\""Author(s)\"", \""Study Completion Date\"", \""CBI_author\"", 30, true, \""Author(s) was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactLinesBetween(\""Author(s)\"", \""Study completion Date\"", \""CBI_author\"", 30, true, \""Author(s) was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactLinesBetween(\""AUTHOR(S)\\n\"", \""STUDY COMPLETION DATE\"", \""CBI_author\"", 30, true, \""AUTHOR(S) was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactLinesBetween(\""Author(s)\\n\"", \""Study Completion Date\"", \""CBI_author\"", 30, true, \""Author(s) was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactLinesBetween(\""Author(s)\\n\"", \""Study completion Date\"", \""CBI_author\"", 30, true, \""Author(s) was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n    end""",[PII.9.1]
+226,"""29a: Redact AUTHOR(S) (Non vertebrate study)""","""\n    when\n        Section(!fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"")\n            && searchText.toUpperCase().contains(\""AUTHOR(S)\"")\n            && !searchText.toUpperCase().contains(\""AUTHOR(S):\"")\n            && searchText.toUpperCase().contains(\""STUDY COMPLETION DATE\"")\n        )\n    then\n        section.redactLinesBetween(\""AUTHOR(S)\"", \""STUDY COMPLETION DATE\"", \""CBI_author\"", 29, true, \""AUTHOR(S) was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n        section.redactLinesBetween(\""Author(s)\"", \""Study Completion Date\"", \""CBI_author\"", 29, true, \""Author(s) was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n        section.redactLinesBetween(\""Author(s)\"", \""Study completion Date\"", \""CBI_author\"", 29, true, \""Author(s) was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n        section.redactLinesBetween(\""AUTHOR(S)\\n\"", \""STUDY COMPLETION DATE\"", \""CBI_author\"", 29, true, \""AUTHOR(S) was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n        section.redactLinesBetween(\""Author(s)\\n\"", \""Study Completion Date\"", \""CBI_author\"", 29, true, \""Author(s) was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n        section.redactLinesBetween(\""Author(s)\\n\"", \""Study completion Date\"", \""CBI_author\"", 29, true, \""Author(s) was found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n    end""",[PII.9.0]
+227,"""28: Redact AUTHOR(S) (Vertebrate study)""","""\n    when\n        Section(fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"")\n            && searchText.toUpperCase().contains(\""AUTHOR(S):\"")\n            && searchText.toUpperCase().contains(\""COMPLETION DATE:\"")\n            && !searchText.toUpperCase().contains(\""STUDY COMPLETION DATE:\"")\n        )\n    then\n        section.redactLinesBetween(\""AUTHOR(S):\"", \""COMPLETION DATE:\"", \""CBI_author\"", 28, true, \""AUTHOR(S) was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactLinesBetween(\""Author(s):\"", \""Completion Date:\"", \""CBI_author\"", 28, true, \""AUTHOR(S) was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactLinesBetween(\""AUTHOR(S):\\n\"", \""COMPLETION DATE:\"", \""CBI_author\"", 28, true, \""AUTHOR(S) was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n        section.redactLinesBetween(\""Author(s):\\n\"", \""Completion Date:\"", \""CBI_author\"", 28, true, \""AUTHOR(S) was found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n    end""",[PII.9.1]
+228,"""30b: Redact short Authors section""","""\n    when\n        Section(\n            fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"")\n            && searchText.toLowerCase().contains(\""author(s)\"")\n            && searchText.length() < 50\n            && sectionNumber <= 20\n            && !aiMatchesType(\""CBI_Author\"")\n        )\n    then\n        section.redactByRegEx(\""(?<=author\\\\(?s\\\\)?\\\\s\\\\n?)([\\\\p{Lu}\\\\p{L} ]{5,15}(,|\\\\n)?){1,3}\"",true,0,\""CBI_author\"",30,\""AUTHOR(S) was found\"",\""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n    end""",[CBI.21.1]
+229,"""26: Redact Phone and Fax by RegEx (Vertebrate study)""","""\n    when\n        Section(fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && (\n               text.contains(\""Contact\"")\n            || text.contains(\""Telephone\"")\n            || text.contains(\""Téléphone\"")\n            || text.contains(\""Phone\"")\n            || text.contains(\""Fax\"")\n            || text.contains(\""Tel\"")\n            || text.contains(\""Ter\"")\n            || text.contains(\""Mobile\"")\n            || text.contains(\""Fel\"")\n            || text.contains(\""Fer\"")\n        ))\n    then\n        section.redactByRegEx(\""\\\\b(contact|t\\\\p{Ll}l\\\\p{Ll}phone|phone|fax|tel|ter|mobile|fel|fer)[a-zA-Z\\\\s]{0,10}[:.\\\\s]{0,3}([\\\\+\\\\d\\\\(O][\\\\s\\\\d\\\\(\\\\)\\\\-\\\\/\\\\.O]{4,100}\\\\d)\\\\b\"", true, 2, \""PII\"", 26, \""Personal information found\"", \""Article 39(e)(2) of Regulation (EC) No 178/2002\"");\n    end""",[PII.2.1]
+230,"""60: Redact Must Impurities""","""\n    when\n        Section((fileAttributeByLabelEqualsIgnoreCase(\""Redact Impurities\"",\""Yes\"") || fileAttributeByLabelEqualsIgnoreCase(\""Redact Impurities\"",\""Y\"")) && matchesType(\""impurities\""))\n    then\n        section.redact(\""impurities\"", 60, \""Impurity found\"", \""Article 63(2)(b) of Regulation (EC) No 1107/2009\"");\n    end""",[ETC.9.1]
+231,"""21: Redact Emails by RegEx (Non vertebrate study)""","""\n    when\n        Section(!fileAttributeByLabelEqualsIgnoreCase(\""Vertebrate Study\"",\""Yes\"") && searchText.contains(\""@\""))\n    then\n        section.redactByRegEx(\""\\\\b([A-Za-z0-9._%+\\\\-]+@\\\\s?[A-Za-z0-9.\\\\-]+\\\\.[A-Za-z\\\\-]{1,23}[A-Za-z])\\\\b\"", true, 1, \""PII\"", 21, \""Personal information found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n    end""",[PII.2.0]
+232,"""21a: Redact typoed Emails with indicator""","""\n    when\n        Section(searchText.contains(\""@\"") || searchText.toLowerCase().contains(\""mail\""))\n    then\n        section.redactByRegEx(\""mail[:\\\\.\\\\s]{1,2}([\\\\w\\\\/\\\\-\\\\{\\\\(\\\\. ]{3,20}(@|a|f)\\\\s?[\\\\w\\\\/\\\\-\\\\{\\\\(\\\\. ]{3,20}(\\\\. \\\\w{2,4}\\\\b|\\\\.\\\\B|\\\\.\\\\w{1,4}\\\\b))\"",true,1,\""PII\"",21,\""Personal information found\"", \""Article 39(e)(3) of Regulation (EC) No 178/2002\"");\n    end""",[PII.1.2]

redaction-service-v1/rules-management/src/main/resources/order_template.txt

@@ -0,0 +1,13 @@
+H
+DOC
+TAB
+SYN
+CBI
+PII
+*
+ETC
+AI
+MAN
+X
+FA
+LDS

redaction-service-v1/rules-management/src/test/java/com/knecon/fforesight/utility/rules/management/DroolsCompilationTest.java

@@ -0,0 +1,80 @@
+package com.knecon.fforesight.utility.rules.management;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.io.IOException;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+
+import org.junit.jupiter.api.Test;
+import org.kie.api.KieServices;
+import org.kie.api.builder.KieBuilder;
+import org.kie.api.builder.KieFileSystem;
+import org.kie.api.builder.Message;
+import org.kie.api.io.Resource;
+import org.kie.api.io.ResourceType;
+
+import com.google.common.io.Resources;
+
+import lombok.Builder;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class DroolsCompilationTest {
+
+    @Test
+    public void testValidateRuleSyntax() throws IOException {
+
+        URL rmURL = Resources.getResource("all_redact_manager_rules.drl");
+        String rmRule = Resources.toString(rmURL, StandardCharsets.UTF_8);
+
+        URL dmURL = Resources.getResource("all_rules_documine.drl");
+        String dmRule = Resources.toString(dmURL, StandardCharsets.UTF_8);
+
+        assertTrue(validateRuleSyntax(rmRule).isValid());
+        assertTrue(validateRuleSyntax(dmRule).isValid());
+
+        // Invalidate rules
+        rmRule = rmRule.substring(0, rmRule.length()-3);
+        dmRule = dmRule.substring(0, dmRule.length()-3);
+
+        var validateRM = validateRuleSyntax(rmRule);
+        var validateDM = validateRuleSyntax(dmRule);
+        assertFalse(validateRM.isValid());
+        assertFalse(validateRM.getFailReason().contains("mismatched input '<eof>'"));
+        assertFalse(validateDM.isValid());
+        assertFalse(validateDM.getFailReason().contains("mismatched input '<eof>'"));
+    }
+
+    private RuleValidation validateRuleSyntax(String ruleContent) {
+
+        RuleValidation.RuleValidationBuilder ruleValidationBuilder = RuleValidation.builder();
+        KieServices kieServices = KieServices.Factory.get();
+        KieFileSystem kfs = kieServices.newKieFileSystem();
+        Resource resource = kieServices.getResources().newByteArrayResource(ruleContent.getBytes());
+        resource.setResourceType(ResourceType.DRL);
+        kfs.write("src/main/resources/rules.drl", resource);
+
+        KieBuilder kieBuilder = kieServices.newKieBuilder(kfs).buildAll();
+
+        if (kieBuilder.getResults().hasMessages(Message.Level.ERROR)) {
+            log.info("Rule syntax validation failed:");
+            for (Message result : kieBuilder.getResults().getMessages(Message.Level.ERROR)) {
+                ruleValidationBuilder.failReason(result.getText());
+            }
+            return ruleValidationBuilder.isValid(false).build();
+        }
+
+        return ruleValidationBuilder.isValid(true).build();
+    }
+
+    @Data
+    @Builder
+    public static class RuleValidation {
+
+        private boolean isValid;
+        private String failReason;
+    }
+}

redaction-service-v1/rules-management/src/test/java/com/knecon/fforesight/utility/rules/management/RuleFileBluePrintMergingTest.java

@@ -0,0 +1,20 @@
+package com.knecon.fforesight.utility.rules.management;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
+
+import com.knecon.fforesight.utility.rules.management.factory.RuleFileParser;
+import com.knecon.fforesight.utility.rules.management.models.RuleFileBluePrint;
+import com.knecon.fforesight.utility.rules.management.models.RuleIdentifier;
+
+public class RuleFileBluePrintMergingTest {
+
+    @Test
+    public void testBothRuleFilesCanBeMerged() {
+
+        RuleFileBluePrint combined = RuleFileParser.buildBluePrintFromAllRuleFiles();
+        assertEquals(1, combined.findRuleByIdentifier(RuleIdentifier.fromString("X.0.0")).size());
+    }
+
+}

redaction-service-v1/rules-management/src/test/java/com/knecon/fforesight/utility/rules/management/RuleFileMigrationTest.java

@@ -0,0 +1,56 @@
+package com.knecon.fforesight.utility.rules.management;
+
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+import com.knecon.fforesight.utility.rules.management.migration.RuleFileMigrator;
+
+import lombok.SneakyThrows;
+
+/**
+ * This test may be used to migrate dossier-templates and redaction-service ruleFiles all at once
+ * It loads the existing ruleFiles looks if there is a different version present in the rules-management. If it is present it is replaced by the rules-management version.
+ * From these blueprints it overwrites the existing rule files. Which means the order of rules may change according to order_template.txt.
+ * In comparison to the previous migration code this keeps Rules that are not present in the rules-management untouched. The order of these unknown rules may be adapted using the '*' symbol in the order-template.txt.
+ * The test does not add any additional rules using the default identifier lists.
+ * The test does not care about the applicationType, since it looks in both RM and DM all-rules files.
+ * It does not migrate Component Rules yet.
+ */
+public class RuleFileMigrationTest {
+
+    // Put your redaction service drools paths and dossier-templates paths both RM and DM here
+    static final List<String> ruleFileDirs = List.of(
+            "/home/kschuettler/iqser/redaction/redaction-service/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools",
+            "/home/kschuettler/iqser/fforesight/dossier-templates-v2/",
+            "/home/kschuettler/iqser/redaction/dossier-templates-v2/");
+
+
+    @Test
+    @SneakyThrows
+    @Disabled
+    void migrateAllEntityRules() {
+
+        for (String ruleFileDir : ruleFileDirs) {
+            Files.walk(Path.of(ruleFileDir)).filter(this::isEntityRuleFile).map(Path::toFile).peek(System.out::println).forEach(RuleFileMigrator::migrateFile);
+        }
+    }
+
+
+    private boolean isEntityRuleFile(Path path) {
+
+        File ruleFile = path.toFile();
+        if (!ruleFile.isFile()) {
+            return false;
+        }
+        if (!ruleFile.toString().endsWith(".drl")) {
+            return false;
+        }
+        return !ruleFile.getName().equals("componentRules.drl") && !ruleFile.getName().endsWith("_components.drl") && !ruleFile.getName().endsWith("OLD.drl");
+    }
+
+}

redaction-service-v1/rules-management/src/test/java/com/knecon/fforesight/utility/rules/management/factory/RuleFileFactoryTest.java

@@ -0,0 +1,187 @@
+package com.knecon.fforesight.utility.rules.management.factory;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Stream;
+
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+import com.knecon.fforesight.utility.rules.management.RuleManagementResources;
+import com.knecon.fforesight.utility.rules.management.models.ApplicationType;
+import com.knecon.fforesight.utility.rules.management.models.RuleIdentifier;
+import com.knecon.fforesight.utility.rules.management.utils.RuleFileIO;
+
+import lombok.SneakyThrows;
+
+class RuleFileFactoryTest {
+
+    @Test
+    @SneakyThrows
+    @Disabled
+    void migrateDossierTemplatesRepoToNewestRules() {
+
+        String dossierTemplatesRepo = "/Users/aisvoran/dev/dossier-templates-v2/";
+        migrate(ApplicationType.RM, dossierTemplatesRepo + "dev", dossierTemplatesRepo + "docu", dossierTemplatesRepo + "qa");
+    }
+
+
+    @Test
+    @SneakyThrows
+    @Disabled
+    public void migrateDocumineDossierTemplatesRepoToNewestRules() {
+
+        String dossierTemplatesRepo = "/Users/aisvoran/dev/documine/dossier-templates-v2/dev/";
+        migrate(ApplicationType.DM, dossierTemplatesRepo + "Flora", dossierTemplatesRepo + "Basf-Demo");
+    }
+
+
+    @SneakyThrows
+    private void migrate(ApplicationType applicationType, String... paths) {
+
+        Arrays.stream(paths).forEach(path -> {
+            try {
+                Stream.of(Files.walk(Path.of(path))).flatMap(Function.identity()).filter(p -> p.getFileName().toString().equals("rules.drl"))//
+                        .map(Path::toFile)//
+                        .forEach(e -> migrateFile(e, applicationType));
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        });
+
+    }
+
+
+    @SneakyThrows
+    private void migrateFile(File oldRulesFile, ApplicationType applicationType) {
+
+        Set<RuleIdentifier> identifiers = RuleFileParser.parseRuleIdentifiersFromFile(oldRulesFile);
+        String newRulesString = RuleFileFactory.createFileFromIdentifiers(identifiers, applicationType);
+
+        try (FileOutputStream out = new FileOutputStream(oldRulesFile); OutputStreamWriter outWrite = new OutputStreamWriter(out,
+                StandardCharsets.UTF_8); BufferedWriter writer = new BufferedWriter(outWrite)) {
+            writer.write(newRulesString);
+        }
+    }
+
+
+    @Test
+    @Disabled
+    void createFileFromIdentifiers() {
+
+        String result = RuleFileFactory.createFileFromIdentifiers("MAN, X, LDS, CBI.0, PII.0.1", ApplicationType.RM);
+        System.out.println(result);
+    }
+
+
+    @Test
+    @SneakyThrows
+    @Disabled
+    void createFileFromIdentifiersForRedactionService() {
+
+        // This is exactly the string used for the current rules.drl in the redaction-service
+        String identifiers = "CBI.5.*, CBI.9.*, CBI.11.*, AI.1.*, PII.4.*, ETC.8.*, PII.0.*, ETC.6.*, SYN.0.*, CBI.3.*, ETC.4.*, ETC.3.*, PII.12.*, ETC.1.*, PII.9.*, PII.7.*, CBI.12.*, X.*.*, CBI.14.*, CBI.16.*, CBI.18.*, CBI.4.*, AI.0.*, CBI.8.*, PII.1.*, ETC.7.*, LDS.*.*, MAN.*.*, ETC.5.*, PII.11.*, ETC.2.*, CBI.20.*, FA.*.*, PII.8.*, PII.6.*, CBI.15.*, CBI.17.*, CBI.19.*";
+        String result = RuleFileFactory.createFileFromIdentifiers(identifiers, ApplicationType.RM);
+        System.out.println(result);
+        try (var out = new FileOutputStream(
+//                "/home/kschuettler/iqser/redaction/redaction-service/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/rules.drl")) {
+                "/home/aoezyetimoglu/repositories/rulesALI.drl")) {
+            out.write(result.getBytes(StandardCharsets.UTF_8));
+        }
+    }
+
+
+    @Test
+    @SneakyThrows
+    @Disabled
+    void createFileFromEFSARegulationV1ForRedactionService() {
+
+        URL url = getClass().getClassLoader().getResource("dossier_templates_new_format/qa/EFSA_sanitisation_GFL_v1/rules.txt");
+        File file = new File(url.getFile());
+        var identifiers = RuleFileParser.parseRuleIdentifiersFromFile(file);
+        var newRulesString = RuleFileFactory.createFileFromIdentifiers(identifiers, ApplicationType.RM);
+        try (var out = new FileOutputStream(
+//                "/home/kschuettler/iqser/redaction/redaction-service/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/acceptance_rules.drl")) {
+                "/home/aoezyetimoglu/repositories/rulesALI2.drl")) {
+            out.write(newRulesString.getBytes(StandardCharsets.UTF_8));
+        }
+    }
+
+
+    @Test
+    @SneakyThrows
+    @Disabled
+    void assertAllRuleFileIsReconstructedExactlyIgnoringLineBreaks() {
+
+        String identifiers = "SYN,CBI,PII,ETC,AI,MAN,X,FA,LDS";
+        String actual = RuleFileFactory.createFileFromIdentifiers(identifiers, ApplicationType.RM).replace("\n", "");
+        String expected = new String(RuleManagementResources.getAllRulesInputStream(ApplicationType.RM).readAllBytes()).replace("\n", "");
+        assertEquals(expected, actual);
+    }
+
+
+    @Test
+    @Disabled
+    void createFileFromEmptyList() {
+
+        String result = RuleFileFactory.createFileFromIdentifiers("", ApplicationType.RM);
+        System.out.println(result);
+    }
+
+
+    /**
+     * Manual test to quickly unescape a rules file. Just change the path to whatever rule file you want to unescape
+     * and it will generate an 'output.txt' with the result.
+     */
+    @Test
+    @SneakyThrows
+    @Disabled
+    public void unescapeRulesFile() {
+
+        String pathToFile = "/Users/aisvoran/dev/rules-management/src/test/java/com/knecon/fforesight/utility/rules/management/factory/old.txt";
+        unescapeRulesFile(pathToFile, "output.txt");
+    }
+
+
+    /**
+     * Manual test to compare rules before and after updating them for easy checks.
+     */
+    @Test
+    @Disabled
+    public void updateRulesAndCompare() {
+
+        String pathToFile = "/Users/aisvoran/dev/dossier-templates-v2/dev/EFSA_sanitisation_pre_GFL_v1/rules.txt";
+        unescapeRulesFile(pathToFile, "old.txt");
+
+        String dossierTemplatesRepo = "/Users/aisvoran/dev/dossier-templates-v2/dev/";
+        migrate(ApplicationType.RM, dossierTemplatesRepo + "EFSA_sanitisation_pre_GFL_v1");
+
+        unescapeRulesFile(pathToFile, "new.txt");
+    }
+
+
+    @SneakyThrows
+    private void unescapeRulesFile(String pathToFile, String outputName) {
+
+        String escapedRules = RuleFileIO.getRulesString(pathToFile);
+
+        File output = new File(outputName);
+        FileOutputStream outputStream = new FileOutputStream(output.getName());
+        byte[] strToBytes = escapedRules.getBytes(StandardCharsets.UTF_8);
+        outputStream.write(strToBytes);
+        outputStream.close();
+    }
+
+}

redaction-service-v1/rules-management/src/test/java/com/knecon/fforesight/utility/rules/management/translation/OldRulesParserTest.java

@@ -0,0 +1,165 @@
+package com.knecon.fforesight.utility.rules.management.translation;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+import com.knecon.fforesight.utility.rules.management.RuleManagementResources;
+import com.knecon.fforesight.utility.rules.management.factory.RuleFileFactory;
+import com.knecon.fforesight.utility.rules.management.factory.RuleFileParser;
+import com.knecon.fforesight.utility.rules.management.models.ApplicationType;
+import com.knecon.fforesight.utility.rules.management.models.BasicRule;
+import com.knecon.fforesight.utility.rules.management.models.RuleIdentifier;
+import com.knecon.fforesight.utility.rules.management.models.RuleType;
+import com.knecon.fforesight.utility.rules.management.models.RuleUnit;
+import com.knecon.fforesight.utility.rules.management.utils.RuleFileIO;
+
+import lombok.SneakyThrows;
+
+class OldRulesParserTest {
+
+    @Test
+    @SneakyThrows
+    @Disabled
+    public void translateOldRulesToNewIdentifiersTest() {
+
+        try (InputStream inputStream = getClass().getClassLoader().getResourceAsStream("efsa_regulation_rules.txt")) {
+            String oldRulesString = new String(inputStream.readAllBytes());
+            Set<RuleIdentifier> identifiers = OldRulesParser.translateEscapedOldRulesStringToNewIdentifiers(oldRulesString, ApplicationType.RM);
+            System.out.println(identifiers);
+        }
+    }
+
+
+    @Test
+    @SneakyThrows
+    @Disabled
+    public void translateMoreOldRules() {
+
+        try (InputStream inputStream = getClass().getClassLoader().getResourceAsStream("basf/demo/table_demo.drl")) {
+            String oldRulesString = new String(inputStream.readAllBytes());
+            Set<RuleIdentifier> identifiers = OldRulesParser.translateOldRulesStringToNewIdentifiers(oldRulesString, ApplicationType.RM);
+            System.out.println(identifiers);
+        }
+    }
+
+
+    @Test
+    @Disabled
+    public void printTranslationsTest() {
+
+        List<OldRulesParser.OldRulesCsvRecord> records = OldRulesParser.getOldRulesCsvRecords(RuleManagementResources.getOldRulesCsvInputStream());
+        List.of(RuleType.fromString("SYN"), RuleType.fromString("CBI"), RuleType.fromString("PII"), RuleType.fromString("ETC"), RuleType.fromString("AI")).forEach(type -> {
+            List<RuleUnit> rulesOfClass = RuleFileParser.buildBluePrintFromAllRulesFile(ApplicationType.RM).findRuleClassByType(type).orElseThrow().ruleUnits();
+            rulesOfClass.forEach(unit -> printOldRulesThatTranslatesToNewRule(unit, records));
+        });
+    }
+
+
+    private void printOldRulesThatTranslatesToNewRule(RuleUnit ruleUnit, List<OldRulesParser.OldRulesCsvRecord> records) {
+
+        if (ruleUnit.rules().isEmpty()) {
+            System.out.println("Rule unit empty, skipping!\n");
+            return;
+        }
+        RuleIdentifier identifier = ruleUnit.rules().get(0).identifier();
+        RuleIdentifier unitIdentifier = new RuleIdentifier(identifier.type(), identifier.unit(), null);
+        String oldNames = records.stream()
+                .filter(r -> r.translatesTo().stream().anyMatch(i -> i.matches(unitIdentifier)))
+                .map(OldRulesParser.OldRulesCsvRecord::names)
+                .map(OldRulesParserTest::removeIdFromName)
+                .distinct()
+                .collect(Collectors.joining(", "));
+        System.out.println(unitIdentifier.toRuleUnitString() + " " + ruleUnit.rules().stream().map(BasicRule::name).collect(Collectors.joining(", ")));
+        System.out.println("translate from");
+        System.out.println(oldNames);
+        System.out.println();
+        System.out.println();
+    }
+
+
+    private static String removeIdFromName(String name) {
+
+        String[] values = name.split(":");
+        return String.join(":", Arrays.copyOfRange(values, 1, values.length));
+    }
+
+
+    @Test
+    @Disabled
+    @SneakyThrows
+    public void findAllCustomerRuleFilesInDossierTemplatesRepoAndTranslate() {
+
+        String dossierTemplatesRepo = getClass().getClassLoader().getResource("pilot/EFSA_sanitisation_GFL_v1").getFile();
+        RuleFileIO.streamAllRuleFilesInDirectory(Path.of(dossierTemplatesRepo))
+                .map(e -> OldRulesParser.translateOldRulesFileToNewIdentifiers(e, ApplicationType.RM))
+                .map(e -> RuleFileFactory.createFileFromIdentifiers(e, ApplicationType.RM))
+                .peek(System.out::println)
+                .map(RuleFileIO::escapeAndWrap)
+                .forEach(System.out::println);
+
+    }
+
+
+    @Test
+    @Disabled
+    @SneakyThrows
+    public void findAllRuleFilesInDossierTemplatesRepoAndTranslate() {
+
+        String dossierTemplatesRepo = getClass().getClassLoader().getResource("business-logic/Syngenta_RSS").getFile();
+        RuleFileIO.streamAllRuleFilesInDirectory(Path.of(dossierTemplatesRepo))
+                .map(e -> OldRulesParser.translateOldRulesFileToNewIdentifiers(e, ApplicationType.DM))
+                .map(e -> RuleFileFactory.createFileFromIdentifiers(e, ApplicationType.DM))
+                .peek(System.out::println)
+                .map(RuleFileIO::escapeAndWrap)
+                .forEach(System.out::println);
+
+    }
+
+
+    @Test
+    @Disabled
+    @SneakyThrows
+    public void translateDossierTemplatesV2() {
+
+//        String dossierTemplatesRepo = "/home/aoezyetimoglu/repositories/RED/dossier-templates-v2/";
+//        Stream.of(Files.walk(Path.of(dossierTemplatesRepo + "dev")), Files.walk(Path.of(dossierTemplatesRepo + "docu")), Files.walk(Path.of(dossierTemplatesRepo + "qa")))
+        String dossierTemplatesRepo = "/home/aoezyetimoglu/repositories/PROJECTMANAGEMENT/Syngenta/business-logic/";
+        Stream.of(Files.walk(Path.of(dossierTemplatesRepo + "dev")),
+                        Files.walk(Path.of(dossierTemplatesRepo + "dev-v2")),
+                        Files.walk(Path.of(dossierTemplatesRepo + "prod-cp-eu-reg")),
+                        Files.walk(Path.of(dossierTemplatesRepo + "prod-cp-global-reg")), Files.walk(Path.of(dossierTemplatesRepo + "prod-seeds-reg"))
+                        //
+                ).flatMap(Function.identity())//
+                .filter(path -> path.getFileName().toString().equals("rules.drl"))//
+                .map(Path::toFile)//
+                .forEach(this::translateOldRuleFile);
+
+    }
+
+
+    @SneakyThrows
+    private void translateOldRuleFile(File oldRulesFile) {
+
+        Set<RuleIdentifier> identifiers = OldRulesParser.translateOldRulesFileToNewIdentifiers(oldRulesFile, ApplicationType.RM);
+        String newRulesString = RuleFileFactory.createFileFromIdentifiers(identifiers, ApplicationType.RM);
+        String result = RuleFileIO.escapeAndWrap(newRulesString);
+
+        try (var out = new FileOutputStream(oldRulesFile)) {
+            out.write(result.getBytes(StandardCharsets.UTF_8));
+        }
+    }
+
+}

redaction-service-v1/rules-management/src/test/resources/dossier_templates_v2/dev/Manual_Redaction/rules.txt

@@ -0,0 +1 @@
+"package drools\n\nimport com.iqser.red.service.redaction.v1.server.redaction.model.Section\n\nglobal Section section\n\n\n// --- NO RULES HERE --- MANUAL REDACTION ONLY --- //\n"