www: label sections and hopefully improve navigation

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

diff --git a/lib/PublicInbox/Search.pm b/lib/PublicInbox/Search.pm
index fbc6882c79adfd4af03bc13b2b5414ffd404d1bf..3a908ac6caba8124a8c7ce4071ee3692e4cb063b 100644 (file)
--- a/lib/PublicInbox/Search.pm
+++ b/lib/PublicInbox/Search.pm
@@ -1,6 +1,8 @@
 # Copyright (C) 2015 all contributors <meta@public-inbox.org>
 # License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
 # based on notmuch, but with no concept of folders, files or flags
+#
+# Read-only search interface for use by the web and NNTP interfaces
 package PublicInbox::Search;
 use strict;
 use warnings;
@@ -34,7 +36,8 @@ use constant {
        # 8 - remove redundant/unneeded document data
        # 9 - disable Message-ID compression (SHA-1)
        # 10 - optimize doc for NNTP overviews
-       SCHEMA_VERSION => 10,
+       # 11 - merge threads when vivifying ghosts
+       SCHEMA_VERSION => 11,
 
        # n.b. FLAG_PURE_NOT is expensive not suitable for a public website
        # as it could become a denial-of-service vector
@@ -95,7 +98,7 @@ sub query {
                $opts->{relevance} = 1 unless exists $opts->{relevance};
        }
 
-       $self->do_enquire($query, $opts);
+       _do_enquire($self, $query, $opts);
 }
 
 sub get_thread {
@@ -104,13 +107,34 @@ sub get_thread {
 
        return { total => 0, msgs => [] } unless $smsg;
        my $qtid = Search::Xapian::Query->new(xpfx('thread').$smsg->thread_id);
-       my $path = id_compress($smsg->path);
-       my $qsub = Search::Xapian::Query->new(xpfx('path').$path);
-       my $query = Search::Xapian::Query->new(OP_OR, $qtid, $qsub);
-       $self->do_enquire($query, $opts);
+       my $path = $smsg->path;
+       if (defined $path && $path ne '') {
+               my $path = id_compress($smsg->path);
+               my $qsub = Search::Xapian::Query->new(xpfx('path').$path);
+               $qtid = Search::Xapian::Query->new(OP_OR, $qtid, $qsub);
+       }
+       $opts ||= {};
+       $opts->{limit} ||= 1000;
+       _do_enquire($self, $qtid, $opts);
 }
 
-sub do_enquire {
+sub _do_enquire {
+       my ($self, $query, $opts) = @_;
+       my $ret;
+       for (1..10) {
+               eval { $ret = _enquire_once($self, $query, $opts) };
+               return $ret unless $@;
+               # Exception: The revision being read has been discarded -
+               # you should call Xapian::Database::reopen()
+               if (index($@, 'Xapian::Database::reopen') >= 0) {
+                       reopen($self);
+               } else {
+                       die $@;
+               }
+       }
+}
+
+sub _enquire_once {
        my ($self, $query, $opts) = @_;
        my $enquire = $self->enquire;
        if (defined $query) {
@@ -123,6 +147,8 @@ sub do_enquire {
         my $desc = !$opts->{asc};
        if ($opts->{relevance}) {
                $enquire->set_sort_by_relevance_then_value(TS, $desc);
+       } elsif ($opts->{num}) {
+               $enquire->set_sort_by_value(NUM, 0);
        } else {
                $enquire->set_sort_by_value_then_relevance(TS, $desc);
        }
@@ -182,21 +208,12 @@ sub num_range_processor {
 # only used for NNTP server
 sub query_xover {
        my ($self, $beg, $end, $offset) = @_;
-       my $enquire = $self->enquire;
        my $qp = Search::Xapian::QueryParser->new;
        $qp->set_database($self->{xdb});
        $qp->add_valuerangeprocessor($self->num_range_processor);
        my $query = $qp->parse_query("$beg..$end", QP_FLAGS);
-       $query = Search::Xapian::Query->new(OP_AND, $mail_query, $query);
-       $enquire->set_query($query);
-       $enquire->set_sort_by_value(NUM, 0);
-       my $limit = 200;
-       my $mset = $enquire->get_mset($offset, $limit);
-       my @msgs = map {
-               PublicInbox::SearchMsg->load_doc($_->get_document);
-       } $mset->items;
 
-       { total => $mset->get_matches_estimated, msgs => \@msgs }
+       _do_enquire($self, $query, {num => 1, limit => 200, offset => $offset});
 }
 
 sub lookup_message {
@@ -214,6 +231,12 @@ sub lookup_message {
        $smsg;
 }
 
+sub lookup_mail { # no ghosts!
+       my ($self, $mid) = @_;
+       my $smsg = lookup_message($self, $mid);
+       PublicInbox::SearchMsg->load_doc($smsg->{doc});
+}
+
 sub find_unique_doc_id {
        my ($self, $term, $value) = @_;