X-Git-Url: http://www.git.stargrave.org/?p=public-inbox.git;a=blobdiff_plain;f=lib%2FPublicInbox%2FLeiSearch.pm;h=936c275178dfc6908577487ce97d3a83c58c5449;hp=3e046b2146c6ca9f4f9b4341811a0b91d7215513;hb=961690bae47c90a4a6960952587c6f4463fb4b19;hpb=c8b441f4ddcb9f6cbbe54cd380fe89586d023124 diff --git a/lib/PublicInbox/LeiSearch.pm b/lib/PublicInbox/LeiSearch.pm index 3e046b21..936c2751 100644 --- a/lib/PublicInbox/LeiSearch.pm +++ b/lib/PublicInbox/LeiSearch.pm @@ -1,4 +1,4 @@ -# Copyright (C) 2020-2021 all contributors +# Copyright (C) all contributors # License: AGPL-3.0+ # read-only counterpart for PublicInbox::LeiStore @@ -7,7 +7,7 @@ use strict; use v5.10.1; use parent qw(PublicInbox::ExtSearch); # PublicInbox::Search->reopen use PublicInbox::Search qw(xap_terms); -use PublicInbox::ContentHash qw(content_digest content_hash); +use PublicInbox::ContentHash qw(content_digest content_hash git_sha); use PublicInbox::MID qw(mids mids_for_index); use Carp qw(croak); @@ -101,7 +101,7 @@ sub xoids_for { my $git = $self->git; my $xoids = {}; # no lms when used via {ale}: - my $lms = $self->{-lms_ro} //= lms($self) if defined($self->{topdir}); + my $lms = $self->{-lms_rw} //= lms($self) if defined($self->{topdir}); for my $mid (@$mids) { for my $o (@overs) { my ($id, $prev); @@ -118,6 +118,13 @@ sub xoids_for { } } $git->async_wait_all; + + # it could be an 'lei index'-ed file that just got renamed + if (scalar(keys %$xoids) < ($min // 1) && defined($self->{topdir})) { + my $hex = git_sha(1, $eml)->hexdigest; + my @n = $overs[0]->blob_exists($hex); + for (@n) { $xoids->{$hex} //= $_ } + } scalar(keys %$xoids) ? $xoids : undef; } @@ -129,6 +136,10 @@ sub kw_changed { my $xoids = xoids_for($self, $eml) // return; $docids //= []; @$docids = sort { $a <=> $b } values %$xoids; + if (!@$docids && $self->over) { + my $bin = git_sha(1, $eml)->digest; + @$docids = $self->over->oidbin_exists($bin); + } } for my $id (@$docids) { $cur_kw = eval { msg_keywords($self, $id) } and last; @@ -164,6 +175,8 @@ sub all_terms { sub qparse_new { my ($self) = @_; my $qp = $self->SUPER::qparse_new; # PublicInbox::Search + $self->{qp_flags} |= PublicInbox::Search::FLAG_PHRASE() | + PublicInbox::Search::FLAG_PURE_NOT(); $qp->add_boolean_prefix('kw', 'K'); $qp->add_boolean_prefix('L', 'L'); $qp