update copyrights for 2021

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

diff --git a/lib/PublicInbox/Isearch.pm b/lib/PublicInbox/Isearch.pm
index 8a1f257ae1062b67bbb4dadd9eacfc91024d8d2f..342d79137081bf5d5c67adc4f729c7e652ed7ac4 100644 (file)
--- a/lib/PublicInbox/Isearch.pm
+++ b/lib/PublicInbox/Isearch.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2020 all contributors <meta@public-inbox.org>
+# Copyright (C) 2020-2021 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
 # Provides everything the PublicInbox::Search object does;
@@ -61,7 +61,7 @@ sub mset_to_artnums {
        my $docids = PublicInbox::Search::mset_to_artnums($self->{es}, $mset);
        my $ibx_id = $self->{-ibx_id} //= _ibx_id($self);
        my $qmarks = join(',', map { '?' } @$docids);
-       if ($opt && ($opt->{mset} // 0) == 2) { # opt->{mset} = 2 was used
+       if ($opt && ($opt->{relevance} // 0) == -1) { # -1 => ENQ_ASCENDING
                my $range = '';
                my @r;
                if (my $r = $opt->{uid_range}) {
@@ -89,7 +89,7 @@ SELECT docid,xnum FROM xref3 WHERE ibx_id = ? AND docid IN ($qmarks)
        }
        if (scalar keys %order) {
                warn "W: $self->{es}->{topdir} #",
-                       join(', #', sort keys %order),
+                       join(', ', sort { $a <=> $b } keys %order),
                        " not mapped to `$self->{eidx_key}'\n";
                warn "W: $self->{es}->{topdir} may need to be reindexed\n";
                @xnums = grep { defined } @xnums;
@@ -113,7 +113,7 @@ sub mset_to_smsg {
        }
        if (scalar keys %order) {
                warn "W: $ibx->{inboxdir} #",
-                       join(', #', sort keys %order),
+                       join(', ', sort { $a <=> $b } keys %order),
                        " no longer valid\n";
                warn "W: $self->{es}->{topdir} may need to be reindexed\n";
        }