Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: normalize special characters from search #363

Merged
merged 1 commit into from
Nov 13, 2024
Merged

fix: normalize special characters from search #363

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion apis_ontology/filtersets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
from django.contrib.postgres.search import TrigramWordSimilarity
from django.db.models.functions import Greatest
from django.db import models
import unicodedata

from apis_core.apis_entities.filtersets import AbstractEntityFilterSet
from apis_core.collections.models import SkosCollection, SkosCollectionContentObject
Expand All @@ -23,6 +24,12 @@ def remove_quotes(token):
return token.strip('"')


def remove_accents(input_str):
nfkd_form = unicodedata.normalize("NFKD", input_str)
only_ascii = nfkd_form.encode("ASCII", "ignore")
return only_ascii.decode()


################
# filter methods
################
Expand All @@ -49,7 +56,7 @@ def trigram_search_filter(queryset, fields, value):
trig_vector_list = []
for token in tokens:
for field in fields:
trig_vector_list.append(TrigramWordSimilarity(token, field))
trig_vector_list.append(TrigramWordSimilarity(remove_accents(token), field))
trig_vector = Greatest(*trig_vector_list, None)
return (
queryset.annotate(similarity=trig_vector)
Expand Down
Loading