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

manually pull parts out of 57f2a50fb7

Browse Source
This commit is contained in:
Shish 2019-07-07 11:16:47 +01:00
parent f8a08a7aae
commit 4136b1bb6b
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ext/tag_list/main.php
View File

@ -422,7 +422,7 @@ class TagList extends Extension
ORDER BY calc_count DESC
LIMIT :tag_list_length
";
$args = ["image_id"=>$image->id, "tag_list_length"=>$config->get_int('tag_list_length')];
$args = ["image_id" => $image->id, "tag_list_length" => $config->get_int('tag_list_length')];
$tags = $database->get_all($query, $args);
if (count($tags) > 0) {
@ -514,7 +514,7 @@ class TagList extends Extension
foreach ($wild_tags as $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]);
// $search_tags = array_merge($search_tags,
// $database->get_col("SELECT tag FROM tags WHERE tag LIKE :tag", array("tag"=>$tag)));
$tag_id_array = array_merge($tag_id_array, $tag_ids);
@ -525,23 +525,20 @@ class TagList extends Extension
}
$tag_id_list = join(', ', $tag_id_array);
if (count($tag_id_array) > 5) {
if (count($tag_id_array) > 5 || count($tag_id_array) == 0) {
return;
}
if ($tags_ok) {
$query = "
SELECT t2.tag AS tag, COUNT(it2.image_id) AS calc_count
FROM
image_tags AS it1,
image_tags AS it2,
tags AS t1,
tags AS t2
FROM image_tags AS it1 -- Got other images with the same tags
-- Get the tags from those images, except those the same as the starting tags
INNER JOIN image_tags AS it2 ON it1.image_id=it2.image_id AND it2.tag_id NOT IN($tag_id_list)
-- And filter out anything starting with tagme
INNER JOIN tags AS t2 ON it2.tag_id = t2.id AND t2.tag NOT LIKE 'tagme%'
WHERE
t1.id IN($tag_id_list)
AND it1.image_id=it2.image_id
AND it1.tag_id = t1.id
AND it2.tag_id = t2.id
it1.tag_id IN($tag_id_list)
GROUP BY t2.tag
ORDER BY calc_count
DESC LIMIT :limit