remove old search code
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.0@28 7f39781d-f577-437e-ae19-be835c7a54ca
This commit is contained in:
parent
a090d45ce0
commit
0d788d9d61
@ -149,64 +149,6 @@ class Database {
|
|||||||
return $query;
|
return $query;
|
||||||
}
|
}
|
||||||
|
|
||||||
private function build_search_querylet_old($tags) { // {{{
|
|
||||||
$querylet = new Querylet("SELECT images.*, SUM(");
|
|
||||||
|
|
||||||
$tnum = 0;
|
|
||||||
foreach($tags as $tag) {
|
|
||||||
if(($tag != "") && ($tag[0] == '-')) continue;
|
|
||||||
$querylet->append_sql($tnum == 0 ? "(" : " OR ");
|
|
||||||
$querylet->append($this->term_to_querylet($tag));
|
|
||||||
$tnum++;
|
|
||||||
}
|
|
||||||
$min_score = $tnum;
|
|
||||||
if($tnum > 0) $querylet->append_sql(")");
|
|
||||||
|
|
||||||
$tnum = 0;
|
|
||||||
foreach($tags as $tag) {
|
|
||||||
if(($tag == "") || ($tag[0] != '-')) continue;
|
|
||||||
$querylet->append_sql($tnum == 0 ? "-(" : " OR ");
|
|
||||||
$querylet->append($this->term_to_querylet(substr($tag, 1)));
|
|
||||||
$tnum++;
|
|
||||||
}
|
|
||||||
if($tnum > 0) $querylet->append_sql(")");
|
|
||||||
|
|
||||||
$querylet->append_sql(") AS score
|
|
||||||
FROM tags
|
|
||||||
LEFT JOIN images ON image_id=images.id
|
|
||||||
GROUP BY images.id
|
|
||||||
HAVING score >= ?
|
|
||||||
");
|
|
||||||
$querylet->add_variable($min_score);
|
|
||||||
|
|
||||||
return $querylet;
|
|
||||||
}
|
|
||||||
|
|
||||||
private function term_to_querylet($term) {
|
|
||||||
$term = $this->resolve_alias($term);
|
|
||||||
|
|
||||||
if(substr($term, 0, 5) == "size:") {
|
|
||||||
$dim = substr($term, 5);
|
|
||||||
$parts = explode('x', $dim);
|
|
||||||
return new Querylet("(width = ? AND height = ?)", array(int_escape($parts[0]), int_escape($parts[1])));
|
|
||||||
}
|
|
||||||
else if(substr($term, 0, 9) == "size-min:") {
|
|
||||||
$dim = substr($term, 9);
|
|
||||||
$parts = explode('x', $dim);
|
|
||||||
return new Querylet("(width >= ? AND height >= ?)", array(int_escape($parts[0]), int_escape($parts[1])));
|
|
||||||
}
|
|
||||||
else if(substr($term, 0, 9) == "size-max:") {
|
|
||||||
$dim = substr($term, 9);
|
|
||||||
$parts = explode('x', $dim);
|
|
||||||
return new Querylet("(width <= ? AND height <= ?)", array(int_escape($parts[0]), int_escape($parts[1])));
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
$term = str_replace("*", "%", $term);
|
|
||||||
$term = str_replace("?", "_", $term);
|
|
||||||
return new Querylet("(tag LIKE ?)", array($term));
|
|
||||||
}
|
|
||||||
} // }}}
|
|
||||||
|
|
||||||
public function delete_tags_from_image($image_id) {
|
public function delete_tags_from_image($image_id) {
|
||||||
$this->db->Execute("DELETE FROM tags WHERE image_id=?", array($image_id));
|
$this->db->Execute("DELETE FROM tags WHERE image_id=?", array($image_id));
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user