X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FSearchView.pm;h=8283c1aa96f8df604f44b9116fb2ae50eac092d1;hb=476fc666c223f0fb;hp=96b691df0e8f9149a99dab0a1a38530f6a7ecb70;hpb=d25c98939f599ec71371ad7c0555f0db7fcaf89c;p=public-inbox.git diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm index 96b691df..8283c1aa 100644 --- a/lib/PublicInbox/SearchView.pm +++ b/lib/PublicInbox/SearchView.pm @@ -1,96 +1,63 @@ # Copyright (C) 2015 all contributors # License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt) +# +# Displays search results for the web interface package PublicInbox::SearchView; use strict; use warnings; use PublicInbox::SearchMsg; -use PublicInbox::Hval; +use PublicInbox::Hval qw/ascii_html/; use PublicInbox::View; -use POSIX qw/strftime/; -our $LIM = 25; +use PublicInbox::MID qw(mid2path mid_clean mid_mime); +use Email::MIME; +require PublicInbox::Git; +our $LIM = 50; sub sres_top_html { - my ($ctx, $q) = @_; - my $cgi = $ctx->{cgi}; + my ($ctx) = @_; + my $q = PublicInbox::SearchQuery->new($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 }; + + # double the limit for expanded views: + my $opts = { + limit => $LIM, + offset => $q->{o}, + mset => 1, + relevance => $q->{r}, + }; my ($mset, $total); + eval { - $mset = $ctx->{srch}->query($q, $opts); + $mset = $ctx->{srch}->query($q->{q}, $opts); $total = $mset->get_matches_estimated; }; my $err = $@; - my $query = PublicInbox::Hval->new_oneline($q); - my $qh = $query->as_html; - my $res = "
'; 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: $err\n"; - $res .= qq{See $u for Xapian query syntax}; - $res .= "
$foot"; + $res .= err_txt($ctx, $err) . "
" . foot($ctx); } elsif ($total == 0) { $code = 404; - $res .= "\n\n[No results found]
$foot"; + $res .= "\n\n[No results found]
".foot($ctx); } else { - $q = $query->as_href; - $q =~ s/%20/+/g; # improve URL readability - my $qp = "?q=$q"; - $qp .= "&o=$o" if $o; - - $res .= "Search results ordered by ["; - if ($r) { - $res .= qq{date|relevance}; - } else { - $qp .= '&r'; - $res .= qq{date|relevance}; - } - $res .= "]\n\n"; + my $x = $q->{x}; + return sub { adump($_[0], $mset, $q, $ctx) } if ($x eq 'A'); - dump_mset(\$res, $mset); - my $nr = scalar $mset->items; - my $end = $o + $nr; - my $beg = $o + 1; - $res .= ""; [$code, ['Content-Type'=>'text/html; charset=UTF-8'], [$res]]; } +# display non-threaded search results similar to what users expect from +# regular WWW search engines: sub dump_mset { my ($res, $mset) = @_; @@ -101,15 +68,238 @@ sub dump_mset { my $rank = sprintf("%${pad}d", $m->get_rank + 1); my $pct = $m->get_percent; my $smsg = PublicInbox::SearchMsg->load_doc($m->get_document); - my $s = PublicInbox::Hval->new_oneline($smsg->subject); - my $f = $smsg->from_name; - $f = PublicInbox::Hval->new_oneline($f)->as_html; - my $d = strftime('%Y-%m-%d %H:%M', gmtime($smsg->ts)); + my $s = ascii_html($smsg->subject); + my $f = ascii_html($smsg->from_name); + my $ts = PublicInbox::View::fmt_ts($smsg->ts); my $mid = PublicInbox::Hval->new_msgid($smsg->mid)->as_href; - $$res .= qq{$rank. }. - $s->as_html . "\n"; - $$res .= "$pfx - by $f @ $d UTC [$pct%]\n\n"; + $$res .= qq{$rank. }. + $s . "\n"; + $$res .= "$pfx - by $f @ $ts UTC [$pct%]\n\n"; + } +} + +sub err_txt { + my ($ctx, $err) = @_; + my $u = '//xapian.org/docs/queryparser.html'; + $u = PublicInbox::Hval::prurl($ctx->{cgi}->{env}, $u); + $err =~ s/^\s*Exception:\s*//; # bad word to show users :P + $err = ascii_html($err); + "\n\nBad query: $err\n" . + qq{See $u for Xapian query syntax}; +} + +sub search_nav_top { + my ($mset, $q) = @_; + + my $rv = "Search results ordered by ["; + if ($q->{r}) { + my $d = $q->qs_html(r => 0); + $rv .= qq{date|relevance}; + } else { + my $d = $q->qs_html(r => 1); + $rv .= qq{date|relevance}; + } + + $rv .= '] view['; + + my $x = $q->{x}; + if ($x eq '') { + my $t = $q->qs_html(x => 't'); + $rv .= qq{summary|threaded} + } elsif ($q->{x} eq 't') { + my $s = $q->qs_html(x => ''); + $rv .= qq{summary|threaded}; + } + my $A = $q->qs_html(x => 'A', r => undef); + $rv .= qq{|Atom feed]}; +} + +sub search_nav_bot { + my ($mset, $q) = @_; + my $total = $mset->get_matches_estimated; + my $nr = scalar $mset->items; + my $o = $q->{o}; + my $end = $o + $nr; + my $beg = $o + 1; + my $rv = ""; - $res .= "Results $beg-$end of $total"; - - my $n = $o + $LIM; - if ($n < $total) { - $qp = "q=$q&o=$n"; - $qp .= "&r" if $r; - $res .= qq{, next} - } - if ($o > 0) { - $res .= $n < $total ? '/' : ', '; - my $p = $o - $LIM; - $qp = "q=$q"; - $qp .= "&o=$p" if $p > 0; - $qp .= "&r" if $r; - $res .= qq{prev}; + $res .= search_nav_top($mset, $q) . "\n\n"; + if ($x eq 't') { + return sub { tdump($_[0], $res, $mset, $q, $ctx) }; } - $res .= "\n\n" . $foot; + dump_mset(\$res, $mset); + $res .= '' . search_nav_bot($mset, $q) . + "\n\n" . foot($ctx); } $res .= "
Results $beg-$end of $total"; + my $n = $o + $LIM; + + if ($n < $total) { + my $qs = $q->qs_html(o => $n); + $rv .= qq{, next} + } + if ($o > 0) { + $rv .= $n < $total ? '/' : ', '; + my $p = $o - $LIM; + my $qs = $q->qs_html(o => ($p > 0 ? $p : 0)); + $rv .= qq{prev}; + } + $rv; +} + +sub tdump { + my ($cb, $res, $mset, $q, $ctx) = @_; + my $fh = $cb->([200, ['Content-Type'=>'text/html; charset=UTF-8']]); + $fh->write($res .= ''); + my %pct; + my @m = map { + my $i = $_; + my $m = PublicInbox::SearchMsg->load_doc($i->get_document); + $pct{$m->mid} = $i->get_percent; + $m = $m->mini_mime; + $m; + } ($mset->items); + + require PublicInbox::Thread; + my $th = PublicInbox::Thread->new(@m); + { + no warnings 'once'; + $Mail::Thread::nosubject = 0; + } + $th->thread; + if ($q->{r}) { + $th->order(sub { + sort { (eval { $pct{$b->topmost->messageid} } || 0) + <=> + (eval { $pct{$a->topmost->messageid} } || 0) + } @_; + }); + } else { + no warnings 'once'; + $th->order(*PublicInbox::View::rsort_ts); + } + + my $git = $ctx->{git} ||= PublicInbox::Git->new($ctx->{git_dir}); + my $state = { + ctx => $ctx, + anchor_idx => 0, + pct => \%pct, + cur_level => 0 + }; + $ctx->{searchview} = 1; + tdump_ent($fh, $git, $state, $_, 0) for $th->rootset; + PublicInbox::View::thread_adj_level($fh, $state, 0); + Email::Address->purge_cache; + + $fh->write(search_nav_bot($mset, $q). "\n\n" . + foot($ctx). '