From b5964ffd38b4cc87addc235676e81b63e87ec6b0 Mon Sep 17 00:00:00 2001 From: Michael Mayer Date: Mon, 20 Sep 2021 22:39:29 +0200 Subject: [PATCH] Search: Improve "keywords" filter --- internal/search/photos.go | 2 +- internal/search/photos_geo.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/search/photos.go b/internal/search/photos.go index 5f0bd5fd1..746d29405 100644 --- a/internal/search/photos.go +++ b/internal/search/photos.go @@ -219,7 +219,7 @@ func Photos(f form.PhotoSearch) (results PhotoResults, count int, err error) { // Search for one or more keywords? if f.Keywords != "" { - for _, where := range LikeAllKeywords("k.keyword", f.Keywords) { + for _, where := range LikeAnyKeyword("k.keyword", f.Keywords) { s = s.Where("photos.id IN (SELECT pk.photo_id FROM keywords k JOIN photos_keywords pk ON k.id = pk.keyword_id WHERE (?))", gorm.Expr(where)) } } diff --git a/internal/search/photos_geo.go b/internal/search/photos_geo.go index d817311f0..4d3a5ec97 100644 --- a/internal/search/photos_geo.go +++ b/internal/search/photos_geo.go @@ -109,7 +109,7 @@ func PhotosGeo(f form.PhotoSearchGeo) (results GeoResults, err error) { // Search for one or more keywords? if f.Keywords != "" { - for _, where := range LikeAllKeywords("k.keyword", f.Keywords) { + for _, where := range LikeAnyKeyword("k.keyword", f.Keywords) { s = s.Where("photos.id IN (SELECT pk.photo_id FROM keywords k JOIN photos_keywords pk ON k.id = pk.keyword_id WHERE (?))", gorm.Expr(where)) } }