From 4c5e79d53f71124273027e90c22511162655e42b Mon Sep 17 00:00:00 2001 From: Daniel Kesselberg Date: Thu, 14 Sep 2023 12:31:33 +0200 Subject: [PATCH] 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 --- apps/systemtags/lib/Search/TagSearchProvider.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/apps/systemtags/lib/Search/TagSearchProvider.php b/apps/systemtags/lib/Search/TagSearchProvider.php index 5c731e42cc3e0..2ff5cc984abd9 100644 --- a/apps/systemtags/lib/Search/TagSearchProvider.php +++ b/apps/systemtags/lib/Search/TagSearchProvider.php @@ -120,10 +120,7 @@ public function search(IUser $user, ISearchQuery $query): SearchResult { $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 ? [