X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FSearchView.pm;h=c42cf2d63fa3c9b99c2ce5fc534addffcebe8fd6;hb=38c481a5438593cff686709493a70b8a6b3033d1;hp=ccc53abf23e4f5a0a24d4d07b56fc648b857932a;hpb=3fc59df0d633a17e0c5e43d633d12e8772c06ec3;p=public-inbox.git diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm index ccc53abf..c42cf2d6 100644 --- a/lib/PublicInbox/SearchView.pm +++ b/lib/PublicInbox/SearchView.pm @@ -5,15 +5,16 @@ package PublicInbox::SearchView; use strict; use warnings; +use URI::Escape qw(uri_unescape uri_escape); use PublicInbox::SearchMsg; -use PublicInbox::Hval qw/ascii_html/; +use PublicInbox::Hval qw/ascii_html obfuscate_addrs/; use PublicInbox::View; use PublicInbox::WwwAtomStream; -use PublicInbox::MID qw(mid2path mid_mime mid_clean mid_escape); +use PublicInbox::MID qw(mid2path mid_mime mid_clean mid_escape MID_ESC); use PublicInbox::MIME; require PublicInbox::Git; require PublicInbox::SearchThread; -our $LIM = 50; +our $LIM = 200; sub noop {} @@ -29,19 +30,27 @@ sub sres_top_html { mset => 1, relevance => $q->{r}, }; - my ($mset, $total); + my ($mset, $total, $err, $cb); +retry: eval { $mset = $ctx->{srch}->query($q->{'q'}, $opts); $total = $mset->get_matches_estimated; }; - my $err = $@; + $err = $@; ctx_prepare($q, $ctx); - my $cb; if ($err) { $code = 400; $ctx->{-html_tip} = '
'.err_txt($ctx, $err).'
\n[No results found]
'; + my $initial_q = $ctx->{-uxs_retried}; + if (defined $initial_q) { + my $rewritten = $q->{'q'}; + utf8::decode($initial_q); + utf8::decode($rewritten); + $initial_q = ascii_html($initial_q); + $rewritten = ascii_html($rewritten); + $rv .= " Warning: Initial query:\n $initial_q\n"; + $rv .= " returned no results, used:\n"; + $rv .= " $rewritten\n instead\n\n"; + } - my $rv = "Search results ordered by ["; + $rv .= 'Search results ordered by ['; if ($q->{r}) { my $d = $q->qs_html(r => 0); $rv .= qq{date|relevance}; @@ -145,15 +173,21 @@ sub search_nav_bot { my $o = $q->{o}; my $end = $o + $nr; my $beg = $o + 1; - my $rv = "Results $beg-$end of $total"; + my $rv = ''; + if ($beg <= $end) { + $rv .= "Results $beg-$end of $total"; + $rv .= ' (estimated)' if $end != $total; + } else { + $rv .= "No more results, only $total"; + } my $n = $o + $LIM; if ($n < $total) { my $qs = $q->qs_html(o => $n); - $rv .= qq{, next} + $rv .= qq{ next} } if ($o > 0) { - $rv .= $n < $total ? '/' : ', '; + $rv .= $n < $total ? '/' : ' '; my $p = $o - $LIM; my $qs = $q->qs_html(o => ($p > 0 ? $p : 0)); $rv .= qq{prev}; @@ -173,15 +207,17 @@ sub sort_relevance { sub mset_thread { my ($ctx, $mset, $q) = @_; my %pct; - my $msgs = $ctx->{srch}->retry_reopen(sub { [ map { + my $srch = $ctx->{srch}; + my $msgs = $srch->retry_reopen(sub { [ map { my $i = $_; my $smsg = PublicInbox::SearchMsg->load_doc($i->get_document); $pct{$smsg->mid} = $i->get_percent; $smsg; } ($mset->items) ]}); - + my $r = $q->{r}; my $rootset = PublicInbox::SearchThread::thread($msgs, - $q->{r} ? sort_relevance(\%pct) : *PublicInbox::View::sort_ts); + $r ? sort_relevance(\%pct) : *PublicInbox::View::sort_ts, + $srch); my $skel = search_nav_bot($mset, $q). ""; my $inbox = $ctx->{-inbox}; $ctx->{-upfx} = ''; @@ -195,13 +231,16 @@ sub mset_thread { $ctx->{seen} = {}; $ctx->{s_nr} = scalar(@$msgs).'+ results'; + # reduce hash lookups in skel_dump + $ctx->{-obfuscate} = $ctx->{-inbox}->{obfuscate}; PublicInbox::View::walk_thread($rootset, $ctx, *PublicInbox::View::pre_thread); + @$msgs = reverse @$msgs if $r; my $mime; sub { return unless $msgs; - while ($mime = shift @$msgs) { + while ($mime = pop @$msgs) { $mime = $inbox->msg_by_smsg($mime) and last; } if ($mime) { @@ -216,7 +255,9 @@ sub mset_thread { sub ctx_prepare { my ($q, $ctx) = @_; - my $qh = ascii_html($q->{'q'}); + my $qh = $q->{'q'}; + utf8::decode($qh); + $qh = ascii_html($qh); $ctx->{-q_value_html} = $qh; $ctx->{-atom} = '?'.$q->qs_html(x => 'A', r => undef); $ctx->{-title_html} = "$qh - search results"; @@ -248,8 +289,9 @@ sub adump { package PublicInbox::SearchQuery; use strict; use warnings; +use URI::Escape qw(uri_escape); use PublicInbox::Hval; -use PublicInbox::MID qw(mid_escape); +use PublicInbox::MID qw(MID_ESC); sub new { my ($class, $qp) = @_; @@ -274,7 +316,7 @@ sub qs_html { $self = $tmp; } - my $q = mid_escape($self->{'q'}); + my $q = uri_escape($self->{'q'}, MID_ESC); $q =~ s/%20/+/g; # improve URL readability my $qs = "q=$q";