mbirth/LuckyCoinkydink
1
0
Fork 0
Code Issues Pull Requests Activity

Patch by onli to improve quicksearch

Browse Source
This commit is contained in:
Garvin Hicking 2009-03-04 12:10:29 +00:00
parent daab40640e
commit 6628f392fd
2 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/NEWS
View File

@ -3,6 +3,9 @@
Version 1.5 ()
------------------------------------------------------------------------
* Enhance quicksearch by performing a wildcard-search for the
searchterms, when less than 4 matches are found. (onli)
* Updated czech translation, by Vlada Ajgl
* Use a space instead of comma to seperate DENY rules in spamblock

35
include/functions_entries.inc.php
View File

@ -722,11 +722,13 @@ function serendipity_rebuildCategoryTree($parent = 0, $left = 0) {
* @access public
* @param string The searchterm (may contain wildcards)
* @param int Restrict the number of results [also uses $serendipity['GET']['page'] for pagination]
* @param array Add search Results at the top
* @return array Returns the superarray of entries found
*/
function &serendipity_searchEntries($term, $limit = '') {
function &serendipity_searchEntries($term, $limit = '', $searchresults = '') {
global $serendipity;
$orig_limit = $limit;
if ($limit == '') {
$limit = $serendipity['fetchLimit'];
}
@ -817,10 +819,35 @@ function &serendipity_searchEntries($term, $limit = '') {
$search =& serendipity_db_query($querystring);
if (is_array($search)) {
serendipity_fetchEntryData($search);
//Add param searchresults at the top and remove duplicates.
if (is_array($searchresults)) {
$ids_current = array();
foreach($searchresults AS $idx => $data) {
$ids_current[$data['id']] = true;
}
foreach($search AS $idx => $data) {
if (isset($ids_current[$data['id']])) {
unset($search[$idx]);
}
}
$search = array_merge($searchresults, $search);
}
//if * wasn't already appended and if there are none or not enough
//results, search again for entries containing the searchterm as a part
if (strpos($term, '*') === false) {
if (! is_array($search)) {
return serendipity_searchEntries($term.'*', $orig_limit);
}else if (count($search) < 4){
return serendipity_searchEntries($term.'*', $orig_limit, $search);
}
}
if (is_array($search)){
serendipity_fetchEntryData($search);
}
return $search;
}
@ -1644,4 +1671,4 @@ function serendipity_getCategoryRoot($id) {
AND n.categoryid = " . (int)$id . "
ORDER BY n.category_left DESC, p.category_left ASC");
return $r;
}
}