From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 3/6] searchview: error description for invalid queries
Date: Sat, 5 Sep 2015 09:01:05 +0000 [thread overview]
Message-ID: <1441443668-21092-4-git-send-email-e@80x24.org> (raw)
In-Reply-To: <1441443668-21092-1-git-send-email-e@80x24.org>
Xapian may raise exceptions on some queries. Pass the error
along to the user so they can read Xapian documentation.
---
lib/PublicInbox/SearchView.pm | 22 ++++++++++++++++++----
1 file changed, 18 insertions(+), 4 deletions(-)
diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm
index 960049f..96b691d 100644
--- a/lib/PublicInbox/SearchView.pm
+++ b/lib/PublicInbox/SearchView.pm
@@ -12,13 +12,18 @@ our $LIM = 25;
sub sres_top_html {
my ($ctx, $q) = @_;
my $cgi = $ctx->{cgi};
+ my $code = 200;
# $q ||= $cgi->param('q');
my $o = int($cgi->param('o') || 0);
my $r = $cgi->param('r');
$r = (defined $r && $r ne '0');
my $opts = { limit => $LIM, offset => $o, mset => 1, relevance => $r };
- my $mset = $ctx->{srch}->query($q, $opts);
- my $total = $mset->get_matches_estimated;
+ my ($mset, $total);
+ eval {
+ $mset = $ctx->{srch}->query($q, $opts);
+ $total = $mset->get_matches_estimated;
+ };
+ my $err = $@;
my $query = PublicInbox::Hval->new_oneline($q);
my $qh = $query->as_html;
my $res = "<html><head><title>$qh - search results</title></head>" .
@@ -32,7 +37,16 @@ sub sres_top_html {
my $foot = $ctx->{footer} || '';
$foot = qq{Back to <a\nhref=".">index</a>.};
- if ($total == 0) {
+ if ($err) {
+ my $u = 'http://xapian.org/docs/queryparser.html';
+ $code = 400;
+ $err =~ s/^\s*Exception:\s*//; # bad word to show users :P
+ $err = PublicInbox::Hval->new_oneline($err)->as_html;
+ $res .= "\n\nBad query: <b>$err</b>\n";
+ $res .= qq{See <a\nhref="$u">$u</a> for Xapian query syntax};
+ $res .= "</pre><hr /><pre>$foot";
+ } elsif ($total == 0) {
+ $code = 404;
$res .= "\n\n[No results found]</pre><hr /><pre>$foot";
} else {
$q = $query->as_href;
@@ -74,7 +88,7 @@ sub sres_top_html {
}
$res .= "</pre></body></html>";
- [200, ['Content-Type'=>'text/html; charset=UTF-8'], [$res]];
+ [$code, ['Content-Type'=>'text/html; charset=UTF-8'], [$res]];
}
sub dump_mset {
--
EW
next prev parent reply other threads:[~2015-09-05 9:01 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-05 9:01 [PATCH 0/6] another round of search updates Eric Wong
2015-09-05 9:01 ` [PATCH 1/6] searchview: factor out dump_mset subroutine Eric Wong
2015-09-05 9:01 ` [PATCH 2/6] search: use relevance as secondary sort by default Eric Wong
2015-09-05 9:01 ` Eric Wong [this message]
2015-09-05 9:01 ` [PATCH 4/6] search: note why we do not support FLAG_PURE_NOT Eric Wong
2015-09-05 9:01 ` [PATCH 5/6] search: tweak parsing for internal queries Eric Wong
2015-09-05 9:01 ` [PATCH 6/6] extmsg: fall back to partial Message-ID matching Eric Wong
2015-09-05 9:14 ` Eric Wong
2015-09-05 9:18 ` [PATCH] extmsg: add note about the deficiency of the implementation Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1441443668-21092-4-git-send-email-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).