X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FSearchView.pm;h=8283c1aa96f8df604f44b9116fb2ae50eac092d1;hb=476fc666c223f0fb;hp=fec4f39f84d8841c19ce0dc0f10862eed2de2579;hpb=4c2c2325d2948ec5340e2fcafbee798cf568f5fd;p=public-inbox.git diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm index fec4f39f..8283c1aa 100644 --- a/lib/PublicInbox/SearchView.pm +++ b/lib/PublicInbox/SearchView.pm @@ -6,9 +6,9 @@ package PublicInbox::SearchView; use strict; use warnings; use PublicInbox::SearchMsg; -use PublicInbox::Hval; +use PublicInbox::Hval qw/ascii_html/; use PublicInbox::View; -use PublicInbox::MID qw(mid2path mid_clean); +use PublicInbox::MID qw(mid2path mid_clean mid_mime); use Email::MIME; require PublicInbox::Git; our $LIM = 50; @@ -32,10 +32,10 @@ sub sres_top_html { $total = $mset->get_matches_estimated; }; my $err = $@; - my $res = html_start($q, $ctx) . PublicInbox::Hval::PRE; + my $res = html_start($q, $ctx) . '
'; if ($err) { $code = 400; - $res .= err_txt($err) . "
" . foot($ctx); + $res .= err_txt($ctx, $err) . "
" . foot($ctx); } elsif ($total == 0) { $code = 404; $res .= "\n\n[No results found]
".foot($ctx); @@ -43,19 +43,21 @@ sub sres_top_html { my $x = $q->{x}; return sub { adump($_[0], $mset, $q, $ctx) } if ($x eq 'A'); - $res .= search_nav_top($mset, $q); + $res .= search_nav_top($mset, $q) . "\n\n"; if ($x eq 't') { return sub { tdump($_[0], $res, $mset, $q, $ctx) }; } - $res .= "\n\n"; dump_mset(\$res, $mset); - $res .= search_nav_bot($mset, $q) . "\n\n" . foot($ctx); + $res .= '' . search_nav_bot($mset, $q) . + "\n\n" . foot($ctx); } $res .= "