diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2004-10-06 12:04:29 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2004-10-06 12:04:29 +0000 |
| commit | cd7e18e9f22453d1c866057f0b31546887fcf07a (patch) | |
| tree | e292eb5cdccef320e46fb9b7713fbd334de6aff9 /phpBB/includes/message_parser.php | |
| parent | b2d88fa157055697e9b363fe444b8e6cc02974e9 (diff) | |
| download | forums-cd7e18e9f22453d1c866057f0b31546887fcf07a.tar forums-cd7e18e9f22453d1c866057f0b31546887fcf07a.tar.gz forums-cd7e18e9f22453d1c866057f0b31546887fcf07a.tar.bz2 forums-cd7e18e9f22453d1c866057f0b31546887fcf07a.tar.xz forums-cd7e18e9f22453d1c866057f0b31546887fcf07a.zip | |
- search indexing fix
git-svn-id: file:///svn/phpbb/trunk@4993 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/message_parser.php')
| -rw-r--r-- | phpBB/includes/message_parser.php | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index 6e67e10ac6..f1470836fd 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -1084,7 +1084,7 @@ class parse_message extends bbcode_firstpass // Parses a given message and updates/maintains the fulltext tables class fulltext_search { - function split_words($mode, &$text, &$stopped_words) + function split_words($mode, $text, &$stopped_words) { global $user, $config; @@ -1121,17 +1121,19 @@ class fulltext_search // New lines, carriage returns $match[] = "#[\n\r]+#"; // NCRs like etc. - $match[] = '#&[\#a-z0-9]+?;#i'; + $match[] = '#&[\#a-z0-9]+?;#i'; // URL's $match[] = '#\b[\w]+:\/\/[a-z0-9\.\-]+(\/[a-z0-9\?\.%_\-\+=&\/]+)?#'; // BBcode - $match[] = '#\[img:[a-z0-9]{10,}\].*?\[\/img:[a-z0-9]{10,}\]#'; - $match[] = '#\[\/?url(=.*?)?\]#'; - $match[] = '#\[\/?[a-z\*=\+\-]+(\:?[0-9a-z]+)?:[a-z0-9]{10,}(\:[a-z0-9]+)?=?.*?\]#'; + $match[] = '#\[img:[a-z0-9]{5,}\].*?\[\/img:[a-z0-9]{5,}\]#'; + $match[] = '#\[\/?[a-z\*=\+\-]+(\:?[0-9a-z]+)?:[a-z0-9]{5,}(\:[a-z0-9]+)?=?.*?\]#'; + $match[] = '#<!\-\-(.*?)\-\->#is'; // 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(' not ', ' - ', $text); @@ -1155,7 +1157,7 @@ class fulltext_search return $text; } - function add($mode, $post_id, $message, $subject) + function add($mode, $post_id, &$message, &$subject) { global $config, $db; @@ -1228,6 +1230,7 @@ class fulltext_search $new_words = array_diff($unique_add_words, array_keys($word_ids)); unset($unique_add_words); + $db->sql_return_on_error(true); if (sizeof($new_words)) { switch (SQL_LAYER) @@ -1255,6 +1258,7 @@ class fulltext_search break; } } + $db->sql_return_on_error(false); unset($new_words); } |