makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

- search indexing fix

Browse source 
git-svn-id: file:///svn/phpbb/trunk@4993 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2004-10-06 12:04:29 +00:00
parent b2d88fa157
commit cd7e18e9f2
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
phpBB/includes/message_parser.php
View file

@ -1084,7 +1084,7 @@ class parse_message extends bbcode_firstpass
// Parses a given message and updates/maintains the fulltext tables // Parses a given message and updates/maintains the fulltext tables
class fulltext_search class fulltext_search
{ {
function split_words($mode, &$text, &$stopped_words) function split_words($mode, $text, &$stopped_words)
{ {
global $user, $config; global $user, $config;
@ -1121,17 +1121,19 @@ class fulltext_search
// New lines, carriage returns // New lines, carriage returns
$match[] = "#[\n\r]+#"; $match[] = "#[\n\r]+#";
// NCRs like   etc. // NCRs like   etc.
$match[] = '#&[\#a-z0-9]+?;#i'; $match[] = '#&[\#a-z0-9]+?;#i';
// URL's // URL's
$match[] = '#\b[\w]+:\/\/[a-z0-9\.\-]+(\/[a-z0-9\?\.%_\-\+=&\/]+)?#'; $match[] = '#\b[\w]+:\/\/[a-z0-9\.\-]+(\/[a-z0-9\?\.%_\-\+=&\/]+)?#';
// BBcode // BBcode
$match[] = '#\[img:[a-z0-9]{10,}\].*?\[\/img:[a-z0-9]{10,}\]#'; $match[] = '#\[img:[a-z0-9]{5,}\].*?\[\/img:[a-z0-9]{5,}\]#';
$match[] = '#\[\/?url(=.*?)?\]#'; $match[] = '#\[\/?[a-z\*=\+\-]+(\:?[0-9a-z]+)?:[a-z0-9]{5,}(\:[a-z0-9]+)?=?.*?\]#';
$match[] = '#\[\/?[a-z\*=\+\-]+(\:?[0-9a-z]+)?:[a-z0-9]{10,}(\:[a-z0-9]+)?=?.*?\]#'; $match[] = '#<!\-\-(.*?)\-\->#is';
// Sequences < min_search_chars & < max_search_chars // Sequences < min_search_chars & < max_search_chars
$match[] = '#\b([a-z0-9]{1,' . $config['min_search_chars'] . '}|[a-z0-9]{' . $config['max_search_chars'] . ',})\b#is'; $match[] = '#\b([\S]{1,' . $config['min_search_chars'] . '}|[\S]{' . $config['max_search_chars'] . ',})\b#is';
$text = str_replace($match, ' ', ' ' . strtolower($text) . ' '); $replace = array('', '', '', '', '', '', '');
$text = preg_replace($match, $replace, ' ' . strtolower($text) . ' ');
$text = str_replace(' and ', ' + ', $text); $text = str_replace(' and ', ' + ', $text);
$text = str_replace(' not ', ' - ', $text); $text = str_replace(' not ', ' - ', $text);
@ -1155,7 +1157,7 @@ class fulltext_search
return $text; return $text;
} }
function add($mode, $post_id, $message, $subject) function add($mode, $post_id, &$message, &$subject)
{ {
global $config, $db; global $config, $db;
@ -1228,6 +1230,7 @@ class fulltext_search
$new_words = array_diff($unique_add_words, array_keys($word_ids)); $new_words = array_diff($unique_add_words, array_keys($word_ids));
unset($unique_add_words); unset($unique_add_words);
$db->sql_return_on_error(true);
if (sizeof($new_words)) if (sizeof($new_words))
{ {
switch (SQL_LAYER) switch (SQL_LAYER)
@ -1255,6 +1258,7 @@ class fulltext_search
break; break;
} }
} }
$db->sql_return_on_error(false);
unset($new_words); unset($new_words);
} }