X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FSearchView.pm;h=42bc648260f01f7b9259a8b16ca786660480db0e;hb=09f1e000734bc431ec7b63e18959bf6f34f9c179;hp=ab0ff19a57e8eb9d37c140d06e6a613de06a698b;hpb=0b766f54ad829d08cc7bd66fffc8ed8515241dc3;p=public-inbox.git diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm index ab0ff19a..42bc6482 100644 --- a/lib/PublicInbox/SearchView.pm +++ b/lib/PublicInbox/SearchView.pm @@ -8,14 +8,18 @@ use warnings; use PublicInbox::SearchMsg; use PublicInbox::Hval qw/ascii_html/; use PublicInbox::View; -use PublicInbox::MID qw(mid2path mid_clean mid_mime); -use Email::MIME; +use PublicInbox::WwwAtomStream; +use PublicInbox::MID qw(mid2path mid_mime mid_clean mid_escape); +use PublicInbox::MIME; require PublicInbox::Git; -our $LIM = 50; +require PublicInbox::SearchThread; +our $LIM = 200; + +sub noop {} sub sres_top_html { my ($ctx) = @_; - my $q = PublicInbox::SearchQuery->new($ctx->{cgi}); + my $q = PublicInbox::SearchQuery->new($ctx->{qp}); my $code = 200; # double the limit for expanded views: @@ -26,72 +30,92 @@ sub sres_top_html { relevance => $q->{r}, }; my ($mset, $total); - eval { - $mset = $ctx->{srch}->query($q->{q}, $opts); + $mset = $ctx->{srch}->query($q->{'q'}, $opts); $total = $mset->get_matches_estimated; }; my $err = $@; - my $res = html_start($q, $ctx) . '
'; + ctx_prepare($q, $ctx); + my $cb; if ($err) { $code = 400; - $res .= err_txt($ctx, $err) . "
" . foot($ctx); + $ctx->{-html_tip} = ''.err_txt($ctx, $err).'
'; + $cb = *noop; } elsif ($total == 0) { $code = 404; - $res .= "\n\n[No results found]
".foot($ctx); + $ctx->{-html_tip} = "' . search_nav_bot($mset, $q) . - "\n\n" . foot($ctx); } + PublicInbox::WwwStream->response($ctx, $code, $cb); +} - $res .= "\n[No results found]
"; + $cb = *noop; } else { my $x = $q->{x}; - return sub { adump($_[0], $mset, $q, $ctx) } if ($x eq 'A'); + return adump($_[0], $mset, $q, $ctx) if $x eq 'A'; - $res .= search_nav_top($mset, $q) . "\n\n"; + $ctx->{-html_tip} = search_nav_top($mset, $q) . "\n\n"; if ($x eq 't') { - return sub { tdump($_[0], $res, $mset, $q, $ctx) }; + $cb = mset_thread($ctx, $mset, $q); + } else { + $cb = mset_summary($ctx, $mset, $q); } - dump_mset(\$res, $mset); - $res .= '