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

Fixed: bug #3191 take two. That one should work as expected.

Browse source 
git-svn-id: file:///svn/phpbb/trunk@6168 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Ludovic Arnaud 2006-07-11 00:04:02 +00:00
parent d2e81e8bee
commit 7167adb2cf
1 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
phpBB/includes/search/fulltext_native.php
View file

@ -37,6 +37,8 @@ class fulltext_native extends search_backend
$this->word_length = array('min' => $config['fulltext_native_min_chars'], 'max' => $config['fulltext_native_max_chars']); $this->word_length = array('min' => $config['fulltext_native_min_chars'], 'max' => $config['fulltext_native_max_chars']);
$error = false; $error = false;
$this->tidy();
} }
/** /**
@ -956,8 +958,9 @@ class fulltext_native extends search_backend
// Remove common (> 60% of posts ) words // Remove common (> 60% of posts ) words
if ($config['num_posts'] >= 100) if ($config['num_posts'] >= 100)
{ {
$sql = 'SELECT word_id, word_text // First, get the IDs of common words
FROM ' . SEARCH_WORDLIST_TABLE . ' $sql = 'SELECT word_id
FROM ' . SEARCH_WORDMATCH_TABLE . '
GROUP BY word_id GROUP BY word_id
HAVING COUNT(word_id) > ' . floor($config['num_posts'] * 0.6); HAVING COUNT(word_id) > ' . floor($config['num_posts'] * 0.6);
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
@ -968,20 +971,33 @@ class fulltext_native extends search_backend
do do
{ {
$sql_in[] = $row['word_id']; $sql_in[] = $row['word_id'];
$destroy_cache_words[] = $row['word_text'];
} }
while ($row = $db->sql_fetchrow($result)); while ($row = $db->sql_fetchrow($result));
$sql_in = implode(', ', $sql_in); $sql_in = implode(', ', $sql_in);
// Get the text of those new common words
$sql = 'SELECT word_text
FROM ' . SEARCH_WORDLIST_TABLE . "
WHERE word_id IN ($sql_in)";
$result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result))
{
$destroy_cache_words[] = $row['word_text'];
}
// Flag the words
$sql = 'UPDATE ' . SEARCH_WORDLIST_TABLE . " $sql = 'UPDATE ' . SEARCH_WORDLIST_TABLE . "
SET word_common = 1 SET word_common = 1
WHERE word_id IN ($sql_in)"; WHERE word_id IN ($sql_in)";
$db->sql_query($sql); $db->sql_query($sql);
// Delete the matches
$sql = 'DELETE FROM ' . SEARCH_WORDMATCH_TABLE . " $sql = 'DELETE FROM ' . SEARCH_WORDMATCH_TABLE . "
WHERE word_id IN ($sql_in)"; WHERE word_id IN ($sql_in)";
$db->sql_query($sql); $db->sql_query($sql);
unset($sql_in); unset($sql_in);
} }
$db->sql_freeresult($result); $db->sql_freeresult($result);