# based on notmuch, but with no concept of folders, files or flags
#
# Wraps a document inside our Xapian search index.
+# There may be many of these objects loaded in memory at once
+# for large threads in our WWW UI.
package PublicInbox::SearchMsg;
use strict;
use warnings;
+use base qw(Exporter);
+our @EXPORT_OK = qw(subject_normalized);
use PublicInbox::MID qw/mid_clean mid_mime/;
use PublicInbox::Address;
use PublicInbox::MsgTime qw(msg_timestamp msg_datestamp);
+use Time::Local qw(timegm);
sub new {
my ($class, $mime) = @_;
- my $doc = Search::Xapian::Document->new;
- bless { doc => $doc, mime => $mime }, $class;
+ bless { mime => $mime }, $class;
}
sub wrap {
- my ($class, $doc, $mid) = @_;
- bless { doc => $doc, mime => undef, mid => $mid }, $class;
+ my ($class, $mid) = @_;
+ bless { mid => $mid }, $class;
}
sub get {
my ($class, $head, $db, $mid) = @_;
my $doc_id = $head->get_docid;
- my $doc = $db->get_document($doc_id);
- load_expand(wrap($class, $doc, $mid))
+ load_expand(wrap($class, $mid), $db->get_document($doc_id));
}
sub get_val ($$) {
$self->cc,
$oid,
$mid0,
- $self->ds,
- $self->{bytes},
- $self->{lines}
+ $self->{bytes} || '',
+ $self->{lines} || ''
);
}
-
sub load_from_data ($$) {
my ($self) = $_[0]; # data = $_[1]
(
# To: and Cc: are stored to optimize HDR/XHDR in NNTP since
# some NNTP clients will use that for message displays.
+ # NNTP only, and only stored in Over(view), not Xapian
$self->{to},
$self->{cc},
$self->{blob},
$self->{mid},
- $self->{ds},
+
+ # NNTP only
$self->{bytes},
$self->{lines}
) = split(/\n/, $_[1]);
}
sub load_expand {
- my ($self) = @_;
- my $doc = $self->{doc};
+ my ($self, $doc) = @_;
my $data = $doc->get_data or return;
- $self->{ts} = get_val($doc, &PublicInbox::Search::TS);
+ $self->{ts} = get_val($doc, PublicInbox::Search::TS());
+ my $dt = get_val($doc, PublicInbox::Search::DT());
+ my ($yyyy, $mon, $dd, $hh, $mm, $ss) = unpack('A4A2A2A2A2A2', $dt);
+ $self->{ds} = timegm($ss, $mm, $hh, $dd, $mon - 1, $yyyy);
utf8::decode($data);
load_from_data($self, $data);
$self;
}
+sub psgi_cull ($) {
+ my ($self) = @_;
+ from_name($self); # fill in {from_name} so we can delete {from}
+
+ # 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)};
+ $self;
+}
+
+# Only called by PSGI interface, not NNTP
sub load_doc {
my ($class, $doc) = @_;
- my $self = bless { doc => $doc }, $class;
- $self->load_expand;
+ my $self = bless {}, $class;
+ psgi_cull(load_expand($self, $doc));
}
# :bytes and :lines metadata in RFC 3977
sub bytes ($) { $_[0]->{bytes} }
sub lines ($) { $_[0]->{lines} }
-sub num ($) { $_[0]->{num} ||= _get_term_val($_[0], 'XNUM', qr/\AXNUM/) }
sub __hdr ($$) {
my ($self, $field) = @_;
my $mime = $self->{mime} or return;
$val = $mime->header($field);
$val = '' unless defined $val;
- $val =~ tr/\n/ /;
+ $val =~ tr/\t\n/ /;
$val =~ tr/\r//d;
$self->{$field} = $val;
}
defined $x ? $x : '';
}
-sub _get_term_val ($$$) {
- my ($self, $pfx, $re) = @_;
- my $doc = $self->{doc};
- my $end = $doc->termlist_end;
- my $i = $doc->termlist_begin;
- $i->skip_to($pfx);
- if ($i != $end) {
- my $val = $i->get_termname;
- $val =~ s/$re// and return $val;
- }
- undef;
-}
-
sub mid ($;$) {
my ($self, $mid) = @_;
if (defined $mid) {
$self->{mid} = $mid;
- } elsif (my $rv = $self->{mid}) {
+ } elsif (defined(my $rv = $self->{mid})) {
$rv;
- } elsif ($self->{doc}) {
- $self->{mid} = _get_term_val($self, 'Q', qr/\AQ/);
} else {
+ die "NO {mime} for mid\n" unless $self->{mime};
$self->_extract_mid; # v1 w/o Xapian
}
}
sub _extract_mid { mid_clean(mid_mime($_[0]->{mime})) }
-sub tid { $_[0]->{tid} }
+our $REPLY_RE = qr/^re:\s+/i;
-# XXX: consider removing this, we can phrase match subject
-sub path { $_[0]->{path} }
+sub subject_normalized ($) {
+ my ($subj) = @_;
+ $subj =~ s/\A\s+//s; # no leading space
+ $subj =~ s/\s+\z//s; # no trailing space
+ $subj =~ s/\s+/ /gs; # no redundant spaces
+ $subj =~ s/\.+\z//; # no trailing '.'
+ $subj =~ s/$REPLY_RE//igo; # remove reply prefix
+ $subj;
+}
1;