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

don't fail at multiple searches on the same param (eg 'id>=X id<=Y')

Browse Source
This commit is contained in:
Shish 2012-04-05 16:18:41 +01:00
parent 2a8643d06e
commit fdb6727f41
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ext/index/main.php
View File

@ -129,6 +129,8 @@ class PostListBuildingEvent extends Event {
} }
class Index extends Extension { class Index extends Extension {
var $val_id = 0;
public function onInitExt(InitExtEvent $event) { public function onInitExt(InitExtEvent $event) {
global $config; global $config;
$config->set_default_int("index_images", 24); $config->set_default_int("index_images", 24);
@ -206,10 +208,11 @@ class Index extends Extension {
$event->add_querylet(new Querylet('width / height '.$cmp.' :width / :height', $args)); $event->add_querylet(new Querylet('width / height '.$cmp.' :width / :height', $args));
} }
else if(preg_match("/^(filesize|id)(<|>|<=|>=|=)(\d+[kmg]?b?)$/i", $event->term, $matches)) { else if(preg_match("/^(filesize|id)(<|>|<=|>=|=)(\d+[kmg]?b?)$/i", $event->term, $matches)) {
$this->val_id++;
$col = $matches[1]; $col = $matches[1];
$cmp = $matches[2]; $cmp = $matches[2];
$val = parse_shorthand_int($matches[3]); $val = parse_shorthand_int($matches[3]);
$event->add_querylet(new Querylet("images.$col $cmp :val", array("val"=>$val))); $event->add_querylet(new Querylet("images.$col $cmp :val{$this->val_id}", array("val{$this->val_id}"=>$val)));
} }
else if(preg_match("/^(hash|md5)=([0-9a-fA-F]*)$/i", $event->term, $matches)) { else if(preg_match("/^(hash|md5)=([0-9a-fA-F]*)$/i", $event->term, $matches)) {
$hash = strtolower($matches[2]); $hash = strtolower($matches[2]);