wwwstream: show relative coderepo URLs correctly

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

diff --git a/lib/PublicInbox/SearchIdxShard.pm b/lib/PublicInbox/SearchIdxShard.pm
index 579ed1965962c5993c1488a9442a3a027e8f3da3..2e6547693c1cef63eb514563c4db312321699c11 100644 (file)
--- a/lib/PublicInbox/SearchIdxShard.pm
+++ b/lib/PublicInbox/SearchIdxShard.pm
@@ -69,33 +69,31 @@ sub shard_worker_loop ($$$$$) {
        $0 = "shard[$shard]";
        $self->begin_txn_lazy;
        while (my $line = readline($r)) {
+               chomp $line;
                $v2w->{current_info} = "[$shard] $line";
-               if ($line eq "commit\n") {
+               if ($line eq 'commit') {
                        $self->commit_txn_lazy;
-               } elsif ($line eq "close\n") {
+               } elsif ($line eq 'close') {
                        $self->idx_release;
-               } elsif ($line eq "barrier\n") {
+               } elsif ($line eq 'barrier') {
                        $self->commit_txn_lazy;
                        # no need to lock < 512 bytes is atomic under POSIX
                        print $bnote "barrier $shard\n" or
                                        die "write failed for barrier $!\n";
-               } elsif ($line =~ /\AD ([0-9]+)\n\z/s) {
+               } elsif ($line =~ /\AD ([0-9]+)\z/s) {
                        $self->remove_by_docid($1 + 0);
                } elsif ($line =~ s/\A\+X //) {
                        my ($len, $docid, $eidx_key) = split(/ /, $line, 3);
-                       chomp $eidx_key;
                        $self->add_eidx_info($docid, $eidx_key, eml($r, $len));
                } elsif ($line =~ s/\A-X //) {
                        my ($len, $docid, $eidx_key) = split(/ /, $line, 3);
-                       chomp $eidx_key;
                        $self->remove_eidx_info($docid, $eidx_key,
                                                        eml($r, $len));
-               } elsif ($line =~ s/\AO ([^\n]+)\n//) {
+               } elsif ($line =~ s/\AO ([^\n]+)//) {
                        my $over_fn = $1;
                        $over_fn =~ tr/\0/\n/;
                        $self->over_check(PublicInbox::Over->new($over_fn));
                } else {
-                       chomp $line;
                        my $eidx_key;
                        if ($line =~ s/\AX=(.+)\0//) {
                                $eidx_key = $1;
@@ -122,9 +120,9 @@ sub shard_worker_loop ($$$$$) {
 }
 
 sub index_raw {
-       my ($self, $msgref, $eml, $smsg, $ibx) = @_;
+       my ($self, $msgref, $eml, $smsg, $eidx_key) = @_;
        if (my $w = $self->{w}) {
-               my @ekey = $ibx ? ('X='.$ibx->eidx_key."\0") : ();
+               my @ekey = defined($eidx_key) ? ("X=$eidx_key\0") : ();
                $msgref //= \($eml->as_string);
                $smsg->{raw_bytes} //= length($$msgref);
                # mid must be last, it can contain spaces (but not LF)
@@ -138,7 +136,7 @@ sub index_raw {
                        $eml = PublicInbox::Eml->new($msgref);
                }
                $self->begin_txn_lazy;
-               $smsg->{eidx_key} = $ibx->eidx_key if $ibx;
+               $smsg->{eidx_key} = $eidx_key if defined $eidx_key;
                $self->add_message($eml, $smsg);
        }
 }