makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-16 15:08:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/sphinx-fulltext-search] prefix sphinx with constant names

Browse source 
All constant names are prefixed with SPHINX_

PHPBB3-10946
This commit is contained in:
Dhruv Goel 2012-07-10 03:55:23 +05:30 • committed by Dhruv
parent e486f4389c
commit 88089194e5
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
phpBB/includes/search/fulltext_sphinx.php
View file

@ -24,9 +24,9 @@ if (!defined('IN_PHPBB'))
global $phpbb_root_path, $phpEx, $table_prefix; global $phpbb_root_path, $phpEx, $table_prefix;
require($phpbb_root_path . "includes/sphinxapi-0.9.8." . $phpEx); require($phpbb_root_path . "includes/sphinxapi-0.9.8." . $phpEx);
define('MAX_MATCHES', 20000); define('SPHINX_MAX_MATCHES', 20000);
define('CONNECT_RETRIES', 3); define('SPHINX_CONNECT_RETRIES', 3);
define('CONNECT_WAIT_TIME', 300); define('SPHINX_CONNECT_WAIT_TIME', 300);
/** /**
* fulltext_sphinx * fulltext_sphinx
@ -216,7 +216,7 @@ class phpbb_search_fulltext_sphinx
array('read_timeout', '5'), array('read_timeout', '5'),
array('max_children', '30'), array('max_children', '30'),
array('pid_file', $config['fulltext_sphinx_data_path'] . "searchd.pid"), array('pid_file', $config['fulltext_sphinx_data_path'] . "searchd.pid"),
array('max_matches', (string) MAX_MATCHES), array('max_matches', (string) SPHINX_MAX_MATCHES),
array('binlog_path', $config['fulltext_sphinx_data_path']), array('binlog_path', $config['fulltext_sphinx_data_path']),
), ),
); );
@ -451,14 +451,14 @@ class phpbb_search_fulltext_sphinx
$this->sphinx->SetFilter('deleted', array(0)); $this->sphinx->SetFilter('deleted', array(0));
$this->sphinx->SetLimits($start, (int) $per_page, MAX_MATCHES); $this->sphinx->SetLimits($start, (int) $per_page, SPHINX_MAX_MATCHES);
$result = $this->sphinx->Query($search_query_prefix . str_replace('"', '"', $this->search_query), $this->indexes); $result = $this->sphinx->Query($search_query_prefix . str_replace('"', '"', $this->search_query), $this->indexes);
// could be connection to localhost:3312 failed (errno=111, msg=Connection refused) during rotate, retry if so // could be connection to localhost:3312 failed (errno=111, msg=Connection refused) during rotate, retry if so
$retries = CONNECT_RETRIES; $retries = SPHINX_CONNECT_RETRIES;
while (!$result && (strpos($this->sphinx->_error, "errno=111,") !== false) && $retries--) while (!$result && (strpos($this->sphinx->_error, "errno=111,") !== false) && $retries--)
{ {
usleep(CONNECT_WAIT_TIME); usleep(SPHINX_CONNECT_WAIT_TIME);
$result = $this->sphinx->Query($search_query_prefix . str_replace('"', '"', $this->search_query), $this->indexes); $result = $this->sphinx->Query($search_query_prefix . str_replace('"', '"', $this->search_query), $this->indexes);
} }