summaryrefslogtreecommitdiff
path: root/lib/VNWeb
diff options
context:
space:
mode:
authorYorhel <git@yorhel.nl>2021-01-21 10:07:12 +0100
committerYorhel <git@yorhel.nl>2021-01-21 10:10:23 +0100
commitebb48fad0da450d0c07c9dc9d171eb612fa56486 (patch)
tree5af199b36752f5b604ed591dab3ae43e023627e4 /lib/VNWeb
parentb7191ab5eb79a9683cafc154dd1dd0492ae6c153 (diff)
AdvSearch: Stop logging filter compatibility conversion errors
I think I've seen all the possible errors by now, what remains are invalid/corrupted filter strings that aren't very interesting to handle.
Diffstat (limited to 'lib/VNWeb')
-rw-r--r--lib/VNWeb/Chars/List.pm6
-rw-r--r--lib/VNWeb/Releases/List.pm6
-rw-r--r--lib/VNWeb/Staff/List.pm6
-rw-r--r--lib/VNWeb/TT/TagPage.pm6
-rw-r--r--lib/VNWeb/TT/TraitPage.pm6
-rw-r--r--lib/VNWeb/VN/List.pm6
6 files changed, 6 insertions, 30 deletions
diff --git a/lib/VNWeb/Chars/List.pm b/lib/VNWeb/Chars/List.pm
index d8ab1894..f35e1d3e 100644
--- a/lib/VNWeb/Chars/List.pm
+++ b/lib/VNWeb/Chars/List.pm
@@ -61,11 +61,7 @@ TUWF::get qr{/c(?:/(?<char>all|[a-z0]))?}, sub {
my $f = filter_char_adv filter_parse c => $opt->{fil};
tuwf->compile({ advsearch => 'c' })->validate(@$f > 1 ? $f : undef)->data;
};
- if(!$q) {
- warn "Filter compatibility conversion failed\n$@";
- } else {
- return tuwf->resRedirect(tuwf->reqPath().'?'.query_encode(%$opt, fil => undef, f => $q), 'temp');
- }
+ return tuwf->resRedirect(tuwf->reqPath().'?'.query_encode(%$opt, fil => undef, f => $q), 'temp') if $q;
}
$opt->{f} = advsearch_default 'c' if !$opt->{f}{query} && !defined tuwf->reqGet('f');
diff --git a/lib/VNWeb/Releases/List.pm b/lib/VNWeb/Releases/List.pm
index 723f70f0..8e985a23 100644
--- a/lib/VNWeb/Releases/List.pm
+++ b/lib/VNWeb/Releases/List.pm
@@ -45,11 +45,7 @@ TUWF::get qr{/r}, sub {
my $q = eval {
tuwf->compile({ advsearch => 'r' })->validate(filter_release_adv filter_parse r => $opt->{fil})->data;
};
- if(!$q) {
- warn "Filter compatibility conversion failed\n$@";
- } else {
- return tuwf->resRedirect(tuwf->reqPath().'?'.query_encode(%$opt, fil => undef, f => $q), 'temp');
- }
+ return tuwf->resRedirect(tuwf->reqPath().'?'.query_encode(%$opt, fil => undef, f => $q), 'temp') if $q;
}
$opt->{f} = advsearch_default 'r' if !$opt->{f}{query} && !defined tuwf->reqGet('f');
diff --git a/lib/VNWeb/Staff/List.pm b/lib/VNWeb/Staff/List.pm
index 967591d7..cf773131 100644
--- a/lib/VNWeb/Staff/List.pm
+++ b/lib/VNWeb/Staff/List.pm
@@ -46,11 +46,7 @@ TUWF::get qr{/s(?:/(?<char>all|[a-z0]))?}, sub {
$f = filter_staff_adv $f;
tuwf->compile({ advsearch => 's' })->validate(@$f > 1 ? $f : undef)->data;
};
- if(!$q) {
- warn "Filter compatibility conversion failed\n$@";
- } else {
- return tuwf->resRedirect(tuwf->reqPath().'?'.query_encode(%$opt, fil => undef, f => $q), 'temp');
- }
+ return tuwf->resRedirect(tuwf->reqPath().'?'.query_encode(%$opt, fil => undef, f => $q), 'temp') if $q;
}
$opt->{f} = advsearch_default 's' if !$opt->{f}{query} && !defined tuwf->reqGet('f');
diff --git a/lib/VNWeb/TT/TagPage.pm b/lib/VNWeb/TT/TagPage.pm
index 70f009da..2de7c27d 100644
--- a/lib/VNWeb/TT/TagPage.pm
+++ b/lib/VNWeb/TT/TagPage.pm
@@ -85,11 +85,7 @@ sub vns_ {
$f = filter_vn_adv $f;
tuwf->compile({ advsearch => 'v' })->validate(@$f > 1 ? $f : undef)->data;
};
- if(!$q) {
- warn "Filter compatibility conversion failed\n$@";
- } elsif($q->{query}) {
- return tuwf->resRedirect(tuwf->reqPath().'?'.query_encode(%$opt, fil => undef, f => $q), 'temp');
- }
+ return tuwf->resRedirect(tuwf->reqPath().'?'.query_encode(%$opt, fil => undef, f => $q), 'temp') if $q;
}
$opt->{f} = advsearch_default 'v' if !$opt->{f}{query} && !defined tuwf->reqGet('f');
diff --git a/lib/VNWeb/TT/TraitPage.pm b/lib/VNWeb/TT/TraitPage.pm
index 5a36d667..2ca10595 100644
--- a/lib/VNWeb/TT/TraitPage.pm
+++ b/lib/VNWeb/TT/TraitPage.pm
@@ -77,11 +77,7 @@ sub chars_ {
$f = filter_char_adv $f;
tuwf->compile({ advsearch => 'c' })->validate(@$f > 1 ? $f : undef)->data;
};
- if(!$q) {
- warn "Filter compatibility conversion failed\n$@";
- } elsif($q->{query}) {
- return tuwf->resRedirect(tuwf->reqPath().'?'.query_encode(%$opt, fil => undef, f => $q), 'temp');
- }
+ return tuwf->resRedirect(tuwf->reqPath().'?'.query_encode(%$opt, fil => undef, f => $q), 'temp') if $q;
}
$opt->{f} = advsearch_default 'c' if !$opt->{f}{query} && !defined tuwf->reqGet('f');
diff --git a/lib/VNWeb/VN/List.pm b/lib/VNWeb/VN/List.pm
index 7e19f2de..90a6b93b 100644
--- a/lib/VNWeb/VN/List.pm
+++ b/lib/VNWeb/VN/List.pm
@@ -106,11 +106,7 @@ TUWF::get qr{/v(?:/(?<char>all|[a-z0]))?}, sub {
);
tuwf->compile({ advsearch => 'v' })->validate(@q > 1 ? ['and',@q] : @q)->data;
};
- if(!$q) {
- warn "Filter compatibility conversion failed\n$@";
- } else {
- return tuwf->resRedirect(tuwf->reqPath().'?'.query_encode(%$opt, fil => undef, rfil => undef, cfil => undef, f => $q), 'temp');
- }
+ return tuwf->resRedirect(tuwf->reqPath().'?'.query_encode(%$opt, fil => undef, rfil => undef, cfil => undef, f => $q), 'temp') if $q;
}
$opt->{f} = advsearch_default 'v' if !$opt->{f}{query} && !defined tuwf->reqGet('f');