From 394c77d322fc62a89cef7edda49c561bc54b71e3 Mon Sep 17 00:00:00 2001 From: SJ Date: Fri, 20 Sep 2013 20:18:04 +0200 Subject: [PATCH] sphinx related fixes --- etc/sphinx.conf.in | 10 +++++----- webui/config.php | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/etc/sphinx.conf.in b/etc/sphinx.conf.in index 6c919e8c..feb419a7 100644 --- a/etc/sphinx.conf.in +++ b/etc/sphinx.conf.in @@ -32,31 +32,31 @@ source delta : base source main1 : base { sql_query_pre = SET NAMES utf8 - sql_query = SELECT id, `from`, `to`, `fromdomain`, `todomain`, `subject`, `arrived`, `sent`, `body`, `size`, `direction`, `folder`, `attachments`, `attachment_types` FROM sph_index WHERE id=-1; + sql_query = SELECT id, `from`, `to`, `fromdomain`, `todomain`, `subject`, `arrived`, `sent`, `body`, `size`, `direction`, `folder`, `attachments`, `attachment_types` FROM sph_index WHERE id=-1 } source main2 : base { sql_query_pre = SET NAMES utf8 - sql_query = SELECT id, `from`, `to`, `fromdomain`, `todomain`, `subject`, `arrived`, `sent`, `body`, `size`, `direction`, `folder`, `attachments`, `attachment_types` FROM sph_index WHERE id=-1; + sql_query = SELECT id, `from`, `to`, `fromdomain`, `todomain`, `subject`, `arrived`, `sent`, `body`, `size`, `direction`, `folder`, `attachments`, `attachment_types` FROM sph_index WHERE id=-1 } source main3 : base { sql_query_pre = SET NAMES utf8 - sql_query = SELECT id, `from`, `to`, `fromdomain`, `todomain`, `subject`, `arrived`, `sent`, `body`, `size`, `direction`, `folder`, `attachments`, `attachment_types` FROM sph_index WHERE id=-1; + sql_query = SELECT id, `from`, `to`, `fromdomain`, `todomain`, `subject`, `arrived`, `sent`, `body`, `size`, `direction`, `folder`, `attachments`, `attachment_types` FROM sph_index WHERE id=-1 } source main4 : base { sql_query_pre = SET NAMES utf8 - sql_query = SELECT id, `from`, `to`, `fromdomain`, `todomain`, `subject`, `arrived`, `sent`, `body`, `size`, `direction`, `folder`, `attachments`, `attachment_types` FROM sph_index WHERE id=-1; + sql_query = SELECT id, `from`, `to`, `fromdomain`, `todomain`, `subject`, `arrived`, `sent`, `body`, `size`, `direction`, `folder`, `attachments`, `attachment_types` FROM sph_index WHERE id=-1 } source dailydelta : base { sql_query_pre = SET NAMES utf8 - sql_query = SELECT id, `from`, `to`, `fromdomain`, `todomain`, `subject`, `arrived`, `sent`, `body`, `size`, `direction`, `folder`, `attachments`, `attachment_types` FROM sph_index WHERE id=-1; + sql_query = SELECT id, `from`, `to`, `fromdomain`, `todomain`, `subject`, `arrived`, `sent`, `body`, `size`, `direction`, `folder`, `attachments`, `attachment_types` FROM sph_index WHERE id=-1 } source tag : base diff --git a/webui/config.php b/webui/config.php index 8babf947..65d9de5c 100644 --- a/webui/config.php +++ b/webui/config.php @@ -170,7 +170,7 @@ $config['DB_DATABASE'] = 'piler'; $config['SPHINX_DRIVER'] = 'sphinx'; $config['SPHINX_DATABASE'] = 'sphinx'; $config['SPHINX_HOSTNAME'] = '127.0.0.1:9306'; -$config['SPHINX_MAIN_INDEX'] = 'dailydelta1,main1'; +$config['SPHINX_MAIN_INDEX'] = 'main1,dailydelta1,delta1'; $config['SPHINX_TAG_INDEX'] = 'tag1'; $config['SPHINX_NOTE_INDEX'] = 'note1';