search: support downloading mboxes results with full thread

[public-inbox.git] / lib / PublicInbox / Mbox.pm

diff --git a/lib/PublicInbox/Mbox.pm b/lib/PublicInbox/Mbox.pm
index a83c0356d3ab7d2ac81d9fa90da520fc8e589036..c9b11c210a2aefc04e7778d7a90dfe361c7ea047 100644 (file)
--- 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 {
@@ -205,38 +205,70 @@ sub mbox_all_ids {
 
 sub results_cb {
        my ($ctx) = @_;
-       my $srch = $ctx->{-inbox}->search(undef, $ctx) or return;
-       my $mset = $ctx->{mset};
+       my $over = $ctx->{-inbox}->over or return;
        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}->search(undef, $ctx) or return;
+               my $mset = $srch->query($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 mbox_all {
-       my ($ctx, $query) = @_;
+sub results_thread_cb {
+       my ($ctx) = @_;
+
+       my $over = $ctx->{-inbox}->over or return;
+       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);
 
-       return mbox_all_ids($ctx) if $query eq '';
-       my $qopts = $ctx->{qopts} = { mset => 2 };
+               # refill result set
+               my $srch = $ctx->{-inbox}->search(undef, $ctx) or return;
+               my $mset = $srch->query($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, $q) = @_;
+       my $q_string = $q->{'q'};
+       return mbox_all_ids($ctx) if $q_string !~ /\S/;
        my $srch = $ctx->{-inbox}->search or
                return PublicInbox::WWW::need($ctx, 'Search');
-       my $mset = $ctx->{mset} = $srch->query($query, $qopts);
+       my $over = $ctx->{-inbox}->over or
+               return PublicInbox::WWW::need($ctx, 'Overview');
+
+       my $qopts = $ctx->{qopts} = { mset => 2 }; # order by docid
+       $qopts->{thread} = 1 if $q->{t};
+       my $mset = $srch->query($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}) {
+               $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;