X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FSearchMsg.pm;h=afba8b1a814c92c978c37c1ec3f44ea5b6a443e9;hb=3d41aa23f35501ca92aab8aa42980fa73f7fa74f;hp=9dcc1e6dc5e54b8b9ddcebcf5260c63b6cfcb661;hpb=712b8bb3a61cc261a4b8c1bfdb6e39f40cee3188;p=public-inbox.git
diff --git a/lib/PublicInbox/SearchMsg.pm b/lib/PublicInbox/SearchMsg.pm
index 9dcc1e6d..afba8b1a 100644
--- a/lib/PublicInbox/SearchMsg.pm
+++ b/lib/PublicInbox/SearchMsg.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2016 all contributors
+# Copyright (C) 2015-2018 all contributors
# License: AGPL-3.0+
# based on notmuch, but with no concept of folders, files or flags
#
@@ -7,18 +7,14 @@ package PublicInbox::SearchMsg;
use strict;
use warnings;
use Search::Xapian;
-use POSIX qw//;
use Date::Parse qw/str2time/;
use PublicInbox::MID qw/mid_clean/;
use PublicInbox::Address;
-our $PFX2TERM_RE = undef;
-use constant EPOCH_822 => 'Thu, 01 Jan 1970 00:00:00 +0000';
-use POSIX qw(strftime);
sub new {
my ($class, $mime) = @_;
my $doc = Search::Xapian::Document->new;
- $doc->add_term(PublicInbox::Search::xpfx('type') . 'mail');
+ $doc->add_term('T' . 'mail');
bless { type => 'mail', doc => $doc, mime => $mime }, $class;
}
@@ -33,6 +29,22 @@ sub get_val ($$) {
Search::Xapian::sortable_unserialise($doc->get_value($col));
}
+sub load_expand {
+ my ($self) = @_;
+ my $doc = $self->{doc};
+ my $data = $doc->get_data or return;
+ $self->{ts} = get_val($doc, &PublicInbox::Search::TS);
+ utf8::decode($data);
+ my ($subj, $from, $refs, $to, $cc, $blob) = split(/\n/, $data);
+ $self->{subject} = $subj;
+ $self->{from} = $from;
+ $self->{references} = $refs;
+ $self->{to} = $to;
+ $self->{cc} = $cc;
+ $self->{blob} = $blob;
+ $self;
+}
+
sub load_doc {
my ($class, $doc) = @_;
my $data = $doc->get_data or return;
@@ -73,13 +85,18 @@ 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 date ($) {
my ($self) = @_;
- my $date = __hdr($self, 'date');
- return $date if defined $date;
my $ts = $self->{ts};
return unless defined $ts;
- $self->{date} = strftime('%a, %d %b %Y %T +0000', gmtime($ts));
+ my ($sec, $min, $hour, $mday, $mon, $year, $wday) = gmtime($ts);
+ "$DoW[$wday], " . sprintf("%02d $MoY[$mon] %04d %02d:%02d:%02d +0000",
+ $mday, $year+1900, $hour, $min, $sec);
+
}
sub from ($) {
@@ -102,7 +119,7 @@ sub from_name {
sub ts {
my ($self) = @_;
- $self->{ts} ||= eval { str2time($self->mime->header('Date')) } || 0;
+ $self->{ts} ||= eval { str2time($self->{mime}->header('Date')) } || 0;
}
sub to_doc_data {
@@ -119,29 +136,17 @@ sub references {
defined $x ? $x : '';
}
-sub ensure_metadata {
- my ($self) = @_;
+sub _get_term_val ($$$) {
+ my ($self, $pfx, $re) = @_;
my $doc = $self->{doc};
my $end = $doc->termlist_end;
-
- unless (defined $PFX2TERM_RE) {
- my $or = join('|', keys %PublicInbox::Search::PFX2TERM_RMAP);
- $PFX2TERM_RE = qr/\A($or)/;
- }
-
- while (my ($pfx, $field) = each %PublicInbox::Search::PFX2TERM_RMAP) {
- # ideally we'd move this out of the loop:
- my $i = $doc->termlist_begin;
-
- $i->skip_to($pfx);
- if ($i != $end) {
- my $val = $i->get_termname;
-
- if ($val =~ s/$PFX2TERM_RE//o) {
- $self->{$field} = $val;
- }
- }
+ 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 ($;$) {
@@ -152,56 +157,26 @@ sub mid ($;$) {
} elsif (my $rv = $self->{mid}) {
$rv;
} else {
- $self->ensure_metadata; # needed for ghosts
- $self->{mid} ||= $self->_extract_mid;
+ $self->{mid} = _get_term_val($self, 'Q', qr/\AQ/) ||
+ $self->_extract_mid;
}
}
-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) {
- $self->{mime} = $mime;
- } else {
- # TODO load from git
- $self->{mime};
- }
-}
-
-sub doc_id {
- my ($self, $doc_id) = @_;
- if (defined $doc_id) {
- $self->{doc_id} = $doc_id;
- } else {
- # TODO load from xapian
- $self->{doc_id};
- }
-}
+sub _extract_mid { mid_clean(mid_mime($_[0]->{mime})) }
sub thread_id {
my ($self) = @_;
my $tid = $self->{thread};
return $tid if defined $tid;
- $self->ensure_metadata;
- $self->{thread};
+ $self->{thread} = _get_term_val($self, 'G', qr/\AG/); # *G*roup
}
+# XXX: consider removing this, we can phrase match subject
sub path {
my ($self) = @_;
my $path = $self->{path};
return $path if defined $path;
- $self->ensure_metadata;
- $self->{path};
+ $self->{path} = _get_term_val($self, 'XPATH', qr/\AXPATH/); # path
}
1;