X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FSearchView.pm;h=f568f31c0f30f1eb851aa63c0cbc2d3c22dc9053;hb=e3b57fe9f68e80fc85cff46ccec9246b670f1312;hp=75e2d39dfe3057ca6e94c6b1e21b7bf24591e073;hpb=99404a3bc0ab01b4f10ea698d88642b2ebc932e1;p=public-inbox.git diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm index 75e2d39d..f568f31c 100644 --- a/lib/PublicInbox/SearchView.pm +++ b/lib/PublicInbox/SearchView.pm @@ -5,29 +5,32 @@ 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; 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}; @@ -44,14 +47,14 @@ sub sres_top_html { my $opts = { limit => $q->{l}, offset => $o, - mset => 1, relevance => $q->{r}, + thread => $q->{t}, asc => $asc, }; my ($mset, $total, $err, $html); retry: eval { - $mset = $srch->query($query, $opts); + $mset = $srch->mset($query, $opts); $total = $mset->get_matches_estimated; }; $err = $@; @@ -90,10 +93,11 @@ sub mset_summary { my $pad = length("$total"); my $pfx = ' ' x $pad; my $res = \($ctx->{-html_tip}); - my $ibx = $ctx->{-inbox}; + my $ibx = $ctx->{ibx}; my $obfs_ibx = $ibx->{obfuscate} ? $ibx : undef; - my @nums = @{$ibx->search->mset_to_artnums($mset)}; + my @nums = @{$ibx->isrch->mset_to_artnums($mset)}; my %num2msg = map { $_->{num} => $_ } @{$ibx->over->get_all(@nums)}; + my ($min, $max); foreach my $m ($mset->items) { my $rank = sprintf("%${pad}d", $m->get_rank + 1); @@ -106,19 +110,30 @@ sub mset_summary { }; next; }; + $ctx->{-t_max} //= $smsg->{ts}; + + # 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}); if ($obfs_ibx) { obfuscate_addrs($obfs_ibx, $s); obfuscate_addrs($obfs_ibx, $f); } - my $date = PublicInbox::View::fmt_ts($smsg->{ds}); + my $date = fmt_ts($smsg->{ds}); my $mid = mid_href($smsg->{mid}); $s = '(no subject)' if $s eq ''; $$res .= qq{$rank. }. $s . "\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; } @@ -141,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); @@ -151,7 +166,7 @@ sub err_txt { sub search_nav_top { my ($mset, $q, $ctx) = @_; - my $m = $q->qs_html(x => 'm', r => undef); + my $m = $q->qs_html(x => 'm', r => undef, t => undef); my $rv = qq{
};
 	my $initial_q = $ctx->{-uxs_retried};
 	if (defined $initial_q) {
@@ -185,11 +200,20 @@ sub search_nav_top {
 		$rv .= qq{summary|nested};
 	}
 	my $A = $q->qs_html(x => 'A', r => undef);
-	$rv .= qq{|Atom feed]} .
-		qq{\n\t\t\t\t\t\tdownload: } .
-		# lynx seems to require a name=, here, so just use 'z'
-		qq{} .
-		q{
};
+	$rv .= qq{|Atom feed]};
+	if ($ctx->{ibx}->isrch->has_threadid) {
+		$rv .= qq{\n\t\t\tdownload mbox.gz: } .
+			# we set name=z w/o using it since it seems required for
+			# lynx (but works fine for w3m).
+			qq{} .
+			qq{|};
+	} else { # BOFH needs to --reindex
+		$rv .= qq{\n\t\t\t\t\t\tdownload: } .
+			qq{}
+	}
+	$rv .= qq{
};
 }
 
 sub search_nav_bot {
@@ -203,42 +227,46 @@ 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} ? "[<= $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} ? "[>= $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} ? "[<= $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} ? "[>= $q->{-max_pct}%]" : '(older)';
 		}
 	}
 
-	$rv .= qq{  next} if $next;
+	$rv .= qq{  next $nd} if $next;
 	$rv .= $join if $join;
-	$rv .= qq{prev} if $prev;
+	$rv .= qq{prev $pd} if $prev;
 
 	my $rev = $q->qs_html(o => $o < 0 ? 0 : -1);
-	$rv .= qq{ | reverse results
}; + $rv .= qq{ | reverse}; } sub sort_relevance { @@ -258,12 +286,16 @@ sub get_pct ($) { sub mset_thread { my ($ctx, $mset, $q) = @_; - my $ibx = $ctx->{-inbox}; - my $nshard = $ibx->search->{nshard} // 1; - my %pct = map { mdocid($nshard, $_) => get_pct($_) } $mset->items; - my $msgs = $ibx->over->get_all(keys %pct); - $_->{pct} = $pct{$_->{num}} for @$msgs; + 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); @@ -283,6 +315,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); @@ -317,7 +353,7 @@ sub ctx_prepare { sub adump { my ($cb, $mset, $q, $ctx) = @_; - $ctx->{ids} = $ctx->{-inbox}->search->mset_to_artnums($mset); + $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); } @@ -326,7 +362,7 @@ sub adump { sub adump_i { my ($ctx) = @_; while (my $num = shift @{$ctx->{ids}}) { - my $smsg = eval { $ctx->{-inbox}->over->get_art($num) } or next; + my $smsg = eval { $ctx->{ibx}->over->get_art($num) } or next; return $smsg; } }