james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixes #547 -> multi-tag searches not working with wildcard when wildcard matches more than 1 tag

Browse Source 
is there a better way to do this?
This commit is contained in:
Daku 2016-05-22 18:35:37 +01:00
parent 3b171ffc5a
commit 61acb24875
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/imageboard.pack.php
View File

@ -985,6 +985,7 @@ class Image {
$img_querylets = self::parse_meta_terms($terms); $img_querylets = self::parse_meta_terms($terms);
$positive_tag_count = 0; $positive_tag_count = 0;
$negative_tag_count = 0; $negative_tag_count = 0;
$wildcard_count = 0;
$terms = Tag::resolve_aliases($terms); $terms = Tag::resolve_aliases($terms);
@ -1012,6 +1013,8 @@ class Image {
$tag_querylets[] = new TagQuerylet($term, !$negative); $tag_querylets[] = new TagQuerylet($term, !$negative);
} }
} }
if(strpos($term, '%') !== FALSE) $wildcard_count++;
} }
// merge all the tag querylets into one generic one // merge all the tag querylets into one generic one
@ -1019,7 +1022,13 @@ class Image {
$terms = array(); $terms = array();
foreach($tag_querylets as $tq) { foreach($tag_querylets as $tq) {
$sign = $tq->positive ? "+" : "-"; $sign = $tq->positive ? "+" : "-";
if(!$wildcard_count) {
$sql .= ' '.$sign.' (tag LIKE :tag'.Image::$tag_n.')'; $sql .= ' '.$sign.' (tag LIKE :tag'.Image::$tag_n.')';
} else {
$sql .= ' '.$sign.' IF(SUM(tag LIKE :tag'.Image::$tag_n.'), 1, 0)';
}
$terms['tag'.Image::$tag_n] = $tq->tag; $terms['tag'.Image::$tag_n] = $tq->tag;
Image::$tag_n++; Image::$tag_n++;
@ -1038,7 +1047,7 @@ class Image {
else if($positive_tag_count === 1 && $negative_tag_count === 0) { else if($positive_tag_count === 1 && $negative_tag_count === 0) {
// MySQL is braindead, and does a full table scan on images, running the subquery once for each row -_- // MySQL is braindead, and does a full table scan on images, running the subquery once for each row -_-
// "{$this->get_images} WHERE images.id IN (SELECT image_id FROM tags WHERE tag LIKE ?) ", // "{$this->get_images} WHERE images.id IN (SELECT image_id FROM tags WHERE tag LIKE ?) ",
$group_by = ((strpos($tag_search->variables['tag0'], '%') !== FALSE) ? "GROUP BY images.id" : ""); $group_by = (!$wildcard_count ? "" : "GROUP BY images.id");
$query = new Querylet(" $query = new Querylet("
SELECT images.* SELECT images.*
FROM images FROM images
@ -1076,8 +1085,9 @@ class Image {
if($tags_ok) { if($tags_ok) {
$tag_id_list = join(', ', $tag_id_array); $tag_id_list = join(', ', $tag_id_array);
$sum = (!$wildcard_count ? "SUM" : "");
$subquery = new Querylet(' $subquery = new Querylet('
SELECT images.*, SUM('.$tag_search->sql.') AS score SELECT images.*, '.$sum.'('.$tag_search->sql.') AS score
FROM images FROM images
LEFT JOIN image_tags ON image_tags.image_id = images.id LEFT JOIN image_tags ON image_tags.image_id = images.id
JOIN tags ON image_tags.tag_id = tags.id JOIN tags ON image_tags.tag_id = tags.id