Skip to content

Commit

Permalink
CDE-446 ajout cas avec accent
Browse files Browse the repository at this point in the history
  • Loading branch information
SamuelQuetin committed Sep 25, 2024
1 parent e4beff4 commit 1344ccf
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions src/main/java/fr/abes/sudoc/entity/notice/NoticeXml.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import fr.abes.sudoc.exception.ZoneNotFoundException;
import fr.abes.sudoc.utils.TYPE_DOCUMENT;
import fr.abes.sudoc.utils.TYPE_SUPPORT;
import fr.abes.sudoc.utils.Utilitaire;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
Expand Down Expand Up @@ -142,11 +143,12 @@ public boolean checkProviderIn035a(String provider) {
* @return true si le provider est contenu dans la zone / sous zone passée en paramètre
*/
public boolean checkProviderInZone(String provider, String zone, String sousZone) {
List<Datafield> listeZone = this.datafields.stream().filter(datafield -> datafield.getTag().equals(zone)).collect(Collectors.toList());
List<Datafield> listeZone = this.datafields.stream().filter(datafield -> datafield.getTag().equals(zone)).toList();
if (!listeZone.isEmpty()) {
for (Datafield datafield : listeZone) {
List<SubField> subFields = datafield.getSubFields().stream().filter(subField -> subField.getCode().equals(sousZone)).collect(Collectors.toList());
if (subFields.stream().anyMatch(sf -> sf.getValue().toLowerCase().contains(provider.toLowerCase(Locale.ROOT)))) return true;
List<SubField> subFields = datafield.getSubFields().stream().filter(subField -> subField.getCode().equals(sousZone)).toList();
if (subFields.stream().anyMatch(sf -> Utilitaire.replaceDiacritics(sf.getValue()).toLowerCase().contains(provider.toLowerCase(Locale.ROOT))))
return true;
}
}
return false;
Expand Down

0 comments on commit 1344ccf

Please sign in to comment.