We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit bf72cde9 authored by millette's avatar millette

sphinx search for notices

darcs-hash:20081120215041-099f7-db396a60755d551099122b58634b7550d5606d88.gz
parent aeaf70a4
......@@ -41,15 +41,11 @@ class NoticesearchAction extends SearchAction {
# lcase it for comparison
$q = strtolower($q);
if(common_config('db','type')=='mysql') {
$notice->whereAdd('MATCH(content) against (\''.addslashes($q).'\')');
} else {
$notice->whereAdd('to_tsvector(\'english\', content) @@ plainto_tsquery(\''.addslashes($q).'\')');
}
$search_engine = $notice->getSearchEngine('identica_notices');
$search_engine->query($q);
# Ask for an extra to see if there's more.
$notice->limit((($page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE + 1);
$search_engine->limit((($page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE + 1);
$cnt = $notice->find();
......
......@@ -40,7 +40,7 @@ class PeoplesearchAction extends SearchAction {
# lcase it for comparison
$q = strtolower($q);
$search_engine = $profile->getSearchEngine();
$search_engine = $profile->getSearchEngine('identica_people');
$search_engine->query($q);
......
......@@ -169,4 +169,19 @@ class Memcached_DataObject extends DB_DataObject
return $c->get(Memcached_DataObject::cacheKey($cls, $pkeys, $pvals));
}
}
function getSearchEngine($table) {
require_once INSTALLDIR.'/classes/SearchEngines.php';
static $search_engine;
if (!isset($search_engine)) {
if (common_config('sphinx', 'enabled')) {
$search_engine = new SphinxSearch($this, $table);
} elseif ('mysql' === common_config('db', 'type')) {
$search_engine = new MySQLSearch($this, $table);
} else {
$search_engine = new PGSearch($this, $table);
}
}
return $search_engine;
}
}
......@@ -46,21 +46,6 @@ class Profile extends Memcached_DataObject
/* the code above is auto generated do not remove the tag below */
###END_AUTOCODE
function getSearchEngine() {
require_once INSTALLDIR.'/classes/SearchEngines.php';
static $search_engine;
if (!isset($search_engine)) {
if (common_config('sphinx', 'enabled')) {
$search_engine = new SphinxSearch($this);
} elseif ('mysql' === common_config('db', 'type')) {
$search_engine = new MySQLSearch($this);
} else {
$search_engine = new PGSearch($this);
}
}
return $search_engine;
}
function getAvatar($width, $height=NULL) {
if (is_null($height)) {
$height = $width;
......
......@@ -21,9 +21,11 @@ if (!defined('LACONICA')) { exit(1); }
class SearchEngine {
protected $profile;
protected $table;
function __construct($profile) {
function __construct($profile, $table) {
$this->profile = $profile;
$this->table = $table;
}
function query($q) {
......@@ -37,8 +39,8 @@ class SearchEngine {
class SphinxSearch extends SearchEngine {
private $sphinx;
function __construct($profile) {
parent::__construct($profile);
function __construct($profile, $table) {
parent::__construct($profile, $table);
$this->sphinx = new SphinxClient;
$this->sphinx->setServer(common_config('sphinx', 'server'), common_config('sphinx', 'port'));
}
......@@ -49,7 +51,7 @@ class SphinxSearch extends SearchEngine {
}
function query($q) {
$result = $this->sphinx->query($q);
$result = $this->sphinx->query($q, $this->table);
if (!isset($result['matches'])) return false;
$id_set = join(', ', array_keys($result['matches']));
return $this->profile->whereAdd("id in ($id_set)");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment