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

check if search fields are set

Browse Source
This commit is contained in:
Uwe Steinmann 2020-09-14 09:33:01 +02:00
parent c93faff257
commit b47e53637d
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
SeedDMS_Lucene/Lucene/Search.php
View File

@ -63,7 +63,7 @@ class SeedDMS_Lucene_Search {
$querystr = ''; $querystr = '';
if($term) if($term)
$querystr .= trim($term); $querystr .= trim($term);
if(isset($fields['owner'])) { if(!empty($fields['owner'])) {
if(is_string($owner)) { if(is_string($owner)) {
if($querystr) if($querystr)
$querystr .= ' && '; $querystr .= ' && ';
@ -76,21 +76,21 @@ class SeedDMS_Lucene_Search {
$querystr .= '")'; $querystr .= '")';
} }
} }
if(isset($fields['category'])) { if(!empty($fields['category'])) {
if($querystr) if($querystr)
$querystr .= ' && '; $querystr .= ' && ';
$querystr .= '(category:"'; $querystr .= '(category:"';
$querystr .= implode('" || category:"', $fields['category']); $querystr .= implode('" || category:"', $fields['category']);
$querystr .= '")'; $querystr .= '")';
} }
if(isset($fields['status'])) { if(!empty($fields['status'])) {
if($querystr) if($querystr)
$querystr .= ' && '; $querystr .= ' && ';
$querystr .= '(status:"'; $querystr .= '(status:"';
$querystr .= implode('" || status:"', $fields['status']); $querystr .= implode('" || status:"', $fields['status']);
$querystr .= '")'; $querystr .= '")';
} }
if(isset($fields['user'])) { if(!empty($fields['user'])) {
if($querystr) if($querystr)
$querystr .= ' && '; $querystr .= ' && ';
$querystr .= '(users:"'; $querystr .= '(users:"';

8
SeedDMS_SQLiteFTS/SQLiteFTS/Search.php
View File

@ -63,7 +63,7 @@ class SeedDMS_SQliteFTS_Search {
$querystr = ''; $querystr = '';
if($term) if($term)
$querystr .= trim($term); $querystr .= trim($term);
if(isset($fields['owner'])) { if(!empty($fields['owner'])) {
if(is_string($fields['owner'])) { if(is_string($fields['owner'])) {
if($querystr) if($querystr)
$querystr .= ' '; $querystr .= ' ';
@ -76,14 +76,14 @@ class SeedDMS_SQliteFTS_Search {
$querystr .= ')'; $querystr .= ')';
} }
} }
if(isset($fields['category'])) { if(!empty($fields['category'])) {
if($querystr) if($querystr)
$querystr .= ' '; $querystr .= ' ';
$querystr .= '(category:'; $querystr .= '(category:';
$querystr .= implode(' OR category:', $fields['category']); $querystr .= implode(' OR category:', $fields['category']);
$querystr .= ')'; $querystr .= ')';
} }
if(isset($fields['status'])) { if(!empty($fields['status'])) {
if($querystr) if($querystr)
$querystr .= ' '; $querystr .= ' ';
$status = array_map(function($v){return $v+10;}, $fields['status']); $status = array_map(function($v){return $v+10;}, $fields['status']);
@ -91,7 +91,7 @@ class SeedDMS_SQliteFTS_Search {
$querystr .= implode(' OR status:', $status); $querystr .= implode(' OR status:', $status);
$querystr .= ')'; $querystr .= ')';
} }
if(isset($fields['user'])) { if(!empty($fields['user'])) {
if($querystr) if($querystr)
$querystr .= ' '; $querystr .= ' ';
$querystr .= '(users:'; $querystr .= '(users:';