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

Changed: moved the thing that compares the amount of matches to the amount of terms from outside the query (in PHP) to inside of it, thanks to a well-placed HAVING clause

Browse source 
git-svn-id: file:///svn/phpbb/trunk@6146 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Ludovic Arnaud 2006-07-04 15:16:57 +00:00
parent 291ab6216e
commit bfb26c8a4a
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -438,6 +438,9 @@ class fulltext_native extends search_backend
if ($sql_in) if ($sql_in)
{ {
// A little trick so we only need one query: using DISTINCT makes every word unique so if the
// number of all words for one post_id equals the number of AND-words it has to contain all
// AND-words
$sql = "SELECT $sql_select, COUNT(DISTINCT m.word_id) as matches, " . $sort_by_sql[$sort_key] . " $sql = "SELECT $sql_select, COUNT(DISTINCT m.word_id) as matches, " . $sort_by_sql[$sort_key] . "
FROM $sql_from$sql_sort_table" . POSTS_TABLE . ' p, ' . SEARCH_WORDMATCH_TABLE . ' m, ' . SEARCH_WORDLIST_TABLE . " w FROM $sql_from$sql_sort_table" . POSTS_TABLE . ' p, ' . SEARCH_WORDMATCH_TABLE . ' m, ' . SEARCH_WORDLIST_TABLE . " w
WHERE w.word_text IN ($sql_in) WHERE w.word_text IN ($sql_in)
@ -446,6 +449,7 @@ class fulltext_native extends search_backend
AND p.post_id = m.post_id AND p.post_id = m.post_id
$sql_where_options $sql_where_options
GROUP BY $field, " . $sort_by_sql[$sort_key] . ' GROUP BY $field, " . $sort_by_sql[$sort_key] . '
HAVING matches = ' . sizeof($sql_words['AND']) . '
ORDER BY ' . $sql_sort; ORDER BY ' . $sql_sort;
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
@ -456,16 +460,10 @@ class fulltext_native extends search_backend
return false; return false;
} }
// A little trick so we only need one query: using DISTINCT makes every word unique so if the
// number of all words for one post_id equals the number of AND-words it has to contain all
// AND-words
$ids = array(); $ids = array();
do do
{ {
if ($row['matches'] == sizeof($sql_words['AND'])) $ids[] = ($type == 'topics') ? $row['topic_id'] : $row['post_id'];
{
$ids[] = ($type == 'topics') ? $row['topic_id'] : $row['post_id'];
}
} }
while ($row = $db->sql_fetchrow($result)); while ($row = $db->sql_fetchrow($result));
$db->sql_freeresult($result); $db->sql_freeresult($result);