jeff/umap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow to create search index without changing unaccent mutability

Browse source 
cf #519
This commit is contained in:
Yohan Boniface 2023-05-10 11:47:29 +02:00
parent 1fce475e41
commit 7384fda61a
2 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
docs/install.md
View file

@ -84,13 +84,6 @@ may want to add an index. For that, you should do so:
CREATE EXTENSION unaccent; CREATE EXTENSION unaccent;
CREATE EXTENSION btree_gin; CREATE EXTENSION btree_gin;
ALTER FUNCTION unaccent(text) IMMUTABLE; CREATE TEXT SEARCH CONFIGURATION umapdict (COPY=simple);
ALTER FUNCTION to_tsvector(text) IMMUTABLE; ALTER TEXT SEARCH CONFIGURATION umapdict ALTER MAPPING FOR hword, hword_part, word WITH unaccent, simple;
CREATE INDEX search_idx ON umap_map USING gin(to_tsvector(unaccent(name)), share_status); CREATE INDEX IF NOT EXISTS search_idx ON umap_map USING GIN(to_tsvector('umapdict', name), share_status);
## Optimisations
To speed up uMap homepage rendering on a large instance, the following index can be added as well (make sure you set the center to your default instance map center):
CREATE INDEX umap_map_optim ON umap_map (modified_at) WHERE ("umap_map"."share_status" = 1 AND ST_Distance("umap_map"."center", ST_GeomFromEWKT('SRID=4326;POINT(2 51)')) > 1000.0);

4
umap/views.py
View file

@ -190,9 +190,9 @@ class Search(TemplateView, PaginatorMixin):
q = self.request.GET.get("q") q = self.request.GET.get("q")
results = [] results = []
if q: if q:
where = "to_tsvector(name) @@ plainto_tsquery(%s)" where = "to_tsvector(name) @@ websearch_to_tsquery(%s)"
if getattr(settings, "UMAP_USE_UNACCENT", False): if getattr(settings, "UMAP_USE_UNACCENT", False):
where = "to_tsvector(unaccent(name)) @@ plainto_tsquery(unaccent(%s))" # noqa where = "to_tsvector(unaccent(name)) @@ websearch_to_tsquery(unaccent(%s))" # noqa
results = Map.objects.filter(share_status=Map.PUBLIC) results = Map.objects.filter(share_status=Map.PUBLIC)
results = results.extra(where=[where], params=[q]) results = results.extra(where=[where], params=[q])
results = results.order_by("-modified_at") results = results.order_by("-modified_at")