use Date::Parse qw/str2time/;
use PublicInbox::MID qw/mid_clean/;
use PublicInbox::Address;
-use Encode qw/find_encoding/;
-my $enc_utf8 = find_encoding('UTF-8');
our $PFX2TERM_RE = undef;
use constant EPOCH_822 => 'Thu, 01 Jan 1970 00:00:00 +0000';
use POSIX qw(strftime);
sub load_doc {
my ($class, $doc) = @_;
- my $data = $doc->get_data;
+ my $data = $doc->get_data or return;
my $ts = get_val($doc, &PublicInbox::Search::TS);
- $data = $enc_utf8->decode($data);
- my ($subj, $from, $refs, $to, $cc) = split(/\n/, $data);
+ utf8::decode($data);
+ my ($subj, $from, $refs, $to, $cc, $blob) = split(/\n/, $data);
bless {
doc => $doc,
subject => $subj,
references => $refs,
to => $to,
cc => $cc,
+ blob => $blob,
}, $class;
}
my ($self) = @_;
my $from = __hdr($self, 'from');
if (defined $from && !defined $self->{from_name}) {
- $self->{from_name} = PublicInbox::Address::from_name($from);
+ my @n = PublicInbox::Address::names($from);
+ $self->{from_name} = join(', ', @n);
}
$from;
}
}
sub to_doc_data {
- my ($self) = @_;
- join("\n", $self->subject, $self->from, $self->references,
- $self->to, $self->cc);
+ my ($self, $blob) = @_;
+ my @rows = ($self->subject, $self->from, $self->references,
+ $self->to, $self->cc);
+ push @rows, $blob if defined $blob;
+ join("\n", @rows);
}
sub references {
sub _extract_mid { mid_clean(mid_mime($_[0]->mime)) }
+sub blob {
+ my ($self, $x40) = @_;
+ if (defined $x40) {
+ $self->{blob} = $x40;
+ } else {
+ $self->{blob};
+ }
+}
+
sub mime {
my ($self, $mime) = @_;
if (defined $mime) {