X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FSearchView.pm;h=b1cdb480d75d2ef97a76d024ab95ad8736f85f52;hb=08b543eb6c67cc19ea8e86afe6b9494df79e2fea;hp=61534c2509a4888efc3858c8919e4c51209327fb;hpb=c703745bcd09af545ef1bd320c895778081488d2;p=public-inbox.git

diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm
index 61534c25..b1cdb480 100644
--- a/lib/PublicInbox/SearchView.pm
+++ b/lib/PublicInbox/SearchView.pm
@@ -1,37 +1,39 @@
-# Copyright (C) 2015-2020 all contributors <meta@public-inbox.org>
+# Copyright (C) 2015-2021 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 #
 # Displays search results for the web interface
 package PublicInbox::SearchView;
 use strict;
 use v5.10.1;
+use List::Util qw(min max);
 use URI::Escape qw(uri_unescape);
 use PublicInbox::Smsg;
-use PublicInbox::Hval qw(ascii_html obfuscate_addrs mid_href);
+use PublicInbox::Hval qw(ascii_html obfuscate_addrs mid_href fmt_ts);
 use PublicInbox::View;
 use PublicInbox::WwwAtomStream;
 use PublicInbox::WwwStream qw(html_oneshot);
 use PublicInbox::SearchThread;
 use PublicInbox::SearchQuery;
