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

fix single-tag + metadata search

Browse Source 
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.0@215 7f39781d-f577-437e-ae19-be835c7a54ca
This commit is contained in:
shish 2007-07-04 01:22:26 +00:00
parent 8a99bf5e53
commit 7fb5b5973f
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
core/database.class.php
View File

@ -121,11 +121,20 @@ class Database {
$database_fails = false; // MySQL 4.0 fails at subqueries
if(count($tag_search->variables) == 0 || $database_fails) {
$query = new Querylet("SELECT * FROM images ");
if(strlen($img_search->sql) > 0) {
$query->append_sql("WHERE 1=1 ");
$query->append($img_search);
}
}
else if(count($tag_search->variables) == 1 && $positive_tag_count == 1) {
$query = new Querylet(
"SELECT * FROM images WHERE images.id IN (SELECT image_id FROM tags WHERE tag = ?) ",
$tag_search->variables);
if(strlen($img_search->sql) > 0) {
$query->append($img_search);
}
}
else {
$s_tag_array = array_map("sql_escape", $tag_search->variables);
@ -144,11 +153,11 @@ class Database {
)
);
$query = new Querylet("SELECT * FROM ({$subquery->sql}) AS images ", $subquery->variables);
}
if(strlen($img_search->sql) > 0) {
$query->append_sql("WHERE 1=1 ");
$query->append($img_search);
if(strlen($img_search->sql) > 0) {
$query->append_sql("WHERE 1=1 ");
$query->append($img_search);
}
}
return $query;