gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-14 13:42:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pass terms to view

Browse Source
This commit is contained in:
Uwe Steinmann 2023-01-09 15:31:05 +01:00
parent 2310395e46
commit 5e48d724ac
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
out/out.Search.php
View File

@ -66,6 +66,7 @@ if (isset($_GET["removecategory"]) && is_numeric($_GET["removecategory"]) && $_G
$removecategory = (int) $_GET['removecategory']; $removecategory = (int) $_GET['removecategory'];
} }
$terms = [];
$limit = (isset($_GET["limit"]) && is_numeric($_GET["limit"])) ? (int) $_GET['limit'] : 20; $limit = (isset($_GET["limit"]) && is_numeric($_GET["limit"])) ? (int) $_GET['limit'] : 20;
$fullsearch = ((!isset($_GET["fullsearch"]) && $settings->_defaultSearchMethod == 'fulltext') || !empty($_GET["fullsearch"])) && $settings->_enableFullSearch; $fullsearch = ((!isset($_GET["fullsearch"]) && $settings->_defaultSearchMethod == 'fulltext') || !empty($_GET["fullsearch"])) && $settings->_enableFullSearch;
if($fullsearch) { if($fullsearch) {
@ -190,6 +191,7 @@ if($fullsearch) {
$total = 0; $total = 0;
$index = $fulltextservice->Indexer(); $index = $fulltextservice->Indexer();
if($index) { if($index) {
// $terms = $index->terms($_GET['query']);
$lucenesearch = $fulltextservice->Search(); $lucenesearch = $fulltextservice->Search();
$searchresult = $lucenesearch->search($query, array('record_type'=>$record_type, 'owner'=>$ownernames, 'status'=>$status, 'category'=>$categorynames, 'user'=>$user->isAdmin() ? [] : [$user->getLogin()], 'mimetype'=>$mimetype, 'startFolder'=>$startFolder, 'rootFolder'=>$rootFolder), ($pageNumber == 'all' ? array() : array('limit'=>$limit, 'offset'=>$limit * ($pageNumber-1)))); $searchresult = $lucenesearch->search($query, array('record_type'=>$record_type, 'owner'=>$ownernames, 'status'=>$status, 'category'=>$categorynames, 'user'=>$user->isAdmin() ? [] : [$user->getLogin()], 'mimetype'=>$mimetype, 'startFolder'=>$startFolder, 'rootFolder'=>$rootFolder), ($pageNumber == 'all' ? array() : array('limit'=>$limit, 'offset'=>$limit * ($pageNumber-1))));
if($searchresult === false) { if($searchresult === false) {
@ -575,6 +577,7 @@ if($settings->_showSingleSearchHit && count($entries) == 1) {
$view->setParam('changecategory', $changecategory); $view->setParam('changecategory', $changecategory);
$view->setParam('removecategory', $removecategory); $view->setParam('removecategory', $removecategory);
$view->setParam('searchhits', $entries); $view->setParam('searchhits', $entries);
$view->setParam('terms', $terms);
$view->setParam('totalpages', $totalPages); $view->setParam('totalpages', $totalPages);
$view->setParam('pagenumber', $pageNumber); $view->setParam('pagenumber', $pageNumber);
$view->setParam('limit', $limit); $view->setParam('limit', $limit);