badmanners/shimmie2
badmanners/shimmie2
Archived
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changed related tags queries to run more efficiently, filter out the starting tags, and filter out any tags starting with tagme, rather than just tagme.

Browse source
This commit is contained in:
Matthew Barbour 2019-06-24 17:32:09 -05:00 committed by matthew
parent e6411c32aa
commit ee3f53e108
1 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
ext/tag_list/main.php
View file

@ -419,20 +419,16 @@ class TagList extends Extension
$query = " $query = "
SELECT t3.tag AS tag, t3.count AS calc_count, it3.tag_id SELECT t3.tag AS tag, t3.count AS calc_count, it3.tag_id
FROM FROM image_tags AS it1 -- Starting image's tags
image_tags AS it1, INNER JOIN tags AS t1 ON t1.id = it1.tag_id AND t1.tag NOT LIKE 'tagme%'
image_tags AS it2, -- Get images with the same tags as the starting image
image_tags AS it3, INNER JOIN image_tags AS it2 ON it1.tag_id=it2.tag_id
tags AS t1, -- Get the tags from those other images except the same as the starting tags
tags AS t3 INNER JOIN image_tags AS it3 ON it2.image_id=it3.image_id
LEFT JOIN image_tags it4 ON it4.image_id = it1.image_id AND it4.tag_id = it3.tag_id
INNER JOIN tags AS t3 ON t3.id = it3.tag_id AND t3.tag NOT LIKE 'tagme%'
WHERE WHERE
it1.image_id=:image_id it1.image_id=:image_id
AND it1.tag_id=it2.tag_id
AND it2.image_id=it3.image_id
AND t1.tag != 'tagme'
AND t3.tag != 'tagme'
AND t1.id = it1.tag_id
AND t3.id = it3.tag_id
GROUP BY it3.tag_id, t3.tag, t3.count GROUP BY it3.tag_id, t3.tag, t3.count
ORDER BY calc_count DESC ORDER BY calc_count DESC
LIMIT :tag_list_length LIMIT :tag_list_length
@ -527,6 +523,9 @@ class TagList extends Extension
$tag_id_array = []; $tag_id_array = [];
$tags_ok = true; $tags_ok = true;
foreach ($wild_tags as $tag) { foreach ($wild_tags as $tag) {
if ($tag[0] == "-" || strpos($tag, "tagme")===0) {
continue;
}
$tag = str_replace("*", "%", $tag); $tag = str_replace("*", "%", $tag);
$tag = str_replace("?", "_", $tag); $tag = str_replace("?", "_", $tag);
$tag_ids = $database->get_col("SELECT id FROM tags WHERE tag LIKE :tag AND count < 25000", ["tag" => $tag]); $tag_ids = $database->get_col("SELECT id FROM tags WHERE tag LIKE :tag AND count < 25000", ["tag" => $tag]);