treewide: run update-copyrights from gnulib for 2019

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

diff --git a/lib/PublicInbox/SearchMsg.pm b/lib/PublicInbox/SearchMsg.pm
index 96a26b1538a7775bef753480adead7f6e1cf3d8c..42384936b923364bb17fc515bd6b39c0d83bc35e 100644 (file)
--- a/lib/PublicInbox/SearchMsg.pm
+++ b/lib/PublicInbox/SearchMsg.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 2015-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 # based on notmuch, but with no concept of folders, files or flags
 #
@@ -27,7 +27,8 @@ sub wrap {
 
 sub get_val ($$) {
        my ($doc, $col) = @_;
-       Search::Xapian::sortable_unserialise($doc->get_value($col));
+       # sortable_unserialise is defined by PublicInbox::Search::load_xapian()
+       sortable_unserialise($doc->get_value($col));
 }
 
 sub to_doc_data {
@@ -91,10 +92,11 @@ sub psgi_cull ($) {
 }
 
 # Only called by PSGI interface, not NNTP
-sub load_doc {
-       my ($class, $doc) = @_;
-       my $self = bless {}, $class;
-       psgi_cull(load_expand($self, $doc));
+sub from_mitem {
+       my ($mitem, $srch) = @_;
+       return $srch->retry_reopen(\&from_mitem, $mitem) if $srch;
+       my $self = bless {}, __PACKAGE__;
+       psgi_cull(load_expand($self, $mitem->get_document));
 }
 
 # :bytes and :lines metadata in RFC 3977
@@ -107,8 +109,8 @@ sub __hdr ($$) {
        return $val if defined $val;
 
        my $mime = $self->{mime} or return;
-       $val = $mime->header($field);
-       $val = '' unless defined $val;
+       my @raw = $mime->header($field);
+       $val = join(', ', @raw);
        $val =~ tr/\t\n/  /;
        $val =~ tr/\r//d;
        $self->{$field} = $val;