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

webui search fixes

Browse Source
This commit is contained in:
SJ
2012-02-12 16:16:54 +01:00
parent 2a9376222c
commit cfb7b80120
5 changed files with 70 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -162,7 +162,7 @@ class ModelSearchSearch extends Model {
if($data['body']) { if($match) { $match .= " & "; } $match .= "(@body " . $data['body'] . ") "; }
if($data['subject']) { if($match) { $match .= " & "; } $match .= "(@subject " . $data['subject'] . ") "; }
if($data['attachment_type']) { if($match) { $match .= " & "; } $match .= "(@attachment_types " . $data['attachment_type'] . ") "; }
if($data['attachment_type'] && $data['attachment_type'] != "any") { if($match) { $match .= " & "; } $match .= "(@attachment_types " . $data['attachment_type'] . ") "; }
return $match;
}
@ -249,7 +249,7 @@ class ModelSearchSearch extends Model {
$ids = array();
$direction = $size = '';
$tag_id_list = '';
$a = "";
if($data['sort'] == 'from' || $data['sort'] == 'subj') { $sortorder = ''; }
@ -264,6 +264,7 @@ class ModelSearchSearch extends Model {
if(preg_match("/^(\>|\<)\={0,}\d{1,}$/", $data['size'])) { $size = "size " . $data['size'] . " AND "; }
}
if(isset($data['attachment_type']) && $data['attachment_type'] == 'any') { $a = "attachments > 0 AND "; }
if($data['tag']) {
$data['tag'] = $this->fixup_sphinx_operators($data['tag']);
@ -277,7 +278,7 @@ class ModelSearchSearch extends Model {
$query = $this->sphx->query("SELECT id FROM " . SPHINX_MAIN_INDEX . " WHERE id IN (" . substr($tag_id_list, 1, strlen($tag_id_list)) . ") $sortorder LIMIT 0," . MAX_SEARCH_HITS);
}
else {
$query = $this->sphx->query("SELECT id FROM " . SPHINX_MAIN_INDEX . " WHERE $date $direction $size MATCH('$conditions') $sortorder LIMIT 0," . MAX_SEARCH_HITS);
$query = $this->sphx->query("SELECT id FROM " . SPHINX_MAIN_INDEX . " WHERE $a $date $direction $size MATCH('$conditions') $sortorder LIMIT 0," . MAX_SEARCH_HITS);
}
//print $query->query; print "<p>" . $query->exec_time . "</p>\n";