Merge remote-tracking branch 'origin/master' into lorelei

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

diff --git a/lib/PublicInbox/ExtSearch.pm b/lib/PublicInbox/ExtSearch.pm
index 20ec322475de99808b3ba80113dbdb9a924292a1..2bcdece61e3a4e95090fcbb1aca81f69dedbd975 100644 (file)
--- a/lib/PublicInbox/ExtSearch.pm
+++ b/lib/PublicInbox/ExtSearch.pm
@@ -9,7 +9,6 @@ use strict;
 use v5.10.1;
 use PublicInbox::Over;
 use PublicInbox::Inbox;
-use File::Spec ();
 use PublicInbox::MiscSearch;
 use DBI qw(:sql_types); # SQL_BLOB
 
@@ -17,13 +16,12 @@ use DBI qw(:sql_types); # SQL_BLOB
 use parent qw(PublicInbox::Search);
 
 sub new {
-       my (undef, $topdir) = @_;
-       $topdir = File::Spec->canonpath($topdir);
+       my ($class, $topdir) = @_;
        bless {
                topdir => $topdir,
                # xpfx => 'ei15'
                xpfx => "$topdir/ei".PublicInbox::Search::SCHEMA_VERSION
-       }, __PACKAGE__;
+       }, $class;
 }
 
 sub misc {
@@ -31,14 +29,6 @@ sub misc {
        $self->{misc} //= PublicInbox::MiscSearch->new("$self->{xpfx}/misc");
 }
 
-sub search { $_[0] } # self
-
-# overrides PublicInbox::Search::_xdb
-sub _xdb {
-       my ($self) = @_;
-       $self->xdb_sharded;
-}
-
 # same as per-inbox ->over, for now...
 sub over {
        my ($self) = @_;
@@ -50,8 +40,7 @@ sub git {
        $self->{git} //= PublicInbox::Git->new("$self->{topdir}/ALL.git");
 }
 
-# returns an arrayref of [ $NEWSGROUP_NAME:$ART_NO ] using
-# the `xref3' table
+# returns a hashref of { $NEWSGROUP_NAME => $ART_NO } using the `xref3' table
 sub nntp_xref_for { # NNTP only
        my ($self, $xibx, $xsmsg) = @_;
        my $dbh = over($self)->dbh;
@@ -69,7 +58,9 @@ SELECT ibx_id FROM inboxes WHERE eidx_key = ? LIMIT 1
 SELECT docid FROM xref3 WHERE oidbin = ? AND xnum = ? AND ibx_id = ? LIMIT 1
 
        $sth->bind_param(1, pack('H*', $xsmsg->{blob}), SQL_BLOB);
-       $sth->bind_param(2, $xsmsg->{num});
+
+       # NNTP::cmd_over can set {num} to zero according to RFC 3977 8.3.2
+       $sth->bind_param(2, $xsmsg->{num} || $xsmsg->{-orig_num});
        $sth->bind_param(3, $xibx_id);
        $sth->execute;
        my $docid = $sth->fetchrow_array // do {
@@ -81,9 +72,9 @@ EOF
 
        # LIMIT is number of newsgroups on server:
        $sth = $dbh->prepare_cached(<<'', undef, 1);
-SELECT ibx_id,xnum FROM xref3 WHERE docid = ?
+SELECT ibx_id,xnum FROM xref3 WHERE docid = ? AND ibx_id != ?
 
-       $sth->execute($docid);
+       $sth->execute($docid, $xibx_id);
        my $rows = $sth->fetchall_arrayref;
 
        my $eidx_key_sth = $dbh->prepare_cached(<<'', undef, 1);
@@ -91,18 +82,16 @@ SELECT eidx_key FROM inboxes WHERE ibx_id = ? LIMIT 1
 
        my %xref = map {
                my ($ibx_id, $xnum) = @$_;
-               if ($ibx_id == $xibx_id) {
-                       ();
-               } else {
-                       $eidx_key_sth->execute($ibx_id);
-                       my $eidx_key = $eidx_key_sth->fetchrow_array;
-
-                       # only include if there's a newsgroup name
-                       $eidx_key && index($eidx_key, '/') >= 0 ?
-                               () : ($eidx_key => $xnum)
-               }
+
+               $eidx_key_sth->execute($ibx_id);
+               my $eidx_key = $eidx_key_sth->fetchrow_array;
+
+               # only include if there's a newsgroup name
+               $eidx_key && index($eidx_key, '/') >= 0 ?
+                       () : ($eidx_key => $xnum)
        } @$rows;
-       [ map { "$_:$xref{$_}" } sort keys %xref ]; # match NNTP LIST order
+       $xref{$xibx->{newsgroup}} = $xsmsg->{num};
+       \%xref;
 }
 
 sub mm { undef }
@@ -129,5 +118,6 @@ no warnings 'once';
 *recent = \&PublicInbox::Inbox::recent;
 
 *max_git_epoch = *nntp_usable = *msg_by_path = \&mm; # undef
+*isrch = *search = \&PublicInbox::Search::reopen;
 
 1;