Skip to content

Add offset for home limited searches #18342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rullzer merged 1 commit into from
Dec 11, 2019
Merged

Add offset for home limited searches #18342

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Add offset for home limited searches 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
  • Loading branch information
@rullzer
rullzer committed Dec 10, 2019
commit 73ce7f6c8a1d361023d27c9d3548586c49d7dce9
4 changes: 3 additions & 1 deletion apps/dav/lib/Files/FileSearchBackend.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,7 @@ private function transformQuery(Query $query): ISearchQuery {
// TODO offset
$limit = $query->limit;
$orders = array_map([$this, 'mapSearchOrder'], $query->orderBy);
$offset = 0;

$limitHome = false;
$ownerProp = $this->extractWhereValue($query->where, FilesPlugin::OWNER_ID_PROPERTYNAME, Operator::OPERATION_EQUAL);
Expand All @@ -284,12 +285,13 @@ private function transformQuery(Query $query): ISearchQuery {
} else {
throw new \InvalidArgumentException("Invalid search value for '{http://owncloud.org/ns}owner-id', only the current user id is allowed");
}
$offset = $limit->firstResult;
}

return new SearchQuery(
$this->transformSearchOperation($query->where),
(int)$limit->maxResults,
0,
$offset,
$orders,
$this->user,
$limitHome
Expand Down