X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FInbox.pm;h=813ed997f1781ccc3791257f751124fdf5ee9021;hb=0b1de991a099b5e8b9a9e3e85b5eaaacc9362dbb;hp=e3bc1048c23582f2e4663a6aece6a644bc71499e;hpb=a796afa762b6e204f611a69833064bf3656d1a62;p=public-inbox.git

diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm
index e3bc1048..813ed997 100644
--- a/lib/PublicInbox/Inbox.pm
+++ b/lib/PublicInbox/Inbox.pm
@@ -25,7 +25,7 @@ sub cleanup_task () {
 	my $next = {};
 	for my $ibx (values %$CLEANUP) {
 		my $again;
-		foreach my $f (qw(mm search)) {
+		foreach my $f (qw(mm search over)) {
 			delete $ibx->{$f} if SvREFCNT($ibx->{$f}) == 1;
 		}
 		my $expire = time - 60;
@@ -37,7 +37,7 @@ sub cleanup_task () {
 				$again = 1 if $git->cleanup($expire);
 			}
 		}
-		$again ||= !!($ibx->{mm} || $ibx->{search});
+		$again ||= !!($ibx->{over} || $ibx->{mm} || $ibx->{search});
 		$next->{"$ibx"} = $ibx if $again;
 	}
 	$CLEANUP = $next;
@@ -172,16 +172,20 @@ sub search ($;$) {
 	my ($self, $over_only) = @_;
 	my $srch = $self->{search} ||= eval {
 		_cleanup_later($self);
+		require PublicInbox::Search;
 		PublicInbox::Search->new($self, $self->{altid});
 	};
-	# TODO: lazily load Xapian
-	# return $srch if $over_only || eval { $srch->xdb };
-	# undef;
+	($over_only || eval { $srch->xdb }) ? $srch : undef;
 }
 
 sub over ($) {
-	my $srch = search($_[0], 1) or return;
-	$srch->{over_ro};
+	my ($self) = @_;
+	my $srch = search($self, 1) or return;
+	$self->{over} ||= eval {
+		my $over = $srch->{over_ro};
+		$over->dbh_new; # may fail
+		$over;
+	}
 }
 
 sub try_cat {
@@ -289,7 +293,7 @@ sub nntp_url {
 sub nntp_usable {
 	my ($self) = @_;
 	my $ret = mm($self) && over($self);
-	$self->{mm} = $self->{search} = undef;
+	$self->{mm} = $self->{over} = $self->{search} = undef;
 	$ret;
 }