search: support SWIG-generated Xapian.pm

Xapian upstream is slowly phasing out the XS-based Search::Xapian
in favor of the SWIG-generated "Xapian" package.  While Debian and
both FreeBSD have Search::Xapian, OpenBSD only includes the "Xapian"
binding.

More information about the status of the "Xapian" Perl module here:
https://trac.xapian.org/ticket/523

1 files changed, 4 insertions, 1 deletions

diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm
index ab80941a..77b3bde4 100644
--- a/lib/PublicInbox/V2Writable.pm
+++ b/lib/PublicInbox/V2Writable.pm
@@ -62,10 +62,13 @@ sub count_shards ($) {
         # Also, shard count may change while -watch is running
         # due to "xcpdb --reshard"
         if (-d $xpfx) {
+                require PublicInbox::Search;
+                PublicInbox::Search::load_xapian();
+                my $XapianDatabase = $PublicInbox::Search::X{Database};
                 foreach my $shard (<$xpfx/*>) {
                         -d $shard && $shard =~ m!/[0-9]+\z! or next;
                         eval {
-                                Search::Xapian::Database->new($shard)->close;
+                                $XapianDatabase->new($shard)->close;
                                 $n++;
                         };
                 }