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

search to SQL redone with regex, makes things more useful and less buggy

Browse Source 
git-svn-id: file:///home/shish/svn/shimmie2/trunk@17 7f39781d-f577-437e-ae19-be835c7a54ca
This commit is contained in:
shish 2007-04-27 18:04:13 +00:00
parent 6e90eed812
commit f0802f2f1c
1 changed files with 15 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
core/database.class.php
View File

@ -92,41 +92,22 @@ class Database {
$term = $this->resolve_alias($term); $term = $this->resolve_alias($term);
if(substr($term, 0, 5) == "size=") { $matches = array();
$dim = substr($term, 5); if(preg_match("/size([><=]+)(\d+)x(\d+)/", $term, $matches)) {
$parts = explode('x', $dim); $cmp = $matches[1];
$args = array(int_escape($parts[0]), int_escape($parts[1])); $args = array(int_escape($matches[2]), int_escape($matches[3]));
$img_search->append(new Querylet("AND (width = ? AND height = ?)", $args)); $img_search->append(new Querylet("AND (width $cmp ? AND height $cmp ?)", $args));
} }
else if(substr($term, 0, 5) == "size>") { else if(preg_match("/ratio([><=]+)(\d+):(\d+)/", $term, $matches)) {
$dim = substr($term, 5); $cmp = $matches[1];
$parts = explode('x', $dim); $args = array(int_escape($matches[2]), int_escape($matches[3]));
$args = array(int_escape($parts[0]), int_escape($parts[1])); $img_search->append(new Querylet("AND (width / height $cmp ? / ?)", $args));
$img_search->append(new Querylet("AND (width > ? AND height > ?)", $args));
} }
else if(substr($term, 0, 5) == "size<") { else if(preg_match("/(filesize|id)([><=]+)([\dKMGB]+)/i", $term, $matches)) {
$dim = substr($term, 5); $col = $matches[1];
$parts = explode('x', $dim); $cmp = $matches[2];
$args = array(int_escape($parts[0]), int_escape($parts[1])); $val = parse_shorthand_int($matches[3]);
$img_search->append(new Querylet("AND (width < ? AND height < ?)", $args)); $img_search->append(new Querylet("AND ($col $cmp $val)"));
}
else if(substr($term, 0, 6) == "ratio=") {
$dim = substr($term, 6);
$parts = explode(':', $dim);
$args = array(int_escape($parts[0]), int_escape($parts[1]));
$img_search->append(new Querylet("AND (width / height = ? / ?)", $args));
}
else if(substr($term, 0, 3) == "id<") {
$img_search->append(new Querylet("AND (id < ?)", array(int_escape(substr($term, 3)))));
}
else if(substr($term, 0, 3) == "id>") {
$img_search->append(new Querylet("AND (id > ?)", array(int_escape(substr($term, 3)))));
}
else if(substr($term, 0, 9) == "filesize<") {
$img_search->append(new Querylet("AND (filesize < ?)", array(parse_shorthand_int(substr($term, 9)))));
}
else if(substr($term, 0, 9) == "filesize>") {
$img_search->append(new Querylet("AND (filesize > ?)", array(parse_shorthand_int(substr($term, 9)))));
} }
else { else {
$term = str_replace("*", "%", $term); $term = str_replace("*", "%", $term);
@ -156,7 +137,7 @@ class Database {
$query = new Querylet("SELECT * FROM ({$subquery->sql}) AS images ", $subquery->variables); $query = new Querylet("SELECT * FROM ({$subquery->sql}) AS images ", $subquery->variables);
} }
if(count($img_search->variables) > 0) { if(strlen($img_search->sql) > 0) {
$query->append_sql("WHERE 1=1 "); $query->append_sql("WHERE 1=1 ");
$query->append($img_search); $query->append($img_search);
} }