i18n/L10n review, extension credits added.
This commit is contained in:
parent
362f395e03
commit
1652ded48c
|
@ -41,8 +41,6 @@ foreach($sphinxDefaults as $key => $val) {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Plugin for Sphinx search backend.
|
||||
*
|
||||
|
@ -53,7 +51,6 @@ foreach($sphinxDefaults as $key => $val) {
|
|||
* @link http://laconi.ca/
|
||||
* @link http://twitter.com/
|
||||
*/
|
||||
|
||||
class SphinxSearchPlugin extends Plugin
|
||||
{
|
||||
/**
|
||||
|
@ -86,7 +83,8 @@ class SphinxSearchPlugin extends Plugin
|
|||
{
|
||||
if (common_config('sphinx', 'enabled')) {
|
||||
if (!class_exists('SphinxClient')) {
|
||||
throw new ServerException('Sphinx PHP extension must be installed.');
|
||||
// TRANS: Server exception.
|
||||
throw new ServerException(_m('Sphinx PHP extension must be installed.'));
|
||||
}
|
||||
$engine = new SphinxSearch($target, $table);
|
||||
if ($engine->is_connected()) {
|
||||
|
@ -97,4 +95,28 @@ class SphinxSearchPlugin extends Plugin
|
|||
// Sphinx disabled or disconnected
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Provide plugin version information.
|
||||
*
|
||||
* This data is used when showing the version page.
|
||||
*
|
||||
* @param array &$versions array of version data arrays; see EVENTS.txt
|
||||
*
|
||||
* @return boolean hook value
|
||||
*/
|
||||
function onPluginVersion(&$versions)
|
||||
{
|
||||
$url = 'http://status.net/wiki/Plugin:SphinxSearch';
|
||||
|
||||
$versions[] = array('name' => 'SphinxSearch',
|
||||
'version' => STATUSNET_VERSION,
|
||||
'author' => 'Brion Vibber',
|
||||
'homepage' => $url,
|
||||
'rawdescription' =>
|
||||
// TRANS: Plugin description.
|
||||
_m('Plugin for Sphinx search backend.'));
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -70,8 +70,6 @@ searchd
|
|||
|
||||
END;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Build config entries for a single site
|
||||
* @fixme we only seem to have master DB currently available...
|
||||
|
|
|
@ -42,20 +42,20 @@ sphinx_iterate_sites('sphinx_index_update');
|
|||
function sphinx_index_update($sn)
|
||||
{
|
||||
$base = sphinx_base();
|
||||
|
||||
|
||||
$baseIndexes = array('notice', 'profile');
|
||||
$params = array();
|
||||
|
||||
|
||||
if (have_option('rotate')) {
|
||||
$params[] = '--rotate';
|
||||
}
|
||||
foreach ($baseIndexes as $index) {
|
||||
$params[] = "{$sn->dbname}_{$index}";
|
||||
}
|
||||
|
||||
|
||||
$params = implode(' ', $params);
|
||||
$cmd = "$base/bin/indexer --config $base/etc/sphinx.conf $params";
|
||||
|
||||
|
||||
print "$cmd\n";
|
||||
system($cmd);
|
||||
}
|
||||
|
|
|
@ -60,4 +60,3 @@ function sphinx_iterate_sites($callback)
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -91,6 +91,8 @@ class SphinxSearch extends SearchEngine
|
|||
if (preg_match('!^.*?://.*?:.*?@.*?/(.*?)$!', common_config('db', 'database'), $matches)) {
|
||||
return $matches[1];
|
||||
}
|
||||
throw new ServerException("Sphinx search could not identify database name");
|
||||
|
||||
// TRANS: Server exception thrown when a database name cannot be identified.
|
||||
throw new ServerException(_m("Sphinx search could not identify database name."));
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user