searchmsg: remove unused `tid' and `path' methods

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

diff --git a/lib/PublicInbox/SearchMsg.pm b/lib/PublicInbox/SearchMsg.pm
index 014f4909d90e9415da3bbde17829e5c8dffea42d..d43853a0ac6a5c5515a27950051ed02a1af3f65b 100644 (file)
--- a/lib/PublicInbox/SearchMsg.pm
+++ b/lib/PublicInbox/SearchMsg.pm
@@ -6,17 +6,14 @@
 package PublicInbox::SearchMsg;
 use strict;
 use warnings;
-use Search::Xapian;
-use Date::Parse qw/str2time/;
 use PublicInbox::MID qw/mid_clean mid_mime/;
 use PublicInbox::Address;
+use PublicInbox::MsgTime qw(msg_timestamp msg_datestamp);
 
 sub new {
        my ($class, $mime) = @_;
        my $doc = Search::Xapian::Document->new;
-       $doc->add_term('T' . 'mail');
-
-       bless { type => 'mail', doc => $doc, mime => $mime }, $class;
+       bless { doc => $doc, mime => $mime }, $class;
 }
 
 sub wrap {
@@ -24,20 +21,54 @@ sub wrap {
        bless { doc => $doc, mime => undef, 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))
+}
+
 sub get_val ($$) {
        my ($doc, $col) = @_;
        Search::Xapian::sortable_unserialise($doc->get_value($col));
 }
 
+sub to_doc_data {
+       my ($self, $oid, $mid0) = @_;
+       $oid = '' unless defined $oid;
+       join("\n",
+               $self->subject,
+               $self->from,
+               $self->references,
+               $self->to,
+               $self->cc,
+               $oid,
+               $mid0,
+               $self->ds,
+               $self->{bytes},
+               $self->{lines}
+       );
+}
+
+
 sub load_from_data ($$) {
        my ($self) = $_[0]; # data = $_[1]
-       my ($subj, $from, $refs, $to, $cc, $blob) = split(/\n/, $_[1]);
-       $self->{subject} = $subj;
-       $self->{from} = $from;
-       $self->{references} = $refs;
-       $self->{to} = $to;
-       $self->{cc} = $cc;
-       $self->{blob} = $blob;
+       (
+               $self->{subject},
+               $self->{from},
+               $self->{references},
+
+               # To: and Cc: are stored to optimize HDR/XHDR in NNTP since
+               # some NNTP clients will use that for message displays.
+               $self->{to},
+               $self->{cc},
+
+               $self->{blob},
+               $self->{mid},
+               $self->{ds},
+               $self->{bytes},
+               $self->{lines}
+       ) = split(/\n/, $_[1]);
 }
 
 sub load_expand {
@@ -52,18 +83,14 @@ sub load_expand {
 
 sub load_doc {
        my ($class, $doc) = @_;
-       my $data = $doc->get_data or return;
-       my $ts = get_val($doc, &PublicInbox::Search::TS);
-       utf8::decode($data);
-       my $self = bless { doc => $doc, ts => $ts }, $class;
-       load_from_data($self, $data);
-       $self
+       my $self = bless { doc => $doc }, $class;
+       $self->load_expand;
 }
 
 # :bytes and :lines metadata in RFC 3977
-sub bytes ($) { get_val($_[0]->{doc}, &PublicInbox::Search::BYTES) }
-sub lines ($) { get_val($_[0]->{doc}, &PublicInbox::Search::LINES) }
-sub num ($) { get_val($_[0]->{doc}, &PublicInbox::Search::NUM) }
+sub bytes ($) { $_[0]->{bytes} }
+sub lines ($) { $_[0]->{lines} }
+sub num ($) { $_[0]->{num} ||= _get_term_val($_[0], 'XNUM', qr/\AXNUM/) }
 
 sub __hdr ($$) {
        my ($self, $field) = @_;
@@ -88,9 +115,9 @@ my @MoY = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
 
 sub date ($) {
        my ($self) = @_;
-       my $ts = $self->{ts};
-       return unless defined $ts;
-       my ($sec, $min, $hour, $mday, $mon, $year, $wday) = gmtime($ts);
+       my $ds = $self->{ds};
+       return unless defined $ds;
+       my ($sec, $min, $hour, $mday, $mon, $year, $wday) = gmtime($ds);
        "$DoW[$wday], " . sprintf("%02d $MoY[$mon] %04d %02d:%02d:%02d +0000",
                                $mday, $year+1900, $hour, $min, $sec);
 
@@ -116,15 +143,12 @@ sub from_name {
 
 sub ts {
        my ($self) = @_;
-       $self->{ts} ||= eval { str2time($self->{mime}->header('Date')) } || 0;
+       $self->{ts} ||= eval { msg_timestamp($self->{mime}->header_obj) } || 0;
 }
 
-sub to_doc_data {
-       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 ds {
+       my ($self) = @_;
+       $self->{ds} ||= eval { msg_datestamp($self->{mime}->header_obj); } || 0;
 }
 
 sub references {
@@ -153,27 +177,13 @@ sub mid ($;$) {
                $self->{mid} = $mid;
        } elsif (my $rv = $self->{mid}) {
                $rv;
+       } elsif ($self->{doc}) {
+               $self->{mid} = _get_term_val($self, 'Q', qr/\AQ/);
        } else {
-               $self->{mid} = _get_term_val($self, 'Q', qr/\AQ/) ||
-                               $self->_extract_mid;
+               $self->_extract_mid; # v1 w/o Xapian
        }
 }
 
 sub _extract_mid { mid_clean(mid_mime($_[0]->{mime})) }
 
-sub thread_id {
-       my ($self) = @_;
-       my $tid = $self->{thread};
-       return $tid if defined $tid;
-       $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->{path} = _get_term_val($self, 'XPATH', qr/\AXPATH/); # path
-}
-
 1;