gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-10-31 13:18:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

use fulltext search if set as default or explixitly asked for

Browse Source
This commit is contained in:
Uwe Steinmann 2020-12-13 09:37:38 +01:00
parent 582c00ce4e
commit 7b4cad6aa9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
out/out.Search.php
View File

@ -60,7 +60,7 @@ if (isset($_GET["navBar"])) {
$accessop = new SeedDMS_AccessOperation($dms, null, $user, $settings);
if(isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSearch) {
if((!empty($_GET["fullsearch"]) || $settings->_defaultSearchMethod == 'fulltext') && $settings->_enableFullSearch) {
// Search in Fulltext {{{
if (isset($_GET["query"]) && is_string($_GET["query"])) {
$query = $_GET["query"];
@ -537,10 +537,10 @@ if($settings->_showSingleSearchHit && count($entries) == 1) {
$view->setParam('maxRecursiveCount', $settings->_maxRecursiveCount);
$view->setParam('totaldocs', $dcount /*resArr['totalDocs']*/);
$view->setParam('totalfolders', $fcount /*resArr['totalFolders']*/);
$view->setParam('fullsearch', (isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSearch) ? true : false);
$view->setParam('fullsearch', ((!empty($_GET["fullsearch"]) || $settings->_defaultSearchMethod == 'fulltext') && $settings->_enableFullSearch) ? true : false);
$view->setParam('mode', isset($mode) ? $mode : '');
$view->setParam('orderby', isset($orderby) ? $orderby : '');
$view->setParam('defaultsearchmethod', $settings->_defaultSearchMethod);
$view->setParam('defaultsearchmethod', !empty($_GET["fullsearch"]) || $settings->_defaultSearchMethod);
$view->setParam('resultmode', isset($resultmode) ? $resultmode : '');
$view->setParam('searchin', isset($searchin) ? $searchin : array());
$view->setParam('startfolder', isset($startFolder) ? $startFolder : null);