diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/SearchableText.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/SearchableText.java index 717fe3f3..f4195f6a 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/SearchableText.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/SearchableText.java @@ -26,10 +26,10 @@ public class SearchableText { } - public List getSequences(String searchString, boolean caseInSensitive) { + public List getSequences(String searchString, boolean caseInsensitive) { String normalizedSearchString; - if (caseInSensitive) { + if (caseInsensitive) { normalizedSearchString = searchString.toLowerCase(); } else { normalizedSearchString = searchString; @@ -44,34 +44,34 @@ public class SearchableText { TextPositionSequence partMatch = new TextPositionSequence(sequences.get(i).getPage()); for (int j = 0; j < sequences.get(i).length(); j++) { - if (i > 0 && j == 0 && sequences.get(i).charAt(0, caseInSensitive) == ' ' && sequences.get(i - 1) - .charAt(sequences.get(i - 1).length() - 1, caseInSensitive) == ' ' || j > 0 && sequences.get(i) - .charAt(j, caseInSensitive) == ' ' && sequences.get(i).charAt(j - 1, caseInSensitive) == ' ') { + if (i > 0 && j == 0 && sequences.get(i).charAt(0, caseInsensitive) == ' ' && sequences.get(i - 1) + .charAt(sequences.get(i - 1).length() - 1, caseInsensitive) == ' ' || j > 0 && sequences.get(i) + .charAt(j, caseInsensitive) == ' ' && sequences.get(i).charAt(j - 1, caseInsensitive) == ' ') { if (j == sequences.get(i).length() - 1 && counter != 0 && !partMatch.getTextPositions().isEmpty()) { crossSequenceParts.add(partMatch); } continue; } - if (j == 0 && sequences.get(i).charAt(j, caseInSensitive) != ' ' && i != 0 && sequences.get(i - 1) + if (j == 0 && sequences.get(i).charAt(j, caseInsensitive) != ' ' && i != 0 && sequences.get(i - 1) .charAt(sequences.get(i - 1) - .length() - 1, caseInSensitive) != ' ' && searchChars[counter] == ' ') { + .length() - 1, caseInsensitive) != ' ' && searchChars[counter] == ' ') { counter++; } if (sequences.get(i) - .charAt(j, caseInSensitive) == searchChars[counter] || counter != 0 && sequences.get(i) - .charAt(j, caseInSensitive) == '-') { + .charAt(j, caseInsensitive) == searchChars[counter] || counter != 0 && sequences.get(i) + .charAt(j, caseInsensitive) == '-') { if (counter != 0 || i == 0 && j == 0 || j != 0 && isSeparator(sequences.get(i) - .charAt(j - 1, caseInSensitive)) || j == 0 && i != 0 && isSeparator(sequences.get(i - 1) + .charAt(j - 1, caseInsensitive)) || j == 0 && i != 0 && isSeparator(sequences.get(i - 1) .charAt(sequences.get(i - 1) - .length() - 1, caseInSensitive)) || j == 0 && i != 0 && sequences.get(i - 1) - .charAt(sequences.get(i - 1).length() - 1, caseInSensitive) != ' ' && sequences.get(i) - .charAt(j, caseInSensitive) != ' ') { + .length() - 1, caseInsensitive)) || j == 0 && i != 0 && sequences.get(i - 1) + .charAt(sequences.get(i - 1).length() - 1, caseInsensitive) != ' ' && sequences.get(i) + .charAt(j, caseInsensitive) != ' ') { partMatch.add(sequences.get(i).textPositionAt(j)); if (!(j == sequences.get(i).length() - 1 && sequences.get(i) - .charAt(j, caseInSensitive) == '-' && searchChars[counter] != '-')) { + .charAt(j, caseInsensitive) == '-' && searchChars[counter] != '-')) { counter++; } } @@ -81,11 +81,11 @@ public class SearchableText { if (i == sequences.size() - 1 && j == sequences.get(i).length() - 1 || j != sequences.get(i) .length() - 1 && isSeparator(sequences.get(i) - .charAt(j + 1, caseInSensitive)) || j == sequences.get(i) + .charAt(j + 1, caseInsensitive)) || j == sequences.get(i) .length() - 1 && isSeparator(sequences.get(i + 1) - .charAt(0, caseInSensitive)) || j == sequences.get(i).length() - 1 && sequences.get(i) - .charAt(j, caseInSensitive) != ' ' && sequences.get(i + 1) - .charAt(0, caseInSensitive) != ' ') { + .charAt(0, caseInsensitive)) || j == sequences.get(i).length() - 1 && sequences.get(i) + .charAt(j, caseInsensitive) != ' ' && sequences.get(i + 1) + .charAt(0, caseInsensitive) != ' ') { finalMatches.addAll(buildEntityPositionSequence(crossSequenceParts)); }