-use PublicInbox::Search qw(mdocid);
+use PublicInbox::Search qw(get_pct);
 my %rmap_inc;
 
 sub mbox_results {
 	my ($ctx) = @_;
 	my $q = PublicInbox::SearchQuery->new($ctx->{qp});
-	my $x = $q->{x};
+	if ($ctx->{env}->{'psgi.input'}->read(my $buf, 3)) {
+		$q->{t} = 1 if $buf =~ /\Ax=[^0]/;
+	}
 	require PublicInbox::Mbox;
-	return PublicInbox::Mbox::mbox_all($ctx, $q->{'q'}) if $x eq 'm';
-	sres_top_html($ctx);
+	$q->{x} eq 'm' ? PublicInbox::Mbox::mbox_all($ctx, $q) :
+			sres_top_html($ctx);
 }
 
 sub sres_top_html {
 	my ($ctx) = @_;
-	my $srch = $ctx->{-inbox}->search or
+	my $srch = $ctx->{ibx}->isrch or
 		return PublicInbox::WWW::need($ctx, 'Search');
 	my $q = PublicInbox::SearchQuery->new($ctx->{qp});
 	my $x = $q->{x};
-	my $query = $q->{'q'};
 	my $o = $q->{o};
 	my $asc;
 	if ($o < 0) {
@@ -44,14 +46,16 @@ sub sres_top_html {
 	my $opts = {
 		limit => $q->{l},
 		offset => $o,
-		mset => 1,
 		relevance => $q->{r},
+		threads => $q->{t},
 		asc => $asc,
 	};
 	my ($mset, $total, $err, $html);
 retry:
 	eval {
-		$mset = $srch->query($query, $opts);
+		my $query = $q->{'q'};
+		$srch->query_approxidate($ctx->{ibx}->git, $query);
+		$mset = $srch->mset($query, $opts);
 		$total = $mset->get_matches_estimated;
 	};
 	$err = $@;
@@ -90,36 +94,46 @@ sub mset_summary {
 	my $pad = length("$total");
 	my $pfx = ' ' x $pad;
 	my $res = \($ctx->{-html_tip});
-	my $ibx = $ctx->{-inbox};
-	my $over = $ibx->over;
-	my $nshard = $ibx->search->{nshard} // 1;
+	my $ibx = $ctx->{ibx};
 	my $obfs_ibx = $ibx->{obfuscate} ? $ibx : undef;
+	my @nums = @{$ibx->isrch->mset_to_artnums($mset)};
+	my %num2msg = map { $_->{num} => $_ } @{$ibx->over->get_all(@nums)};
+	my ($min, $max, %seen);
+
 	foreach my $m ($mset->items) {
+		my $num = shift @nums;
+		my $smsg = delete($num2msg{$num}) // do {
+			warn "$m $num expired\n";
+			next;
+		};
+		my $mid = $smsg->{mid};
+		next if $seen{$mid}++;
+		$mid = mid_href($mid);
+		$ctx->{-t_max} //= $smsg->{ts};
 		my $rank = sprintf("%${pad}d", $m->get_rank + 1);
 		my $pct = get_pct($m);
-		my $num = mdocid($nshard, $m);
-		my $smsg = $over->get_art($num, 1);
-		unless ($smsg) {
-			eval {
-				$m = "$m $num expired\n";
-				$ctx->{env}->{'psgi.errors'}->print($m);
-			};
-			next;
-		}
-		PublicInbox::Smsg::psgi_cull($smsg);
+
+		# only when sorting by relevance, ->items is always
+		# ordered descending:
+		$max //= $pct;
+		$min = $pct;
+
 		my $s = ascii_html($smsg->{subject});
-		my $f = ascii_html($smsg->{from_name});
+		my $f = ascii_html(delete $smsg->{from_name});
 		if ($obfs_ibx) {
 			obfuscate_addrs($obfs_ibx, $s);
 			obfuscate_addrs($obfs_ibx, $f);
 		}
-		my $date = PublicInbox::View::fmt_ts($smsg->{ds});
-		my $mid = mid_href($smsg->{mid});
+		my $date = fmt_ts($smsg->{ds});
 		$s = '(no subject)' if $s eq '';
 		$$res .= qq{$rank. <b><a\nhref="$mid/">}.
 			$s . "</a></b>\n";
 		$$res .= "$pfx  - by $f @ $date UTC [$pct%]\n\n";
 	}
+	if ($q->{r}) { # for descriptions in search_nav_bot
+		$q->{-min_pct} = $min;
+		$q->{-max_pct} = $max;
+	}
 	$$res .= search_nav_bot($mset, $q);
 	undef;
 }
@@ -142,7 +156,7 @@ sub path2inc ($) {
 
 sub err_txt {
 	my ($ctx, $err) = @_;
-	my $u = $ctx->{-inbox}->base_url($ctx->{env}) . '_/text/help/';
+	my $u = $ctx->{ibx}->base_url($ctx->{env}) . '_/text/help/';
 	$err =~ s/^\s*Exception:\s*//; # bad word to show users :P
 	$err =~ s!(\S+)!path2inc($1)!sge;
 	$err = ascii_html($err);
@@ -152,8 +166,8 @@ sub err_txt {
 
 sub search_nav_top {
 	my ($mset, $q, $ctx) = @_;
-	my $m = $q->qs_html(x => 'm', r => undef);
-	my $rv = qq{<form\naction="?$m"\nmethod="post"><pre>};
+	my $m = $q->qs_html(x => 'm', r => undef, t => undef);
+	my $rv = qq{<form\nid=d\naction="?$m"\nmethod=post><pre>};
 	my $initial_q = $ctx->{-uxs_retried};
 	if (defined $initial_q) {
 		my $rewritten = $q->{'q'};
@@ -178,20 +192,33 @@ sub search_nav_top {
 	$rv .= ']  view[';
 
 	my $x = $q->{x};
+	my $pfx = "\t\t\t";
 	if ($x eq '') {
 		my $t = $q->qs_html(x => 't');
 		$rv .= qq{<b>summary</b>|<a\nhref="?$t">nested</a>}
-	} elsif ($q->{x} eq 't') {
+	} elsif ($x eq 't') {
 		my $s = $q->qs_html(x => '');
 		$rv .= qq{<a\nhref="?$s">summary</a>|<b>nested</b>};
+		$pfx = "thread overview <a\nhref=#t>below</a> | ";
 	}
 	my $A = $q->qs_html(x => 'A', r => undef);
 	$rv .= qq{|<a\nhref="?$A">Atom feed</a>]};
-	$rv .= qq{\n\t\t\t\t\t\tdownload: };
-	$rv .= qq{<input\ntype=submit\nvalue="mbox.gz"/></pre></form><pre>};
+	if ($ctx->{ibx}->isrch->has_threadid) {
+		$rv .= qq{\n${pfx}download mbox.gz: } .
+			# we set name=z w/o using it since it seems required for
+			# lynx (but works fine for w3m).
+			qq{<input\ntype=submit\nname=z\n} .
+				q{value="results only"/>} .
+			qq{|<input\ntype=submit\nname=x\n} .
+				q{value="full threads"/>};
+	} else { # BOFH needs to --reindex
+		$rv .= qq{\n${pfx}download: } .
+			qq{<input\ntype=submit\nname=z\nvalue="mbox.gz"/>}
+	}
+	$rv .= qq{</pre></form><pre>};
 }
 
-sub search_nav_bot {
+sub search_nav_bot { # also used by WwwListing for searching extindex miscidx
 	my ($mset, $q) = @_;
 	my $total = $mset->get_matches_estimated;
 	my $l = $q->{l};
@@ -202,78 +229,75 @@ sub search_nav_bot {
 	my $beg = $off + 1;
 
 	if ($beg <= $end) {
-		$rv .= "Results $beg-$end of $total";
-		$rv .= ' (estimated)' if $end != $total;
+		my $approx = $end == $total ? '' : '~';
+		$rv .= "Results $beg-$end of $approx$total";
 	} else {
 		$rv .= "No more results, only $total";
 	}
-	my ($next, $join, $prev);
+	my ($next, $join, $prev, $nd, $pd);
 
 	if ($o >= 0) { # sort descending
 		my $n = $o + $l;
 		if ($n < $total) {
 			$next = $q->qs_html(o => $n, l => $l);
+			$nd = $q->{r} ? "[&lt;= $q->{-min_pct}%]" : '(older)';
 		}
 		if ($o > 0) {
-			$join = $n < $total ? '/' : '       ';
+			$join = $n < $total ? ' | ' : "\t";
 			my $p = $o - $l;
 			$prev = $q->qs_html(o => ($p > 0 ? $p : 0));
+			$pd = $q->{r} ? "[&gt;= $q->{-max_pct}%]" : '(newer)';
 		}
 	} else { # o < 0, sort ascending
 		my $n = $o - $l;
 
 		if (-$n < $total) {
 			$next = $q->qs_html(o => $n, l => $l);
+			$nd = $q->{r} ? "[&lt;= $q->{-min_pct}%]" : '(newer)';
 		}
 		if ($o < -1) {
-			$join = -$n < $total ? '/' : '       ';
+			$join = -$n < $total ? ' | ' : "\t";
 			my $p = $o + $l;
 			$prev = $q->qs_html(o => ($p < 0 ? $p : 0));
+			$pd = $q->{r} ? "[&gt;= $q->{-max_pct}%]" : '(older)';
 		}
 	}
 
-	$rv .= qq{  <a\nhref="?$next"\nrel=next>next</a>} if $next;
+	$rv .= qq{  <a\nhref="?$next"\nrel=next>next $nd</a>} if $next;
 	$rv .= $join if $join;
-	$rv .= qq{<a\nhref="?$prev"\nrel=prev>prev</a>} if $prev;
+	$rv .= qq{<a\nhref="?$prev"\nrel=prev>prev $pd</a>} if $prev;
 
 	my $rev = $q->qs_html(o => $o < 0 ? 0 : -1);
-	$rv .= qq{ | <a\nhref="?$rev">reverse results</a></pre>};
+	$rv .= qq{ | <a\nhref="?$rev">reverse</a>} .
+		q{ | sort options + mbox downloads } .
+		q{<a href=#d>above</a></pre>};
 }
 
 sub sort_relevance {
-	[ sort {
+	@{$_[0]} = sort {
 		(eval { $b->topmost->{pct} } // 0) <=>
 		(eval { $a->topmost->{pct} } // 0)
-	} @{$_[0]} ]
-}
-
-sub get_pct ($) {
-	# Capped at "99%" since "100%" takes an extra column in the
-	# thread skeleton view.  <xapian/mset.h> says the value isn't
-	# very meaningful, anyways.
-	my $n = $_[0]->get_percent;
-	$n > 99 ? 99 : $n;
-}
-
-sub load_msgs {
-	my ($mset) = @_;
-	[ map {
-		my $mi = $_;
-		my $smsg = PublicInbox::Smsg::from_mitem($mi);
-		$smsg->{pct} = get_pct($mi);
-		$smsg;
-	} ($mset->items) ]
+	} @{$_[0]};
 }
 
 sub mset_thread {
 	my ($ctx, $mset, $q) = @_;
-	my $ibx = $ctx->{-inbox};
-	my $msgs = $ibx->search->retry_reopen(\&load_msgs, $mset);
+	my $ibx = $ctx->{ibx};
+	my @pct = map { get_pct($_) } $mset->items;
+	my $msgs = $ibx->isrch->mset_to_smsg($ibx, $mset);
+	my $i = 0;
+	$_->{pct} = $pct[$i++] for @$msgs;
 	my $r = $q->{r};
+	if ($r) { # for descriptions in search_nav_bot
+		$q->{-min_pct} = min(@pct);
+		$q->{-max_pct} = max(@pct);
+	}
 	my $rootset = PublicInbox::SearchThread::thread($msgs,
 		$r ? \&sort_relevance : \&PublicInbox::View::sort_ds,
 		$ctx);
-	my $skel = search_nav_bot($mset, $q). "<pre>";
+	my $skel = search_nav_bot($mset, $q).
+		"<pre>-- links below jump to the message on this page --\n";
+
 	$ctx->{-upfx} = '';
 	$ctx->{anchor_idx} = 1;
 	$ctx->{cur_level} = 0;
@@ -289,6 +313,10 @@ sub mset_thread {
 	PublicInbox::View::walk_thread($rootset, $ctx,
 		\&PublicInbox::View::pre_thread);
 
+	# link $INBOX_DIR/description text to "recent" view around
+	# the newest message in this result set:
+	$ctx->{-t_max} = max(map { delete $_->{ts} } @$msgs);
+
 	@$msgs = reverse @$msgs if $r;
 	$ctx->{msgs} = $msgs;
 	PublicInbox::WwwStream::aresponse($ctx, 200, \&mset_thread_i);
@@ -323,7 +351,7 @@ sub ctx_prepare {
 
 sub adump {
 	my ($cb, $mset, $q, $ctx) = @_;
-	$ctx->{items} = [ $mset->items ];
+	$ctx->{ids} = $ctx->{ibx}->isrch->mset_to_artnums($mset);
 	$ctx->{search_query} = $q; # used by WwwAtomStream::atom_header
 	PublicInbox::WwwAtomStream->response($ctx, 200, \&adump_i);
 }
@@ -331,11 +359,8 @@ sub adump {
 # callback for PublicInbox::WwwAtomStream::getline
 sub adump_i {
 	my ($ctx) = @_;
-	while (my $mi = shift @{$ctx->{items}}) {
-		my $srch = $ctx->{-inbox}->search(undef, $ctx) or return;
-		my $smsg = eval {
-			PublicInbox::Smsg::from_mitem($mi, $srch);
-		} or next;
+	while (my $num = shift @{$ctx->{ids}}) {
+		my $smsg = eval { $ctx->{ibx}->over->get_art($num) } or next;
 		return $smsg;
 	}
 }