gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-03-11 16:35:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

the limit passed to doSearch applys to the filtered result

Browse Source 
previous the limit was applied to search befored filtering the
result by access rights. This can easily cause empty result sets if
the user has access to few documents. Now the search returns all
hits and limit will be applied when the documents are filtered by
access rights
This commit is contained in:
Uwe Steinmann 2015-03-13 07:49:58 +01:00
parent fd94361b9a
commit 7a1856bc5d
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
restapi/index.php
View File

@ -679,20 +679,30 @@ function doSearch() { /* {{{ */
$querystr = $app->request()->get('query'); $querystr = $app->request()->get('query');
$mode = $app->request()->get('mode'); $mode = $app->request()->get('mode');
if(!$limit = $app->request()->get('limit')) if(!$limit = $app->request()->get('limit'))
$limit = 50; $limit = 8;
$resArr = $dms->search($querystr, $limit); $resArr = $dms->search($querystr, $limit);
$entries = array(); $entries = array();
$count = 0;
if($resArr['folders']) { if($resArr['folders']) {
foreach ($resArr['folders'] as $entry) { foreach ($resArr['folders'] as $entry) {
if ($entry->getAccessMode($userobj) >= M_READ) { if ($entry->getAccessMode($userobj) >= M_READ) {
$entries[] = $entry; $entries[] = $entry;
if($count < $limit)
$count++;
else
break;
} }
} }
} }
$count = 0;
if($resArr['docs']) { if($resArr['docs']) {
foreach ($resArr['docs'] as $entry) { foreach ($resArr['docs'] as $entry) {
if ($entry->getAccessMode($userobj) >= M_READ) { if ($entry->getAccessMode($userobj) >= M_READ) {
$entries[] = $entry; $entries[] = $entry;
if($count < $limit)
$count++;
else
break;
} }
} }
} }