Merge branch 'regen'

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

diff --git a/lib/PublicInbox/OverIdx.pm b/lib/PublicInbox/OverIdx.pm
index 08f87447bea5a288a6f1c8fa7992bb966e129930..01ca6f1160ffbfb6092b7941d9a4835cf9df26f7 100644 (file)
--- a/lib/PublicInbox/OverIdx.pm
+++ b/lib/PublicInbox/OverIdx.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 2018-2019 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
@@ -14,7 +14,7 @@ use base qw(PublicInbox::Over);
 use IO::Handle;
 use DBI qw(:sql_types); # SQL_BLOB
 use PublicInbox::MID qw/id_compress mids references/;
-use PublicInbox::SearchMsg;
+use PublicInbox::SearchMsg qw(subject_normalized);
 use Compress::Zlib qw(compress);
 use PublicInbox::Search;
 
@@ -79,8 +79,15 @@ sub mid2id {
 }
 
 sub delete_by_num {
-       my ($self, $num) = @_;
+       my ($self, $num, $tid_ref) = @_;
        my $dbh = $self->{dbh};
+       if ($tid_ref) {
+               my $sth = $dbh->prepare_cached(<<'', undef, 1);
+SELECT tid FROM over WHERE num = ? LIMIT 1
+
+               $sth->execute($num);
+               $$tid_ref = $sth->fetchrow_array; # may be undef
+       }
        foreach (qw(over id2num)) {
                $dbh->prepare_cached(<<"")->execute($num);
 DELETE FROM $_ WHERE num = ?
@@ -207,8 +214,8 @@ sub link_refs {
        $tid;
 }
 
-sub parse_references ($$$$) {
-       my ($self, $smsg, $mid0, $mids) = @_;
+sub parse_references ($$$) {
+       my ($smsg, $mid0, $mids) = @_;
        my $mime = $smsg->{mime};
        my $hdr = $mime->header_obj;
        my $refs = references($hdr);
@@ -230,6 +237,15 @@ sub parse_references ($$$$) {
        \@keep;
 }
 
+# normalize subjects so they are suitable as pathnames for URLs
+# XXX: consider for removal
+sub subject_path ($) {
+       my ($subj) = @_;
+       $subj = subject_normalized($subj);
+       $subj =~ s![^a-zA-Z0-9_\.~/\-]+!_!g;
+       lc($subj);
+}
+
 sub add_overview {
        my ($self, $mime, $bytes, $num, $oid, $mid0) = @_;
        my $lines = $mime->body_raw =~ tr!\n!\n!;
@@ -241,11 +257,11 @@ sub add_overview {
                blob => $oid,
        }, 'PublicInbox::SearchMsg';
        my $mids = mids($mime->header_obj);
-       my $refs = $self->parse_references($smsg, $mid0, $mids);
+       my $refs = parse_references($smsg, $mid0, $mids);
        my $subj = $smsg->subject;
        my $xpath;
        if ($subj ne '') {
-               $xpath = PublicInbox::Search::subject_path($subj);
+               $xpath = subject_path($subj);
                $xpath = id_compress($xpath);
        }
        my $dd = $smsg->to_doc_data($oid, $mid0);
@@ -262,7 +278,7 @@ sub add_over {
        my $vivified = 0;
 
        $self->begin_lazy;
-       $self->delete_by_num($num);
+       $self->delete_by_num($num, \$old_tid);
        foreach my $mid (@$mids) {
                my $v = 0;
                each_by_mid($self, $mid, ['tid'], sub {
@@ -304,20 +320,35 @@ INSERT INTO id2num (id, num) VALUES (?,?)
        }
 }
 
-sub delete_articles {
-       my ($self, $nums) = @_;
-       my $dbh = $self->connect;
-       $self->delete_by_num($_) foreach @$nums;
-}
-
+# returns number of removed messages
+# $oid may be undef to match only on $mid
 sub remove_oid {
        my ($self, $oid, $mid) = @_;
+       my $nr = 0;
        $self->begin_lazy;
        each_by_mid($self, $mid, ['ddd'], sub {
                my ($smsg) = @_;
-               $self->delete_by_num($smsg->{num}) if $smsg->{blob} eq $oid;
+               if (!defined($oid) || $smsg->{blob} eq $oid) {
+                       $self->delete_by_num($smsg->{num});
+                       $nr++;
+               }
                1;
        });
+       $nr;
+}
+
+sub num_mid0_for_oid {
+       my ($self, $oid, $mid) = @_;
+       my ($num, $mid0);
+       $self->begin_lazy;
+       each_by_mid($self, $mid, ['ddd'], sub {
+               my ($smsg) = @_;
+               my $blob = $smsg->{blob};
+               return 1 if (!defined($blob) || $blob ne $oid); # continue;
+               ($num, $mid0) = ($smsg->{num}, $smsg->{mid});
+               0; # done
+       });
+       ($num, $mid0);
 }
 
 sub create_tables {