From 35de0b5504c43722e4a7c66e8830687130652b23 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Tue, 27 Jun 2023 22:49:08 +0200 Subject: fix: cannot apply limit+offset on multi-tag-search Signed-off-by: Arthur Schiwon --- apps/dav/lib/Connector/Sabre/FilesReportPlugin.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'apps/dav') diff --git a/apps/dav/lib/Connector/Sabre/FilesReportPlugin.php b/apps/dav/lib/Connector/Sabre/FilesReportPlugin.php index 6122ba1bfe7..4b26d837779 100644 --- a/apps/dav/lib/Connector/Sabre/FilesReportPlugin.php +++ b/apps/dav/lib/Connector/Sabre/FilesReportPlugin.php @@ -338,9 +338,15 @@ class FilesReportPlugin extends ServerPlugin { // exposed in API yet if (!empty($systemTagIds)) { $tags = $this->tagManager->getTagsByIds($systemTagIds, $this->userSession->getUser()); + + // For we run DB queries per tag and require intersection, we cannot apply limit and offset for DB queries on multi tag search. + $oneTagSearch = count($tags) === 1; + $dbLimit = $oneTagSearch ? $limit ?? 0 : 0; + $dbOffset = $oneTagSearch ? $offset ?? 0 : 0; + foreach ($tags as $tag) { $tagName = $tag->getName(); - $tmpNodes = $this->userFolder->searchBySystemTag($tagName, $this->userSession->getUser()->getUID(), $limit ?? 0, $offset ?? 0); + $tmpNodes = $this->userFolder->searchBySystemTag($tagName, $this->userSession->getUser()->getUID(), $dbLimit, $dbOffset); if (count($nodes) === 0) { $nodes = $tmpNodes; } else { @@ -353,6 +359,10 @@ class FilesReportPlugin extends ServerPlugin { return $nodes; } } + + if (!$oneTagSearch && ($limit !== null || $offset !== null)) { + $nodes = array_slice($nodes, $offset, $limit); + } } return $nodes; -- cgit v1.2.3