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

[ticket/11438] Add spaces after # comment start and before \ line breaks

Browse source 
PHPBB3-11438
This commit is contained in:
Joas Schilling 2013-03-16 01:18:15 +01:00
parent 2b2bbf787c
commit c50af28077
3 changed files with 38 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
phpBB/docs/sphinx.sample.conf
View file

@ -1,31 +1,31 @@
source source_phpbb_{SPHINX_ID}_main source source_phpbb_{SPHINX_ID}_main
{ {
type = mysql #mysql or pgsql type = mysql # mysql or pgsql
sql_host = localhost #SQL server host sphinx connects to sql_host = localhost # SQL server host sphinx connects to
sql_user = username sql_user = username
sql_pass = password sql_pass = password
sql_db = db_name sql_db = db_name
sql_port = 3306 #optional, default is 3306 for mysql and 5432 for pgsql sql_port = 3306 # optional, default is 3306 for mysql and 5432 for pgsql
sql_query_pre = SET NAMES 'utf8' sql_query_pre = SET NAMES 'utf8'
sql_query_pre = UPDATE phpbb_sphinx SET max_doc_id = (SELECT MAX(post_id) FROM phpbb_posts) WHERE counter_id = 1 sql_query_pre = UPDATE phpbb_sphinx SET max_doc_id = (SELECT MAX(post_id) FROM phpbb_posts) WHERE counter_id = 1
sql_query_range = SELECT MIN(post_id), MAX(post_id) FROM phpbb_posts sql_query_range = SELECT MIN(post_id), MAX(post_id) FROM phpbb_posts
sql_range_step = 5000 sql_range_step = 5000
sql_query = SELECT\ sql_query = SELECT \
p.post_id AS id,\ p.post_id AS id, \
p.forum_id,\ p.forum_id, \
p.topic_id,\ p.topic_id, \
p.poster_id,\ p.poster_id, \
CASE WHEN p.post_id = t.topic_first_post_id THEN 1 ELSE 0 END as topic_first_post,\ CASE WHEN p.post_id = t.topic_first_post_id THEN 1 ELSE 0 END as topic_first_post, \
p.post_time,\ p.post_time, \
p.post_subject,\ p.post_subject, \
p.post_subject as title,\ p.post_subject as title, \
p.post_text as data,\ p.post_text as data, \
t.topic_last_post_time,\ t.topic_last_post_time, \
0 as deleted\ 0 as deleted\
FROM phpbb_posts p, phpbb_topics t\ FROM phpbb_posts p, phpbb_topics t \
WHERE\ WHERE \
p.topic_id = t.topic_id\ p.topic_id = t.topic_id \
AND p.post_id >= $start AND p.post_id <= $end AND p.post_id >= $start AND p.post_id <= $end
sql_query_post = sql_query_post =
sql_query_post_index = UPDATE phpbb_sphinx SET max_doc_id = $maxid WHERE counter_id = 1 sql_query_post_index = UPDATE phpbb_sphinx SET max_doc_id = $maxid WHERE counter_id = 1
sql_query_info = SELECT * FROM phpbb_posts WHERE post_id = $id sql_query_info = SELECT * FROM phpbb_posts WHERE post_id = $id
@ -43,22 +43,22 @@ source source_phpbb_{SPHINX_ID}_delta : source_phpbb_{SPHINX_ID}_main
sql_query_pre = sql_query_pre =
sql_query_range = sql_query_range =
sql_range_step = sql_range_step =
sql_query = SELECT\ sql_query = SELECT \
p.post_id AS id,\ p.post_id AS id, \
p.forum_id,\ p.forum_id, \
p.topic_id,\ p.topic_id, \
p.poster_id,\ p.poster_id, \
CASE WHEN p.post_id = t.topic_first_post_id THEN 1 ELSE 0 END as topic_first_post,\ CASE WHEN p.post_id = t.topic_first_post_id THEN 1 ELSE 0 END as topic_first_post, \
p.post_time,\ p.post_time, \
p.post_subject,\ p.post_subject, \
p.post_subject as title,\ p.post_subject as title, \
p.post_text as data,\ p.post_text as data, \
t.topic_last_post_time,\ t.topic_last_post_time, \
0 as deleted\ 0 as deleted \
FROM phpbb_posts p, phpbb_topics t\ FROM phpbb_posts p, phpbb_topics t \
WHERE\ WHERE \
p.topic_id = t.topic_id\ p.topic_id = t.topic_id \
AND p.post_id >= ( SELECT max_doc_id FROM phpbb_sphinx WHERE counter_id=1 ) AND p.post_id >= ( SELECT max_doc_id FROM phpbb_sphinx WHERE counter_id=1 )
sql_query_pre = sql_query_pre =
} }
index index_phpbb_{SPHINX_ID}_main index index_phpbb_{SPHINX_ID}_main

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

@ -258,13 +258,13 @@ class phpbb_search_fulltext_sphinx
$config_object = new phpbb_search_sphinx_config($this->config_file_data); $config_object = new phpbb_search_sphinx_config($this->config_file_data);
$config_data = array( $config_data = array(
'source source_phpbb_' . $this->id . '_main' => array( 'source source_phpbb_' . $this->id . '_main' => array(
array('type', $this->dbtype . ' #mysql or pgsql'), array('type', $this->dbtype . ' # mysql or pgsql'),
// This config value sql_host needs to be changed incase sphinx and sql are on different servers // This config value sql_host needs to be changed incase sphinx and sql are on different servers
array('sql_host', $dbhost . ' #SQL server host sphinx connects to'), array('sql_host', $dbhost . ' # SQL server host sphinx connects to'),
array('sql_user', $dbuser), array('sql_user', $dbuser),
array('sql_pass', $dbpasswd), array('sql_pass', $dbpasswd),
array('sql_db', $dbname), array('sql_db', $dbname),
array('sql_port', $dbport . ' #optional, default is 3306 for mysql and 5432 for pgsql'), array('sql_port', $dbport . ' # optional, default is 3306 for mysql and 5432 for pgsql'),
array('sql_query_pre', 'SET NAMES \'utf8\''), array('sql_query_pre', 'SET NAMES \'utf8\''),
array('sql_query_pre', 'UPDATE ' . SPHINX_TABLE . ' SET max_doc_id = (SELECT MAX(post_id) FROM ' . POSTS_TABLE . ') WHERE counter_id = 1'), array('sql_query_pre', 'UPDATE ' . SPHINX_TABLE . ' SET max_doc_id = (SELECT MAX(post_id) FROM ' . POSTS_TABLE . ') WHERE counter_id = 1'),
array('sql_query_range', 'SELECT MIN(post_id), MAX(post_id) FROM ' . POSTS_TABLE . ''), array('sql_query_range', 'SELECT MIN(post_id), MAX(post_id) FROM ' . POSTS_TABLE . ''),

2
phpBB/includes/search/sphinx/config_variable.php
View file

@ -75,6 +75,6 @@ class phpbb_search_sphinx_config_variable
*/ */
function to_string() function to_string()
{ {
return "\t" . $this->name . ' = ' . str_replace("\n", "\\\n", $this->value) . ' ' . $this->comment . "\n"; return "\t" . $this->name . ' = ' . str_replace("\n", " \\\n", $this->value) . ' ' . $this->comment . "\n";
} }
} }