From: Daniel Kesselberg Date: Thu, 14 Sep 2023 10:31:33 +0000 (+0200) Subject: fix: don't use davtags for tag search X-Git-Tag: v26.0.7~6^2 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a75d3e500491a65c224b954e3a2c7f8f6faef6b7;p=nextcloud-server.git fix: don't use davtags for tag search 1. https://github.com/nextcloud/server/pull/26813 Initial implementation with support for systemtags and davtags (vcategory) 2. https://github.com/nextcloud/server/pull/39062 Additional check if the given tag exists, though ISystemTagManager.getAllTags only looks for systemtags Therefore it's not possible anymore to search for davtags and unnecessary to join the other tables. Signed-off-by: Daniel Kesselberg --- diff --git a/apps/systemtags/lib/Search/TagSearchProvider.php b/apps/systemtags/lib/Search/TagSearchProvider.php index 5c731e42cc3..2ff5cc984ab 100644 --- a/apps/systemtags/lib/Search/TagSearchProvider.php +++ b/apps/systemtags/lib/Search/TagSearchProvider.php @@ -120,10 +120,7 @@ class TagSearchProvider implements IProvider { $userFolder = $this->rootFolder->getUserFolder($user->getUID()); $fileQuery = new SearchQuery( - new SearchBinaryOperator(SearchBinaryOperator::OPERATOR_OR, [ - new SearchComparison(ISearchComparison::COMPARE_LIKE, 'tagname', '%' . $query->getTerm() . '%'), - new SearchComparison(ISearchComparison::COMPARE_LIKE, 'systemtag', '%' . $query->getTerm() . '%'), - ]), + new SearchComparison(ISearchComparison::COMPARE_LIKE, 'systemtag', '%' . $query->getTerm() . '%'), $query->getLimit(), (int)$query->getCursor(), $query->getSortOrder() === ISearchQuery::SORT_DATE_DESC ? [