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

Merge pull request #6375 from rxu/ticket/16976-master

Browse source 
[ticket/16976] Fix search results count - master
This commit is contained in:
Marc Alexander 2022-04-03 15:10:40 +02:00
commit 24d07be149
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
4 changed files with 43 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/phpbb/search/backend/fulltext_mysql.php
View file

@ -508,7 +508,7 @@ class fulltext_mysql extends base implements search_backend_interface
); );
extract($this->phpbb_dispatcher->trigger_event('core.search_mysql_keywords_main_query_before', compact($vars))); extract($this->phpbb_dispatcher->trigger_event('core.search_mysql_keywords_main_query_before', compact($vars)));
$sql_select = ($type == 'posts') ? 'p.post_id' : 'DISTINCT t.topic_id'; $sql_select = ($type == 'posts') ? 'DISTINCT p.post_id' : 'DISTINCT t.topic_id';
$sql_select .= $sort_by_sql[$sort_key] ? ", {$sort_by_sql[$sort_key]}" : ''; $sql_select .= $sort_by_sql[$sort_key] ? ", {$sort_by_sql[$sort_key]}" : '';
$sql_from = ($join_topic) ? TOPICS_TABLE . ' t, ' : ''; $sql_from = ($join_topic) ? TOPICS_TABLE . ' t, ' : '';
$field = ($type == 'posts') ? 'post_id' : 'topic_id'; $field = ($type == 'posts') ? 'post_id' : 'topic_id';
@ -553,7 +553,7 @@ class fulltext_mysql extends base implements search_backend_interface
// if the total result count is not cached yet, retrieve it from the db // if the total result count is not cached yet, retrieve it from the db
if (!$result_count && count($id_ary)) if (!$result_count && count($id_ary))
{ {
$sql_found_rows = str_replace("SELECT $sql_select", "SELECT COUNT(*) as result_count", $sql); $sql_found_rows = str_replace("SELECT $sql_select", "SELECT COUNT($sql_select) as result_count", $sql);
$result = $this->db->sql_query($sql_found_rows); $result = $this->db->sql_query($sql_found_rows);
$result_count = (int) $this->db->sql_fetchfield('result_count'); $result_count = (int) $this->db->sql_fetchfield('result_count');
$this->db->sql_freeresult($result); $this->db->sql_freeresult($result);

6
phpBB/phpbb/search/backend/fulltext_native.php
View file

@ -605,7 +605,7 @@ class fulltext_native extends base implements search_backend_interface
$w_num = 0; $w_num = 0;
$sql_array = array( $sql_array = array(
'SELECT' => ($type == 'posts') ? 'p.post_id' : 'p.topic_id', 'SELECT' => ($type == 'posts') ? 'DISTINCT p.post_id' : 'DISTINCT p.topic_id',
'FROM' => array( 'FROM' => array(
SEARCH_WORDMATCH_TABLE => array(), SEARCH_WORDMATCH_TABLE => array(),
SEARCH_WORDLIST_TABLE => array(), SEARCH_WORDLIST_TABLE => array(),
@ -955,9 +955,9 @@ class fulltext_native extends base implements search_backend_interface
// If using mysql and the total result count is not calculated yet, get it from the db // If using mysql and the total result count is not calculated yet, get it from the db
if (!$total_results && $is_mysql) if (!$total_results && $is_mysql)
{ {
$sql_count = str_replace("SELECT {$sql_array['SELECT']}", "SELECT COUNT(DISTINCT {$sql_array['SELECT']}) as total_results", $sql); $sql_count = str_replace("SELECT {$sql_array['SELECT']}", "SELECT COUNT({$sql_array['SELECT']}) as total_results", $sql);
$result = $this->db->sql_query($sql_count); $result = $this->db->sql_query($sql_count);
$total_results = (int) $this->db->sql_fetchfield('total_results'); $total_results = $sql_array['GROUP_BY'] ? count($this->db->sql_fetchrowset($result)) : $this->db->sql_fetchfield('total_results');
$this->db->sql_freeresult($result); $this->db->sql_freeresult($result);
if (!$total_results) if (!$total_results)

2
phpBB/phpbb/search/backend/fulltext_postgres.php
View file

@ -482,7 +482,7 @@ class fulltext_postgres extends base implements search_backend_interface
// if the total result count is not cached yet, retrieve it from the db // if the total result count is not cached yet, retrieve it from the db
if (!$result_count) if (!$result_count)
{ {
$sql_count = "SELECT COUNT(*) as result_count $sql_count = "SELECT COUNT(DISTINCT " . (($type == 'posts') ? 'p.post_id' : 't.topic_id') . ") as result_count
$sql_from $sql_from
$sql_where"; $sql_where";
$result = $this->db->sql_query($sql_count); $result = $this->db->sql_query($sql_count);

37
tests/functional/search/base.php
View file

@ -51,6 +51,30 @@ abstract class phpbb_functional_search_base extends phpbb_functional_test_case
$this->assertStringContainsString("Search found $topics_found match", $crawler->filter('.searchresults-title')->text(), $this->search_backend); $this->assertStringContainsString("Search found $topics_found match", $crawler->filter('.searchresults-title')->text(), $this->search_backend);
} }
protected function assert_search_in_topic($topic_id, $keywords, $posts_found, $sort_key = '')
{
$this->purge_cache();
$crawler = self::request('GET', "search.php?t=$topic_id&sf=msgonly&keywords=$keywords" . ($sort_key ? "&sk=$sort_key" : ''));
$this->assertEquals($posts_found, $crawler->filter('.postbody')->count(), $this->search_backend);
$this->assertStringContainsString("Search found $posts_found match", $crawler->filter('.searchresults-title')->text(), $this->search_backend);
}
protected function assert_search_in_forum($forum_id, $keywords, $posts_found, $sort_key = '')
{
$this->purge_cache();
$crawler = self::request('GET', "search.php?fid[]=$forum_id&keywords=$keywords" . ($sort_key ? "&sk=$sort_key" : ''));
$this->assertEquals($posts_found, $crawler->filter('.postbody')->count(), $this->search_backend);
$this->assertStringContainsString("Search found $posts_found match", $crawler->filter('.searchresults-title')->text(), $this->search_backend);
}
protected function assert_search_topics_in_forum($forum_id, $keywords, $topics_found, $sort_key = '')
{
$this->purge_cache();
$crawler = self::request('GET', "search.php?fid[]=$forum_id&sr=topics&keywords=$keywords" . ($sort_key ? "&sk=$sort_key" : ''));
$this->assertEquals($topics_found, $crawler->filter('.row')->count(), $this->search_backend);
$this->assertStringContainsString("Search found $topics_found match", $crawler->filter('.searchresults-title')->text(), $this->search_backend);
}
protected function assert_search_not_found($keywords) protected function assert_search_not_found($keywords)
{ {
$crawler = self::request('GET', 'search.php?keywords=' . $keywords); $crawler = self::request('GET', 'search.php?keywords=' . $keywords);
@ -88,6 +112,9 @@ abstract class phpbb_functional_search_base extends phpbb_functional_test_case
$this->create_search_index('phpbb\\search\\backend\\fulltext_native'); $this->create_search_index('phpbb\\search\\backend\\fulltext_native');
$post = $this->create_topic(2, 'Test Topic 1 foosubject', 'This is a test topic posted by the barsearch testing framework.'); $post = $this->create_topic(2, 'Test Topic 1 foosubject', 'This is a test topic posted by the barsearch testing framework.');
$topic_multiple_results_count1 = $this->create_topic(2, 'Test Topic for multiple search results', 'This is a test topic posted to test multiple results count.');
$this->create_post(2, $topic_multiple_results_count1['topic_id'], 'Re: Test Topic for multiple search results', 'This is a test post 2 posted to test multiple results count.');
$topic_multiple_results_count2 = $this->create_topic(2, 'Test Topic 2 for multiple search results', 'This is a test topic 2 posted to test multiple results count.');
$this->set_flood_interval(15); $this->set_flood_interval(15);
$crawler = self::request('GET', 'adm/index.php?i=acp_search&mode=settings&sid=' . $this->sid); $crawler = self::request('GET', 'adm/index.php?i=acp_search&mode=settings&sid=' . $this->sid);
@ -113,6 +140,8 @@ abstract class phpbb_functional_search_base extends phpbb_functional_test_case
// Search backed is not supported because don't appear in the select // Search backed is not supported because don't appear in the select
$this->delete_topic($post['topic_id']); $this->delete_topic($post['topic_id']);
$this->delete_topic($topic_by_author['topic_id']); $this->delete_topic($topic_by_author['topic_id']);
$this->delete_topic($topic_multiple_results_count1['topic_id']);
$this->delete_topic($topic_multiple_results_count2['topic_id']);
$this->markTestSkipped("Search backend is not supported/running"); $this->markTestSkipped("Search backend is not supported/running");
} }
@ -140,9 +169,15 @@ abstract class phpbb_functional_search_base extends phpbb_functional_test_case
$this->assert_search_found('foosubject+barsearch', 1, 2, $sort_key); $this->assert_search_found('foosubject+barsearch', 1, 2, $sort_key);
$this->assert_search_found('barsearch-testing', 1, 2, $sort_key); // test hyphen ignored $this->assert_search_found('barsearch-testing', 1, 2, $sort_key); // test hyphen ignored
$this->assert_search_found('barsearch+-+testing', 1, 2, $sort_key); // test hyphen wrapped with space ignored $this->assert_search_found('barsearch+-+testing', 1, 2, $sort_key); // test hyphen wrapped with space ignored
$this->assert_search_found('multiple+results+count', 3, 15, $sort_key); // test multiple results count - posts
$this->assert_search_found_topics('multiple+results+count', 2, $sort_key); // test multiple results count - topics
$this->assert_search_found_topics('phpbb3+installation', 1, $sort_key); $this->assert_search_found_topics('phpbb3+installation', 1, $sort_key);
$this->assert_search_found_topics('foosubject+barsearch', 1, $sort_key); $this->assert_search_found_topics('foosubject+barsearch', 1, $sort_key);
$this->assert_search_in_forum(2, 'multiple+search+results', 3, $sort_key); // test multiple results count - forum search - posts
$this->assert_search_topics_in_forum(2, 'multiple+search+results', 2, $sort_key); // test multiple results count - forum search - topics
$this->assert_search_in_topic((int) $topic_multiple_results_count1['topic_id'], 'multiple+results', 2, $sort_key); // test multiple results count - topic search
$this->assert_search_posts_by_author('searchforauthoruser', 2, $sort_key); $this->assert_search_posts_by_author('searchforauthoruser', 2, $sort_key);
$this->assert_search_topics_by_author('searchforauthoruser', 1, $sort_key); $this->assert_search_topics_by_author('searchforauthoruser', 1, $sort_key);
} }
@ -156,6 +191,8 @@ abstract class phpbb_functional_search_base extends phpbb_functional_test_case
$this->delete_search_index(); $this->delete_search_index();
$this->delete_topic($post['topic_id']); $this->delete_topic($post['topic_id']);
$this->delete_topic($topic_by_author['topic_id']); $this->delete_topic($topic_by_author['topic_id']);
$this->delete_topic($topic_multiple_results_count1['topic_id']);
$this->delete_topic($topic_multiple_results_count2['topic_id']);
} }
protected function create_search_index($backend = null) protected function create_search_index($backend = null)