X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FSearchView.pm;h=8e0c3cfc60d733cbdd5847f5a014b9018c5a9069;hb=cefae696bcce7ac04b762613b8936e2e446d6203;hp=777710e3649148bcfec7f2e552ba9bb1416bdca9;hpb=ef9ce6f2dfc9fcbb91e3cec0b7a2b7f7e359be5d;p=public-inbox.git

diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm
index 777710e3..8e0c3cfc 100644
--- a/lib/PublicInbox/SearchView.pm
+++ b/lib/PublicInbox/SearchView.pm
@@ -21,8 +21,11 @@ sub noop {}
 sub sres_top_html {
 	my ($ctx) = @_;
 	my $q = PublicInbox::SearchQuery->new($ctx->{qp});
-	my $code = 200;
+	my $x = $q->{x};
+	my $query = $q->{'q'};
+	return PublicInbox::Mbox::mbox_all($ctx, $query) if $x eq 'm';
 
+	my $code = 200;
 	# double the limit for expanded views:
 	my $opts = {
 		limit => $LIM,
@@ -33,7 +36,7 @@ sub sres_top_html {
 	my ($mset, $total, $err, $cb);
 retry:
 	eval {
-		$mset = $ctx->{srch}->query($q->{'q'}, $opts);
+		$mset = $ctx->{srch}->query($query, $opts);
 		$total = $mset->get_matches_estimated;
 	};
 	$err = $@;
@@ -55,7 +58,6 @@ retry:
 		$ctx->{-html_tip} = "<pre>\n[No results found]</pre><hr>";
 		$cb = *noop;
 	} else {
-		my $x = $q->{x};
 		return adump($_[0], $mset, $q, $ctx) if $x eq 'A';
 
 		$ctx->{-html_tip} = search_nav_top($mset, $q, $ctx) . "\n\n";
@@ -79,7 +81,7 @@ sub load_doc_retry {
 	}
 }
 
-# display non-threaded search results similar to what users expect from
+# display non-nested search results similar to what users expect from
 # regular WWW search engines:
 sub mset_summary {
 	my ($ctx, $mset, $q) = @_;
@@ -89,7 +91,8 @@ sub mset_summary {
 	my $pfx = ' ' x $pad;
 	my $res = \($ctx->{-html_tip});
 	my $srch = $ctx->{srch};
-	my $obfs = $ctx->{-inbox}->{obfuscate};
+	my $ibx = $ctx->{-inbox};
+	my $obfs_ibx = $ibx->{obfuscate} ? $ibx : undef;
 	foreach my $m ($mset->items) {
 		my $rank = sprintf("%${pad}d", $m->get_rank + 1);
 		my $pct = $m->get_percent;
@@ -103,9 +106,9 @@ sub mset_summary {
 		}
 		my $s = ascii_html($smsg->subject);
 		my $f = ascii_html($smsg->from_name);
-		if ($obfs) {
-			obfuscate_addrs($s);
-			obfuscate_addrs($f);
+		if ($obfs_ibx) {
+			obfuscate_addrs($obfs_ibx, $s);
+			obfuscate_addrs($obfs_ibx, $f);
 		}
 		my $ts = PublicInbox::View::fmt_ts($smsg->ts);
 		my $mid = PublicInbox::Hval->new_msgid($smsg->mid)->{href};
@@ -156,13 +159,17 @@ sub search_nav_top {
 	my $x = $q->{x};
 	if ($x eq '') {
 		my $t = $q->qs_html(x => 't');
-		$rv .= qq{<b>summary</b>|<a\nhref="?$t">threaded</a>}
+		$rv .= qq{<b>summary</b>|<a\nhref="?$t">nested</a>}
 	} elsif ($q->{x} eq 't') {
 		my $s = $q->qs_html(x => '');
-		$rv .= qq{<a\nhref="?$s">summary</a>|<b>threaded</b>};
+		$rv .= qq{<a\nhref="?$s">summary</a>|<b>nested</b>};
 	}
 	my $A = $q->qs_html(x => 'A', r => undef);
 	$rv .= qq{|<a\nhref="?$A">Atom feed</a>]};
+	my $m = $q->qs_html(x => 'm', r => undef);
+	warn "m: $m\n";
+	$rv .= qq{\n\t\t\t\t\t\tdownload: };
+	$rv .= qq{<a\nhref="?$m"\nrel="nofollow">mbox.gz</a>};
 }
 
 sub search_nav_bot {
@@ -206,7 +213,8 @@ sub sort_relevance {
 sub mset_thread {
 	my ($ctx, $mset, $q) = @_;
 	my %pct;
-	my $msgs = $ctx->{srch}->retry_reopen(sub { [ map {
+	my $srch = $ctx->{srch};
+	my $msgs = $srch->retry_reopen(sub { [ map {
 		my $i = $_;
 		my $smsg = PublicInbox::SearchMsg->load_doc($i->get_document);
 		$pct{$smsg->mid} = $i->get_percent;
@@ -214,7 +222,8 @@ sub mset_thread {
 	} ($mset->items) ]});
 	my $r = $q->{r};
 	my $rootset = PublicInbox::SearchThread::thread($msgs,
-		$r ? sort_relevance(\%pct) : *PublicInbox::View::sort_ts);
+		$r ? sort_relevance(\%pct) : *PublicInbox::View::sort_ts,
+		$srch);
 	my $skel = search_nav_bot($mset, $q). "<pre>";
 	my $inbox = $ctx->{-inbox};
 	$ctx->{-upfx} = '';
@@ -324,7 +333,7 @@ sub qs_html {
 		$qs .= "&amp;r";
 	}
 	if (my $x = $self->{x}) {
-		$qs .= "&amp;x=$x" if ($x eq 't' || $x eq 'A');
+		$qs .= "&amp;x=$x" if ($x eq 't' || $x eq 'A' || $x eq 'm');
 	}
 	$qs;
 }