hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-15 14:03:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

SphinxSearch engine default values uniformisation

Browse Source
This commit is contained in:
Romain Neutron
2013-08-08 11:03:56 +02:00
parent 607a8d7a25
commit 5b0e5ccddc
3 changed files with 27 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/ConfigurationPanel.php
View File

@@ -88,31 +88,7 @@ class ConfigurationPanel extends AbstractConfigurationPanel
{ {
$configuration = isset($this->conf['main']['search-engine']['options']) ? $this->conf['main']['search-engine']['options'] : array(); $configuration = isset($this->conf['main']['search-engine']['options']) ? $this->conf['main']['search-engine']['options'] : array();
if (!isset($configuration['charset_tables'])) { return self::populateConfiguration($configuration);
$configuration['charset_tables'] = array("common", "latin");
}
if (!isset($configuration['date_fields'])) {
$configuration['date_fields'] = array();
}
if (!isset($configuration['host'])) {
$configuration['host'] = '127.0.0.1';
}
if (!isset($configuration['port'])) {
$configuration['port'] = 9306;
}
if (!isset($configuration['rt_host'])) {
$configuration['rt_host'] = '127.0.0.1';
}
if (!isset($configuration['rt_port'])) {
$configuration['rt_port'] = 9308;
}
return $configuration;
} }
/** /**
@@ -165,11 +141,7 @@ class ConfigurationPanel extends AbstractConfigurationPanel
*/ */
public function generateSphinxConf(array $databoxes, array $configuration) public function generateSphinxConf(array $databoxes, array $configuration)
{ {
$defaults = array( $options = self::populateConfiguration($configuration);
'charset_tables' => array(),
);
$options = array_merge($defaults, $configuration);
$options['charset_tables'] = array_unique($options['charset_tables']); $options['charset_tables'] = array_unique($options['charset_tables']);
@@ -657,8 +629,8 @@ searchd
# listen = 192.168.0.1:9312 # listen = 192.168.0.1:9312
# listen = 9312 # listen = 9312
# listen = /var/run/searchd.sock # listen = /var/run/searchd.sock
listen = 127.0.0.1:19306 listen = '.$options['host'].':'.$options['port'].'
listen = 127.0.0.1:19308:mysql41 listen = '.$options['rt_host'].':'.$options['rt_port'].':mysql41
# log file, searchd run info is logged here # log file, searchd run info is logged here
# optional, default is \'searchd.log\' # optional, default is \'searchd.log\'
@@ -756,4 +728,23 @@ searchd
return $conf; return $conf;
} }
/**
* Populates a configuration with the default options, if missing.
*
* @param array $configuration
*
* @return array
*/
public static function populateConfiguration(array $configuration)
{
return array_replace(array(
'charset_tables' => array("common", "latin"),
'date_fields' => array(),
'host' => '127.0.0.1',
'port' => 9312,
'rt_host' => '127.0.0.1',
'rt_port' => 9306,
), $configuration);
}
} }

2
lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/SphinxSearchEngine.php
View File

@@ -571,6 +571,8 @@ class SphinxSearchEngine implements SearchEngineInterface
*/ */
public static function create(Application $app, array $options = array()) public static function create(Application $app, array $options = array())
{ {
$options = ConfigurationPanel::populateConfiguration($options);
return new static($app, $options['host'], $options['port'], $options['rt_host'], $options['rt_port']); return new static($app, $options['host'], $options['port'], $options['rt_host'], $options['rt_port']);
} }

4
tests/Alchemy/Tests/Phrasea/SearchEngine/SphinxSearchEngineTest.php
View File

@@ -34,7 +34,7 @@ class SphinxSearchEngineTest extends SearchEngineAbstractTest
$app = new Application('test'); $app = new Application('test');
$appbox = $app['phraseanet.appbox']; $appbox = $app['phraseanet.appbox'];
self::$searchEngine = new SphinxSearchEngine($app, '127.0.0.1', 19306, '127.0.0.1', 19308); self::$searchEngine = new SphinxSearchEngine($app, '127.0.0.1', 9312, '127.0.0.1', 9306);
self::$config = tempnam(sys_get_temp_dir(), 'tmp_sphinx.conf'); self::$config = tempnam(sys_get_temp_dir(), 'tmp_sphinx.conf');
$configuration = self::$searchEngine->getConfigurationPanel()->getConfiguration(); $configuration = self::$searchEngine->getConfigurationPanel()->getConfiguration();
@@ -63,7 +63,7 @@ class SphinxSearchEngineTest extends SearchEngineAbstractTest
self::$searchd = new Process($searchd . ' -c ' . self::$config); self::$searchd = new Process($searchd . ' -c ' . self::$config);
self::$searchd->run(); self::$searchd->run();
self::$searchEngine = new SphinxSearchEngine($app, '127.0.0.1', 19306, '127.0.0.1', 19308); self::$searchEngine = new SphinxSearchEngine($app, '127.0.0.1', 9312, '127.0.0.1', 9306);
} }
public function setUp() public function setUp()