mirror of
https://github.com/e107inc/e107.git
synced 2025-08-19 04:41:53 +02:00
Search Fixes. Forum search upgraded to v2.x spec.
This commit is contained in:
Cameron
@@ -19,8 +19,6 @@ if (!defined('e107_INIT')) { exit; }
|
||||
class e_search
|
||||
{
|
||||
|
||||
|
||||
|
||||
var $query;
|
||||
var $text;
|
||||
var $pos;
|
||||
@@ -29,7 +27,7 @@ class e_search
|
||||
var $stopwords_php = "|a|about|an|and|are|as|at|be|by|com|edu|for|from|how|i|in|is|it|of|on|or|that|the|this|to|was|what|when|where|who|will|with|the|www|";
|
||||
var $stopwords_mysql = "|a|a's|able|about|above|according|accordingly|across|actually|after|afterwards|again|against|ain't|all|allow|allows|almost|alone|along|already|also|although|always|am|among|amongst|an|and|another|any|anybody|anyhow|anyone|anything|anyway|anyways|anywhere|apart|appear|appreciate|appropriate|are|aren't|around|as|aside|ask|asking|associated|at|available|away|awfully|be|became|because|become|becomes|becoming|been|before|beforehand|behind|being|believe|below|beside|besides|best|better|between|beyond|both|brief|but|by|c'mon|c's|came|can|can't|cannot|cant|cause|causes|certain|certainly|changes|clearly|co|com|come|comes|concerning|consequently|consider|considering|contain|containing|contains|corresponding|could|couldn't|course|currently|definitely|described|despite|did|didn't|different|do|does|doesn't|doing|don't|done|down|downwards|during|each|edu|eg|eight|either|else|elsewhere|enough|entirely|especially|et|etc|even|ever|every|everybody|everyone|everything|everywhere|ex|exactly|example|except|far|few|fifth|first|five|followed|following|follows|for|former|formerly|forth|four|from|further|furthermore|get|gets|getting|given|gives|go|goes|going|gone|got|gotten|greetings|had|hadn't|happens|hardly|has|hasn't|have|haven't|having|he|he's|hello|help|hence|her|here|here's|hereafter|hereby|herein|hereupon|hers|herself|hi|him|himself|his|hither|hopefully|how|howbeit|however|i|i'd|i'll|i'm|i've|ie|if|ignored|immediate|in|inasmuch|inc|indeed|indicate|indicated|indicates|inner|insofar|instead|into|inward|is|isn't|it|it'd|it'll|it's|its|itself|just|keep|keeps|kept|know|knows|known|last|lately|later|latter|latterly|least|less|lest|let|let's|like|liked|likely|little|look|looking|looks|ltd|mainly|many|may|maybe|me|mean|meanwhile|merely|might|more|moreover|most|mostly|much|must|my|myself|name|namely|nd|near|nearly|necessary|need|needs|neither|never|nevertheless|new|next|nine|no|nobody|non|none|noone|nor|normally|not|nothing|novel|now|nowhere|obviously|of|off|often|oh|ok|okay|old|on|once|one|ones|only|onto|or|other|others|otherwise|ought|our|ours|ourselves|out|outside|over|overall|own|particular|particularly|per|perhaps|php|placed|please|plus|possible|presumably|probably|provides|que|quite|qv|rather|rd|re|really|reasonably|regarding|regardless|regards|relatively|respectively|right|said|same|saw|say|saying|says|second|secondly|see|seeing|seem|seemed|seeming|seems|seen|self|selves|sensible|sent|serious|seriously|seven|several|shall|she|should|shouldn't|since|six|so|some|somebody|somehow|someone|something|sometime|sometimes|somewhat|somewhere|soon|sorry|specified|specify|specifying|still|sub|such|sup|sure|t's|take|taken|tell|tends|th|than|thank|thanks|thanx|that|that's|thats|the|their|theirs|them|themselves|then|thence|there|there's|thereafter|thereby|therefore|therein|theres|thereupon|these|they|they'd|they'll|they're|they've|think|third|this|thorough|thoroughly|those|though|three|through|throughout|thru|thus|to|together|too|took|toward|towards|tried|tries|truly|try|trying|twice|two|un|under|unfortunately|unless|unlikely|until|unto|up|upon|us|use|used|useful|uses|using|usually|value|various|very|via|viz|vs|want|wants|was|wasn't|way|we|we'd|we'll|we're|we've|welcome|well|went|were|weren't|what|what's|whatever|when|whence|whenever|where|where's|whereafter|whereas|whereby|wherein|whereupon|wherever|whether|which|while|whither|who|who's|whoever|whole|whom|whose|why|will|willing|wish|with|within|without|won't|wonder|would|would|wouldn't|yes|yet|you|you'd|you'll|you're|you've|your|yours|yourself|yourselves|zero|";
|
||||
|
||||
function __construct()
|
||||
function __construct($query = '')
|
||||
{
|
||||
$tp = e107::getParser();
|
||||
$this->query = $query;
|
||||
@@ -48,9 +46,12 @@ class e_search
|
||||
$this->bullet = '<img src="'.THEME_ABS.'images/bullet2.gif" alt="bullet" class="icon" />';
|
||||
}
|
||||
|
||||
preg_match_all('/(\W?".*?")|(.*?)(\s|$)/', $this -> query, $boolean_keys);
|
||||
preg_match_all('/(\W?".*?")|(.*?)(\s|$)/', $this->query, $boolean_keys);
|
||||
|
||||
sort($this -> keywords['split'] = array_unique(array_filter(str_replace('"', '', array_merge($boolean_keys[1], $boolean_keys[2])))));
|
||||
foreach ($this -> keywords['split'] as $k_key => $key) {
|
||||
|
||||
foreach ($this -> keywords['split'] as $k_key => $key)
|
||||
{
|
||||
if (!$this -> stopword($key)) {
|
||||
if ($key{($tp->ustrlen($key) - 1)} == '*') {
|
||||
$this -> keywords['wildcard'][$k_key] = TRUE;
|
||||
@@ -70,7 +71,8 @@ class e_search
|
||||
}
|
||||
$this -> keywords['exact'][$k_key] = ($tp->ustrpos($key, ' ') !== FALSE) ? TRUE : FALSE;
|
||||
$this -> keywords['match'][$k_key] = $tp -> toDB($this -> keywords['match'][$k_key]);
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
unset ($this -> keywords['split'][$k_key]);
|
||||
}
|
||||
}
|
||||
@@ -83,7 +85,7 @@ class e_search
|
||||
|
||||
|
||||
|
||||
function parsesearch($table, $return_fields, $search_fields, $weights, $handler, $no_results, $where, $order)
|
||||
function parsesearch($table, $return_fields, $search_fields, $weights, $handler, $no_results, $where, $order)
|
||||
{
|
||||
global $query, $search_prefs, $pre_title, $search_chars, $search_res, $result_flag;
|
||||
|
||||
@@ -91,7 +93,7 @@ class e_search
|
||||
$sql = e107::getDb('search');
|
||||
$tp = e107::getParser();
|
||||
|
||||
if($handler == 'self') //v2 use 'compile' function inside e_search.php;
|
||||
if($handler == 'self') //v2 use 'compile' function inside e_search.php;
|
||||
{
|
||||
$handler = array($this,'compile');
|
||||
}
|
||||
@@ -102,19 +104,28 @@ class e_search
|
||||
}
|
||||
|
||||
$this -> query = $tp -> toDB($query);
|
||||
|
||||
|
||||
$match_query = '';
|
||||
|
||||
if (!$search_prefs['mysql_sort'])
|
||||
{
|
||||
if(e_DEBUG)
|
||||
{
|
||||
echo e107::getMessage()->addDebug("Using PHP Sort Method")->render();;
|
||||
}
|
||||
|
||||
$field_operator = 'AND ';
|
||||
foreach ($this -> keywords['match'] as $k_key => $key)
|
||||
{
|
||||
$boolean_regex = '';
|
||||
|
||||
if ($this -> keywords['boolean'][$k_key] == '+')
|
||||
{
|
||||
$key_operator = 'OR ';
|
||||
$break = TRUE;
|
||||
$no_exact = TRUE;
|
||||
} else if ($this -> keywords['boolean'][$k_key] == '-')
|
||||
}
|
||||
elseif ($this -> keywords['boolean'][$k_key] == '-')
|
||||
{
|
||||
foreach ($this -> keywords as $unset_key => $unset_value)
|
||||
{
|
||||
@@ -124,7 +135,7 @@ class e_search
|
||||
$boolean_regex = 'NOT';
|
||||
$no_exact = TRUE;
|
||||
}
|
||||
else if (!isset($break))
|
||||
elseif (!isset($break))
|
||||
{
|
||||
$key_operator = 'OR ';
|
||||
if (isset($switch))
|
||||
@@ -137,15 +148,23 @@ class e_search
|
||||
{
|
||||
break;
|
||||
}
|
||||
|
||||
$match_query .= isset($uninitial_field) ? " ".$field_operator." (" : "(";
|
||||
$uninitial_field = TRUE;
|
||||
if ($this -> keywords['wildcard'][$k_key] || !$search_prefs['boundary']) {
|
||||
|
||||
if ($this -> keywords['wildcard'][$k_key] || !$search_prefs['boundary'])
|
||||
{
|
||||
$wildcard = '';
|
||||
} else {
|
||||
}
|
||||
else
|
||||
{
|
||||
$wildcard = '[[:>:]]';
|
||||
}
|
||||
|
||||
$key_count = 1;
|
||||
foreach ($search_fields as $field) {
|
||||
|
||||
foreach ($search_fields as $field)
|
||||
{
|
||||
$regexp = $search_prefs['boundary'] ? "[[:<:]]".$key.$wildcard : $key;
|
||||
$match_query .= " ".$field." ".$boolean_regex." REGEXP '".$regexp."' ";
|
||||
if ($key_count != count($search_fields)) {
|
||||
@@ -153,32 +172,47 @@ class e_search
|
||||
}
|
||||
$key_count++;
|
||||
}
|
||||
|
||||
$match_query .= ")";
|
||||
}
|
||||
if ($order) {
|
||||
|
||||
if ($order)
|
||||
{
|
||||
$sql_order = 'ORDER BY ';
|
||||
$order_count = count($order);
|
||||
$i = 1;
|
||||
foreach ($order as $sort_key => $sort_value) {
|
||||
foreach ($order as $sort_key => $sort_value)
|
||||
{
|
||||
$sql_order .= $sort_key.' '.$sort_value;
|
||||
if ($i != $order_count) {
|
||||
if ($i != $order_count)
|
||||
{
|
||||
$sql_order .= ', ';
|
||||
}
|
||||
$i++;
|
||||
}
|
||||
} else {
|
||||
} else
|
||||
{
|
||||
$sql_order = '';
|
||||
}
|
||||
|
||||
$limit = $search_prefs['php_limit'] ? ' LIMIT 0,'.$search_prefs['php_limit'] : '';
|
||||
|
||||
$sql_query = "SELECT ".$return_fields." FROM #".$table." WHERE ".$where." (".$match_query.") ".$sql_order.$limit.";";
|
||||
|
||||
if ((($keycount = count($this -> keywords['split'])) > 1) && (strpos($query, '"') === FALSE) && (!isset($no_exact)))
|
||||
{
|
||||
$exact_query[] = $query;
|
||||
$this -> keywords['split'] = array_merge($exact_query, $this -> keywords['split']);
|
||||
}
|
||||
}
|
||||
else
|
||||
else // MySQL Sorting.
|
||||
{
|
||||
|
||||
if(e_DEBUG)
|
||||
{
|
||||
echo e107::getMessage()->addDebug("Using MYSQL Sort Method")->render();
|
||||
}
|
||||
|
||||
$this -> query = str_replace('"', '"', $this -> query);
|
||||
//$field_query = implode(',', $search_fields);
|
||||
|
||||
@@ -192,7 +226,7 @@ class e_search
|
||||
$field_query = implode(' || ', $field_query);
|
||||
|
||||
$sql_order = '';
|
||||
|
||||
|
||||
foreach ($order as $sort_key => $sort_value)
|
||||
{
|
||||
$sql_order .= ', '.$sort_key.' '.$sort_value;
|
||||
@@ -201,6 +235,9 @@ class e_search
|
||||
$limit = " LIMIT ".$result_flag.",".$search_res;
|
||||
|
||||
$sql_query = "SELECT SQL_CALC_FOUND_ROWS ".$return_fields.", (".$match_query.") AS relevance FROM #".$table." WHERE ".$where." (".$field_query.") HAVING relevance > 0 ORDER BY relevance DESC ".$sql_order.$limit.";";
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
if ($ps['results'] = $sql->gen($sql_query))
|
||||
@@ -208,10 +245,12 @@ class e_search
|
||||
if (!$search_prefs['mysql_sort'])
|
||||
{
|
||||
$x = 0;
|
||||
foreach ($search_fields as $field_key => $field) {
|
||||
foreach ($search_fields as $field_key => $field)
|
||||
{
|
||||
$crop_fields[] = preg_replace('/(.*?)\./', '', $field);
|
||||
}
|
||||
while ($row = $sql -> db_Fetch())
|
||||
|
||||
while ($row = $sql->fetch())
|
||||
{
|
||||
$weight = 0;
|
||||
foreach ($crop_fields as $field_key => $field)
|
||||
@@ -277,6 +316,7 @@ class e_search
|
||||
|
||||
if(!empty($matches))
|
||||
{
|
||||
|
||||
foreach ($matches as $this -> text)
|
||||
{
|
||||
$this -> text = nl2br($this -> text);
|
||||
@@ -292,6 +332,8 @@ class e_search
|
||||
|
||||
if(!empty($this->keywords['match']))
|
||||
{
|
||||
|
||||
|
||||
foreach ($this -> keywords['match'] as $match_id => $this -> query)
|
||||
{
|
||||
$boundary = $search_prefs['boundary'] ? '\b' : '';
|
||||
@@ -308,7 +350,7 @@ class e_search
|
||||
$endcrop = TRUE;
|
||||
}
|
||||
$key = $tp->usubstr($this -> text, $this->pos, $tp->ustrlen($this -> query));
|
||||
$this -> text = preg_replace("#(".$boundary.$this -> query.$regex_append."#i", "<span class='searchhighlight'>\\1</span>", $this -> text);
|
||||
$this -> text = preg_replace("#(".$boundary.$this -> query.$regex_append."#i", "<mark>\\1</mark>", $this -> text);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user