X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FMbox.pm;h=1945915059905946d94ce20cca2f192f7845aef7;hb=525555d14118f92f86be54c683f797089c52a78d;hp=fc83a893c60ab384f21061d3b2dff12edb6f365c;hpb=0821af5f21fdb083020ae2e3e79e4227ef59cd4f;p=public-inbox.git

diff --git a/lib/PublicInbox/Mbox.pm b/lib/PublicInbox/Mbox.pm
index fc83a893..19459150 100644
--- a/lib/PublicInbox/Mbox.pm
+++ b/lib/PublicInbox/Mbox.pm
@@ -167,13 +167,13 @@ sub thread_mbox {
 sub emit_range {
 	my ($ctx, $range) = @_;
 
-	my $query;
+	my $q;
 	if ($range eq 'all') { # TODO: YYYY[-MM]
-		$query = '';
+		$q = '';
 	} else {
 		return [404, [qw(Content-Type text/plain)], []];
 	}
-	mbox_all($ctx, $query);
+	mbox_all($ctx, { q => $q });
 }
 
 sub all_ids_cb {
@@ -203,40 +203,78 @@ sub mbox_all_ids {
 	PublicInbox::MboxGz::mbox_gz($ctx, \&all_ids_cb, 'all');
 }
 
+sub gone ($$) {
+	my ($ctx, $what) = @_;
+	warn "W: `$ctx->{-inbox}->{inboxdir}' $what went away unexpectedly\n";
+	undef;
+}
+
 sub results_cb {
 	my ($ctx) = @_;
-	my $mset = $ctx->{mset};
-	my $srch = $ctx->{srch};
+	my $over = $ctx->{-inbox}->over or return gone($ctx, 'over');
 	while (1) {
-		while (my $mi = (($mset->items)[$ctx->{iter}++])) {
-			my $smsg = PublicInbox::Smsg::from_mitem($mi,
-								$srch) or next;
+		while (defined(my $num = shift(@{$ctx->{ids}}))) {
+			my $smsg = $over->get_art($num) or next;
 			return $smsg;
 		}
 		# refill result set
-		$mset = $ctx->{mset} = $srch->query($ctx->{query},
-							$ctx->{qopts});
+		my $srch = $ctx->{-inbox}->isrch or return gone($ctx, 'search');
+		my $mset = $srch->mset($ctx->{query}, $ctx->{qopts});
 		my $size = $mset->size or return;
 		$ctx->{qopts}->{offset} += $size;
-		$ctx->{iter} = 0;
+		$ctx->{ids} = $srch->mset_to_artnums($mset);
 	}
 }
 
+sub results_thread_cb {
+	my ($ctx) = @_;
+
+	my $over = $ctx->{-inbox}->over or return gone($ctx, 'over');
+	while (1) {
+		while (defined(my $num = shift(@{$ctx->{xids}}))) {
+			my $smsg = $over->get_art($num) or next;
+			return $smsg;
+		}
+
+		# refills ctx->{xids}
+		next if $over->expand_thread($ctx);
+
+		# refill result set
+		my $srch = $ctx->{-inbox}->isrch or return gone($ctx, 'search');
+		my $mset = $srch->mset($ctx->{query}, $ctx->{qopts});
+		my $size = $mset->size or return;
+		$ctx->{qopts}->{offset} += $size;
+		$ctx->{ids} = $srch->mset_to_artnums($mset);
+	}
+
+}
+
 sub mbox_all {
-	my ($ctx, $query) = @_;
+	my ($ctx, $q) = @_;
+	my $q_string = $q->{'q'};
+	return mbox_all_ids($ctx) if $q_string !~ /\S/;
+	my $srch = $ctx->{-inbox}->isrch or
+		return PublicInbox::WWW::need($ctx, 'Search');
+	my $over = $ctx->{-inbox}->over or
+		return PublicInbox::WWW::need($ctx, 'Overview');
 
-	return mbox_all_ids($ctx) if $query eq '';
-	my $qopts = $ctx->{qopts} = { mset => 2 };
-	my $srch = $ctx->{srch} = $ctx->{-inbox}->search or
-		return PublicInbox::WWW::need($ctx, 'Search');;
-	my $mset = $ctx->{mset} = $srch->query($query, $qopts);
+	my $qopts = $ctx->{qopts} = { mset => 2 }; # order by docid
+	$qopts->{thread} = 1 if $q->{t};
+	my $mset = $srch->mset($q_string, $qopts);
 	$qopts->{offset} = $mset->size or
 			return [404, [qw(Content-Type text/plain)],
 				["No results found\n"]];
-	$ctx->{iter} = 0;
-	$ctx->{query} = $query;
+	$ctx->{query} = $q_string;
+	$ctx->{ids} = $srch->mset_to_artnums($mset);
 	require PublicInbox::MboxGz;
-	PublicInbox::MboxGz::mbox_gz($ctx, \&results_cb, 'results-'.$query);
+	my $fn;
+	if ($q->{t} && $srch->has_threadid) {
+		$fn = 'results-thread-'.$q_string;
+		PublicInbox::MboxGz::mbox_gz($ctx, \&results_thread_cb, $fn);
+	} else {
+		$fn = 'results-'.$q_string;
+		PublicInbox::MboxGz::mbox_gz($ctx, \&results_cb, $fn);
+	}
 }
 
 1;