join("\n",
$self->{subject},
$self->{from},
- $self->references,
+ $self->{references} // '',
$self->{to},
$self->{cc},
$self->{blob},
sub psgi_cull ($) {
my ($self) = @_;
- from_name($self); # fill in {from_name} so we can delete {from}
+
+ # ghosts don't have ->{from}
+ my $from = delete($self->{from}) // '';
+ my @n = PublicInbox::Address::names($from);
+ $self->{from_name} = join(', ', @n);
# drop NNTP-only fields which aren't relevant to PSGI results:
# saves ~80K on a 200 item search result:
- delete @$self{qw(from ts to cc bytes lines)};
+ delete @$self{qw(ts to cc bytes lines)};
$self;
}
psgi_cull(load_expand($self, $mitem->get_document));
}
-sub __hdr ($$) {
- my ($self, $field) = @_;
- $self->{lc($field)};
-}
-
# for Import and v1 non-SQLite WWW code paths
sub populate {
my ($self, $hdr, $v2w) = @_;
$self->{mid} //= eval { mids($hdr)->[0] } // '';
}
-sub subject ($) { __hdr($_[0], 'Subject') }
-sub to ($) { __hdr($_[0], 'To') }
-sub cc ($) { __hdr($_[0], 'Cc') }
-
# no strftime, that is locale-dependent and not for RFC822
my @DoW = qw(Sun Mon Tue Wed Thu Fri Sat);
my @MoY = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
}
-sub from ($) {
- my ($self) = @_;
- my $from = __hdr($self, 'From');
- if (defined $from && !defined $self->{from_name}) {
- my @n = PublicInbox::Address::names($from);
- $self->{from_name} = join(', ', @n);
- }
- $from;
-}
-
-sub from_name {
- my ($self) = @_;
- my $from_name = $self->{from_name};
- return $from_name if defined $from_name;
- $self->from;
- $self->{from_name};
-}
-
-sub references {
- my ($self) = @_;
- my $x = $self->{references};
- defined $x ? $x : '';
-}
-
-sub mid { $_[0]->{mid} }
-
our $REPLY_RE = qr/^re:\s+/i;
sub subject_normalized ($) {
sub filter_mids {
my ($msgs) = @_;
- sort(map { $_->mid } @$msgs);
+ sort(map { $_->{mid} } @$msgs);
}
{
$ro->reopen;
my $found = $ro->query('m:root@s');
is(scalar(@$found), 1, "message found");
- is($found->[0]->mid, 'root@s', 'mid set correctly') if scalar(@$found);
+ is($found->[0]->{mid}, 'root@s', 'mid set correctly') if @$found;
my ($res, @res);
my @exp = sort qw(root@s last@s);
# body
$res = $ro->query('goodbye');
is(scalar(@$res), 1, "goodbye message found");
- is($res->[0]->mid, 'last@s', 'got goodbye message body') if scalar(@$res);
+ is($res->[0]->{mid}, 'last@s', 'got goodbye message body') if @$res;
# datestamp
$res = $ro->query('dt:20101002000001..20101002000001');
EOF
my $res = $rw->query("theatre");
is(scalar(@$res), 2, "got both matches");
- is($res->[0]->mid, 'nquote@a', "non-quoted scores higher") if scalar(@$res);
- is($res->[1]->mid, 'quote@a', "quoted result still returned") if scalar(@$res);
-
+ if (@$res == 2) {
+ is($res->[0]->{mid}, 'nquote@a', 'non-quoted scores higher');
+ is($res->[1]->{mid}, 'quote@a', 'quoted result still returned');
+ }
$res = $rw->query("illusions");
is(scalar(@$res), 1, "got a match for quoted text");
- is($res->[0]->mid, 'quote@a',
+ is($res->[0]->{mid}, 'quote@a',
"quoted result returned if nothing else") if scalar(@$res);
});
ok($doc_id > 0, "doc_id defined with circular reference");
my $smsg = $rw->query('m:circle@a', {limit=>1})->[0];
is(defined($smsg), 1, 'found m:circl@a');
- is($smsg->references, '', "no references created") if defined($smsg);
- is($smsg->subject, $s, 'long subject not rewritten') if defined($smsg);
+ if (defined $smsg) {
+ is($smsg->{references}, '', "no references created");
+ is($smsg->{subject}, $s, 'long subject not rewritten');
+ }
});
$ibx->with_umask(sub {
ok($doc_id > 0, 'message indexed doc_id with UTF-8');
my $msg = $rw->query('m:testmessage@example.com', {limit => 1})->[0];
is(defined($msg), 1, 'found testmessage@example.com');
- is($mime->header('Subject'), $msg->subject, 'UTF-8 subject preserved') if defined($msg);
+ if (defined $msg) {
+ is($mime->header('Subject'), $msg->{subject},
+ 'UTF-8 subject preserved');
+ }
});
{
is($mset->size, 6, 'searched To: successfully');
foreach my $m ($mset->items) {
my $smsg = $ro->{over_ro}->get_art($m->get_docid);
- like($smsg->to, qr/\blist\@example\.com\b/, 'to appears');
+ like($smsg->{to}, qr/\blist\@example\.com\b/, 'to appears');
}
$mset = $ro->query('tc:list@example.com', {mset => 1});
is($mset->size, 6, 'searched To+Cc: successfully');
foreach my $m ($mset->items) {
my $smsg = $ro->{over_ro}->get_art($m->get_docid);
- my $tocc = join("\n", $smsg->to, $smsg->cc);
+ my $tocc = join("\n", $smsg->{to}, $smsg->{cc});
like($tocc, qr/\blist\@example\.com\b/, 'tocc appears');
}
is($mset->items, 1, "searched $pfx successfully for Cc:");
foreach my $m ($mset->items) {
my $smsg = $ro->{over_ro}->get_art($m->get_docid);
- like($smsg->cc, qr/\bfoo\@example\.com\b/,
+ like($smsg->{cc}, qr/\bfoo\@example\.com\b/,
'cc appears');
}
}
is(scalar(@$res), 1,
"searched $pfx successfully for From:");
foreach my $smsg (@$res) {
- like($smsg->from_name, qr/Laggy Sender/,
+ like($smsg->{from_name}, qr/Laggy Sender/,
"From appears with $pfx");
}
}
$res = $ro->query('q:theatre');
is(scalar(@$res), 1, 'only one quoted body');
- like($res->[0]->from_name, qr/\AQuoter/,
+ like($res->[0]->{from_name}, qr/\AQuoter/,
'got quoted body') if (scalar(@$res));
$res = $ro->query('nq:theatre');
is(scalar @$res, 1, 'only one non-quoted body');
- like($res->[0]->from_name, qr/\ANon-Quoter/,
+ like($res->[0]->{from_name}, qr/\ANon-Quoter/,
'got non-quoted body') if (scalar(@$res));
foreach my $pfx (qw(b: bs:)) {
$res = $ro->query($pfx . 'theatre');
is(scalar @$res, 2, "searched both bodies for $pfx");
- like($res->[0]->from_name, qr/\ANon-Quoter/,
+ like($res->[0]->{from_name}, qr/\ANon-Quoter/,
"non-quoter first for $pfx") if scalar(@$res);
}
}
is(scalar @$n, 1, 'got result for n:');
my $res = $ro->query('part_deux.txt');
is(scalar @$res, 1, 'got result without n:');
- is($n->[0]->mid, $res->[0]->mid,
+ is($n->[0]->{mid}, $res->[0]->{mid},
'same result with and without') if scalar(@$res);
my $txt = $ro->query('"inside another"');
is(scalar @$txt, 1, 'found inside another');
- is($txt->[0]->mid, $res->[0]->mid,
+ is($txt->[0]->{mid}, $res->[0]->{mid},
'search inside text attachments works') if scalar(@$txt);
my $art;
if (scalar(@$n) >= 1) {
- my $mid = $n->[0]->mid;
+ my $mid = $n->[0]->{mid};
my ($id, $prev);
$art = $ro->{over_ro}->next_by_mid($mid, \$id, \$prev);
ok($art, 'article exists in OVER DB');