treewide: replace confess with croak

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

diff --git a/lib/PublicInbox/OverIdx.pm b/lib/PublicInbox/OverIdx.pm
index dcc2cff34a42128116374669d037384a96f407aa..9013ae23e5349486a9913bc8593cc4ade791bed2 100644 (file)
--- a/lib/PublicInbox/OverIdx.pm
+++ b/lib/PublicInbox/OverIdx.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 all contributors <meta@public-inbox.org>
+# Copyright (C) 2018-2021 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
 # for XOVER, OVER in NNTP, and feeds/homepage/threads in PSGI
@@ -243,26 +243,6 @@ sub link_refs {
        $tid;
 }
 
-sub parse_references ($$$) {
-       my ($smsg, $hdr, $mids) = @_;
-       my $refs = references($hdr);
-       push(@$refs, @$mids) if scalar(@$mids) > 1;
-       return $refs if scalar(@$refs) == 0;
-
-       # prevent circular references here:
-       my %seen = ( $smsg->{mid} => 1 );
-       my @keep;
-       foreach my $ref (@$refs) {
-               if (length($ref) > PublicInbox::MID::MAX_MID_SIZE) {
-                       warn "References: <$ref> too long, ignoring\n";
-                       next;
-               }
-               push(@keep, $ref) unless $seen{$ref}++;
-       }
-       $smsg->{references} = '<'.join('> <', @keep).'>' if @keep;
-       \@keep;
-}
-
 # normalize subjects so they are suitable as pathnames for URLs
 # XXX: consider for removal
 sub subject_path ($) {
@@ -283,7 +263,9 @@ sub add_overview {
        my ($self, $eml, $smsg) = @_;
        $smsg->{lines} = $eml->body_raw =~ tr!\n!\n!;
        my $mids = mids_for_index($eml);
-       my $refs = parse_references($smsg, $eml, $mids);
+       my $refs = $smsg->parse_references($eml, $mids);
+       $mids->[0] //= $smsg->{mid} //= $eml->{-lei_fake_mid};
+       $smsg->{mid} //= '';
        my $subj = $smsg->{subject};
        my $xpath;
        if ($subj ne '') {
@@ -474,7 +456,7 @@ sub dbh_close {
 sub create {
        my ($self) = @_;
        my $fn = $self->{filename} // do {
-               Carp::confess('BUG: no {filename}') unless $self->{dbh};
+               croak('BUG: no {filename}') unless $self->{dbh};
                return;
        };
        unless (-r $fn) {
@@ -535,7 +517,7 @@ sub eidx_prep ($) {
        my ($self) = @_;
        $self->{-eidx_prep} //= do {
                my $dbh = $self->dbh;
-               $dbh->do(<<"");
+               $dbh->do(<<'');
 INSERT OR IGNORE INTO counter (key) VALUES ('eidx_docid')
 
                $dbh->do(<<'');
@@ -572,11 +554,9 @@ CREATE TABLE IF NOT EXISTS eidx_meta (
                # Currently used for "-extindex --reindex" for Xapian
                # data, but may be used in more places down the line.
                $dbh->do(<<'');
-CREATE TABLE IF NOT EXISTS eidxq (
-       docid INTEGER PRIMARY KEY NOT NULL
-)
+CREATE TABLE IF NOT EXISTS eidxq (docid INTEGER PRIMARY KEY NOT NULL)
 
-               $dbh;
+               1;
        };
 }
 
@@ -688,4 +668,14 @@ DELETE FROM eidxq WHERE docid = ?
 
 }
 
+sub blob_exists {
+       my ($self, $oidhex) = @_;
+       my $sth = $self->dbh->prepare_cached(<<'', undef, 1);
+SELECT COUNT(*) FROM xref3 WHERE oidbin = ?
+
+       $sth->bind_param(1, pack('H*', $oidhex), SQL_BLOB);
+       $sth->execute;
+       $sth->fetchrow_array;
+}
+
 1;