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

- fixed nasty bug in search(). $mode was used twice in function parameters

Browse Source
This commit is contained in:
steinm 2012-01-17 08:36:08 +00:00
parent 7e521aa372
commit d8a03bef7c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
LetoDMS_Core/Core/inc.ClassDMS.php
View File

@ -423,7 +423,7 @@ class LetoDMS_Core_DMS {
* @param query string seach query with space separated words * @param query string seach query with space separated words
* @param limit integer number of items in result set * @param limit integer number of items in result set
* @param offset integer index of first item in result set * @param offset integer index of first item in result set
* @param mode string either AND or OR * @param logicalmode string either AND or OR
* @param searchin array() list of fields to search in * @param searchin array() list of fields to search in
* 1 = keywords, 2=name, 3=comment * 1 = keywords, 2=name, 3=comment
* @param startFolder object search in the folder only (null for root folder) * @param startFolder object search in the folder only (null for root folder)
@ -438,7 +438,7 @@ class LetoDMS_Core_DMS {
* 0x3 = both * 0x3 = both
* @return array containing the elements total and docs * @return array containing the elements total and docs
*/ */
function search($query, $limit=0, $offset=0, $mode='AND', $searchin=array(), $startFolder=null, $owner=null, $status = array(), $creationstartdate=array(), $creationenddate=array(), $categories=array(), $mode=0x3) { /* {{{ */ function search($query, $limit=0, $offset=0, $logicalmode='AND', $searchin=array(), $startFolder=null, $owner=null, $status = array(), $creationstartdate=array(), $creationenddate=array(), $categories=array(), $mode=0x3) { /* {{{ */
// Split the search string into constituent keywords. // Split the search string into constituent keywords.
$tkeys=array(); $tkeys=array();
if (strlen($query)>0) { if (strlen($query)>0) {
@ -467,7 +467,7 @@ class LetoDMS_Core_DMS {
foreach ($tkeys as $key) { foreach ($tkeys as $key) {
$key = trim($key); $key = trim($key);
if (strlen($key)>0) { if (strlen($key)>0) {
$searchKey = (strlen($searchKey)==0 ? "" : $searchKey." ".$mode." ").$concatFunction." LIKE ".$this->db->qstr('%'.$key.'%'); $searchKey = (strlen($searchKey)==0 ? "" : $searchKey." ".$logicalmode." ").$concatFunction." LIKE ".$this->db->qstr('%'.$key.'%');
} }
} }
} }
@ -580,7 +580,7 @@ class LetoDMS_Core_DMS {
foreach ($tkeys as $key) { foreach ($tkeys as $key) {
$key = trim($key); $key = trim($key);
if (strlen($key)>0) { if (strlen($key)>0) {
$searchKey = (strlen($searchKey)==0 ? "" : $searchKey." ".$mode." ").$concatFunction." LIKE ".$this->db->qstr('%'.$key.'%'); $searchKey = (strlen($searchKey)==0 ? "" : $searchKey." ".$logicalmode." ").$concatFunction." LIKE ".$this->db->qstr('%'.$key.'%');
} }
} }
} }