mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-21 17:11:53 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'p/ticket/11248' into develop

Browse Source 
* p/ticket/11248:
  [ticket/11248] Convert line endings to LF - develop edition.
This commit is contained in:
Andreas Fischer
2012-12-22 23:25:54 +01:00
parent 4b808e2671 03d2c6413c
commit 7f0fa6477f
3 changed files with 1826 additions and 1796 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
phpBB/docs/sphinx.sample.conf
View File

@@ -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_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_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_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 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
@@ -42,21 +57,36 @@ source source_phpbb_{SPHINX_ID}_delta : source_phpbb_{SPHINX_ID}_main
{ {
sql_query_range = sql_query_range =
sql_range_step = sql_range_step =
sql_query_post_index = UPDATE phpbb_sphinx SET max_doc_id = $maxid WHERE counter_id = 1 sql_query = SELECT
sql_query_info = SELECT * FROM phpbb_posts WHERE post_id = $id \
sql_attr_uint = forum_id p.post_id AS id,
sql_attr_uint = topic_id \
sql_attr_uint = poster_id p.forum_id,
sql_attr_bool = topic_first_post \
sql_attr_bool = deleted p.topic_id,
sql_attr_timestamp = post_time \
sql_attr_timestamp = topic_last_post_time p.poster_id,
sql_attr_str2ordinal = post_subject \
} CASE WHEN p.post_id = t.topic_first_post_id THEN 1 ELSE 0 END as topic_first_post,
source source_phpbb_{SPHINX_ID}_delta : source_phpbb_{SPHINX_ID}_main \
{ p.post_time,
sql_query_range = \
sql_range_step = 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 ) AND p.post_id >= ( SELECT max_doc_id FROM phpbb_sphinx WHERE counter_id=1 )
sql_query_pre = sql_query_pre =
} }