bashclub/piler
1
0
Fork 0
mirror of https://bitbucket.org/jsuto/piler.git synced 2025-06-12 23:57:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

gui shall use rt index for tags and notes handling

Browse Source 
Signed-off-by: Janos SUTO <sj@acts.hu>
This commit is contained in:
Janos SUTO
2022-12-31 09:03:58 +01:00
parent 8a75e5f62c
commit 2740902c08
3 changed files with 76 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
webui/model/search/search.php
View File

@ -416,10 +416,16 @@ class ModelSearchSearch extends Model {
$s = $this->fixup_sphinx_operators($s);
$q = $this->sphx->query("SELECT iid FROM $sphx_table WHERE uid=" . $session->get("uid") . " AND MATCH('@$field $s') LIMIT $offset,$pagelen OPTION max_matches=" . MAX_SEARCH_HITS);
if(RT) {
$idfield = 'mid';
} else {
$idfield = 'iid';
}
$q = $this->sphx->query("SELECT $idfield FROM $sphx_table WHERE uid=" . $session->get("uid") . " AND MATCH('@$field $s') LIMIT $offset,$pagelen OPTION max_matches=" . MAX_SEARCH_HITS);
foreach($q->rows as $a) {
$id_list .= "," . $a['iid'];
$id_list .= "," . $a[$idfield];
}
if($id_list) { $id_list = substr($id_list, 1, strlen($id_list)); }
@ -513,18 +519,28 @@ class ModelSearchSearch extends Model {
}
}
array_unshift($ids, (int)$session->get("uid"));
$tags = $this->db->query("SELECT `id`, `tag` FROM `" . TABLE_TAG . "` WHERE `uid`=? AND `id` IN ($q)", $ids);
foreach ($tags->rows as $t) {
$tag[$t['id']] = $t['tag'];
if(RT) {
$id_field = 'mid';
$ids_str = implode(",", $ids);
$tags = $this->sphx->query("SELECT mid, tag FROM " . SPHINX_TAG_INDEX . " WHERE uid=" . (int)$session->get("uid") . " AND mid IN ($ids_str)");
} else {
$id_field = 'id';
array_unshift($ids, (int)$session->get("uid"));
$tags = $this->db->query("SELECT `id`, `tag` FROM `" . TABLE_TAG . "` WHERE `uid`=? AND `id` IN ($q)", $ids);
}
$notes = $this->db->query("SELECT `id`, `note` FROM " . TABLE_NOTE . " WHERE `uid`=? AND `id` IN ($q)", $ids);
foreach ($tags->rows as $t) {
$tag[$t[$id_field]] = $t['tag'];
}
if(RT) {
$notes = $this->sphx->query("SELECT mid, note FROM " . SPHINX_NOTE_INDEX . " WHERE uid=" . (int)$session->get("uid") . " AND mid IN ($ids_str)");
} else {
$notes = $this->db->query("SELECT `id`, `note` FROM " . TABLE_NOTE . " WHERE `uid`=? AND `id` IN ($q)", $ids);
}
foreach ($notes->rows as $n) {
$note[$n['id']] = $n['note'];
$note[$n[$id_field]] = $n['note'];
}
$lang = Registry::get('language');