clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Include more field in the fulltext search

This commit is contained in:
Michael 2020-09-19 10:45:11 +00:00
parent dfeae25e6d
commit 86592daaa1
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Model/ItemContent.php
View File

@ -31,7 +31,7 @@ class ItemContent
{
public static function getURIIdListBySearch(string $search, int $uid = 0, int $start = 0, int $limit = 100)
{
$condition = ["`uri-id` IN (SELECT `uri-id` FROM `item-content` WHERE MATCH (`body`) AGAINST (? IN BOOLEAN MODE))
$condition = ["`uri-id` IN (SELECT `uri-id` FROM `item-content` WHERE MATCH (`title`, `content-warning`, `body`) AGAINST (? IN BOOLEAN MODE))
AND (NOT `private` OR (`private` AND `uid` = ?))", $search, $uid];
$params = [
'order' => ['uri-id' => true],
@ -50,6 +50,13 @@ class ItemContent
return $uriids;
}
public static function countBySearch(string $search, int $uid = 0)
{
$condition = ["`uri-id` IN (SELECT `uri-id` FROM `item-content` WHERE MATCH (`title`, `content-warning`, `body`) AGAINST (? IN BOOLEAN MODE))
AND (NOT `private` OR (`private` AND `uid` = ?))", $search, $uid];
return DBA::count('item', $condition);
}
/**
* Convert a message into plaintext for connectors to other networks
*

3
src/Module/Search/Index.php
View File

@ -152,16 +152,17 @@ class Index extends BaseSearch
if ($tag) {
Logger::info('Start tag search.', ['q' => $search]);
$uriids = Tag::getURIIdListByTag($search, local_user(), $pager->getStart(), $pager->getItemsPerPage());
$count = Tag::countByTag($search, local_user());
} else {
Logger::info('Start fulltext search.', ['q' => $search]);
$uriids = ItemContent::getURIIdListBySearch($search, local_user(), $pager->getStart(), $pager->getItemsPerPage());
$count = ItemContent::countBySearch($search, local_user());
}
if (!empty($uriids)) {
$params = ['order' => ['id' => true], 'group_by' => ['uri-id']];
$items = Item::selectForUser(local_user(), [], ['uri-id' => $uriids], $params);
$r = Item::inArray($items);
$count = Tag::countByTag($search, local_user());
} else {
$count = 0;
}

2
static/dbstructure.config.php
View File

@ -857,7 +857,7 @@ return [
"indexes" => [
"PRIMARY" => ["id"],
"uri-plink-hash" => ["UNIQUE", "uri-plink-hash"],
"body" => ["FULLTEXT", "body"],
"title-content-warning-body" => ["FULLTEXT", "title", "content-warning", "body"],
"uri" => ["uri(191)"],
"plink" => ["plink(191)"],
"uri-id" => ["uri-id"]