aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/docs
diff options
context:
space:
mode:
authorOleg Pudeyev <oleg@bsdpower.com>2012-12-07 21:57:33 -0500
committerOleg Pudeyev <oleg@bsdpower.com>2012-12-07 21:57:33 -0500
commit03d2c6413c25b1faf7f37ff20625ce986b19eb88 (patch)
tree707ccf93ce8dba959b9601000a4272ab52b1d37e /phpBB/docs
parentb7b8fefdd084b51c93b15dfdfb34d2ef294f4d76 (diff)
downloadforums-03d2c6413c25b1faf7f37ff20625ce986b19eb88.tar
forums-03d2c6413c25b1faf7f37ff20625ce986b19eb88.tar.gz
forums-03d2c6413c25b1faf7f37ff20625ce986b19eb88.tar.bz2
forums-03d2c6413c25b1faf7f37ff20625ce986b19eb88.tar.xz
forums-03d2c6413c25b1faf7f37ff20625ce986b19eb88.zip
[ticket/11248] Convert line endings to LF - develop edition.
PHPBB3-11248
Diffstat (limited to 'phpBB/docs')
-rw-r--r--phpBB/docs/sphinx.sample.conf90
1 files changed, 60 insertions, 30 deletions
diff --git a/phpBB/docs/sphinx.sample.conf b/phpBB/docs/sphinx.sample.conf
index aa0e8d905d..fcaba6dcf3 100644
--- a/phpBB/docs/sphinx.sample.conf
+++ b/phpBB/docs/sphinx.sample.conf
@@ -10,21 +10,36 @@ source source_phpbb_{SPHINX_ID}_main
sql_query_pre = UPDATE phpbb_sphinx SET max_doc_id = MAX(post_id) WHERE counter_id = 1
sql_query_range = SELECT MIN(post_id), MAX(post_id) FROM phpbb_posts
sql_range_step = 5000
- sql_query = SELECT \
- p.post_id AS id, \
- p.forum_id, \
- p.topic_id, \
- p.poster_id, \
- CASE WHEN p.post_id = t.topic_first_post_id THEN 1 ELSE 0 END as topic_first_post, \
- p.post_time, \
- p.post_subject, \
- p.post_subject as title, \
- p.post_text as data, \
- t.topic_last_post_time, \
- 0 as deleted \
- FROM phpbb_posts p, phpbb_topics t \
- WHERE \
- p.topic_id = t.topic_id \
+ sql_query = SELECT
+\
+ p.post_id AS id,
+\
+ p.forum_id,
+\
+ p.topic_id,
+\
+ p.poster_id,
+\
+ CASE WHEN p.post_id = t.topic_first_post_id THEN 1 ELSE 0 END as topic_first_post,
+\
+ p.post_time,
+\
+ p.post_subject,
+\
+ p.post_subject as title,
+\
+ p.post_text as data,
+\
+ t.topic_last_post_time,
+\
+ 0 as deleted
+\
+ FROM phpbb_posts p, phpbb_topics t
+\
+ WHERE
+\
+ p.topic_id = t.topic_id
+\
AND p.post_id >= $start AND p.post_id <= $end
sql_query_post =
sql_query_post_index = UPDATE phpbb_sphinx SET max_doc_id = $maxid WHERE counter_id = 1
@@ -42,21 +57,36 @@ source source_phpbb_{SPHINX_ID}_delta : source_phpbb_{SPHINX_ID}_main
{
sql_query_range =
sql_range_step =
- sql_query = SELECT \
- p.post_id AS id, \
- p.forum_id, \
- p.topic_id, \
- p.poster_id, \
- CASE WHEN p.post_id = t.topic_first_post_id THEN 1 ELSE 0 END as topic_first_post, \
- p.post_time, \
- p.post_subject, \
- p.post_subject as title, \
- p.post_text as data, \
- t.topic_last_post_time, \
- 0 as deleted \
- FROM phpbb_posts p, phpbb_topics t \
- WHERE \
- p.topic_id = t.topic_id \
+ sql_query = SELECT
+\
+ p.post_id AS id,
+\
+ p.forum_id,
+\
+ p.topic_id,
+\
+ p.poster_id,
+\
+ CASE WHEN p.post_id = t.topic_first_post_id THEN 1 ELSE 0 END as topic_first_post,
+\
+ p.post_time,
+\
+ p.post_subject,
+\
+ p.post_subject as title,
+\
+ p.post_text as data,
+\
+ t.topic_last_post_time,
+\
+ 0 as deleted
+\
+ FROM phpbb_posts p, phpbb_topics t
+\
+ WHERE
+\
+ p.topic_id = t.topic_id
+\
AND p.post_id >= ( SELECT max_doc_id FROM phpbb_sphinx WHERE counter_id=1 )
sql_query_pre =
}