search: remove unnecessary abstractions and functionality

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

diff --git a/lib/PublicInbox/SearchMsg.pm b/lib/PublicInbox/SearchMsg.pm
index d62f02c8487f6baebfd783701d5fe67ec79b69fe..a19d45db8cc87531753eb0bc032bc38253e358d1 100644 (file)
--- a/lib/PublicInbox/SearchMsg.pm
+++ b/lib/PublicInbox/SearchMsg.pm
@@ -10,12 +10,11 @@ use Search::Xapian;
 use Date::Parse qw/str2time/;
 use PublicInbox::MID qw/mid_clean/;
 use PublicInbox::Address;
-our $PFX2TERM_RE = undef;
 
 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;
 }
@@ -70,7 +69,7 @@ sub subject ($) { __hdr($_[0], 'subject') }
 sub to ($) { __hdr($_[0], 'to') }
 sub cc ($) { __hdr($_[0], 'cc') }
 
-# no strftime, that is locale-dependent
+# 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);
 
@@ -104,7 +103,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 {
@@ -121,29 +120,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 ($;$) {
@@ -154,56 +141,26 @@ sub mid ($;$) {
        } elsif (my $rv = $self->{mid}) {
                $rv;
        } else {
-               $self->ensure_metadata; # needed for ghosts
-               $self->{mid} ||= $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};
+               $self->{mid} = _get_term_val($self, 'Q', qr/\AQ/) ||
+                               $self->_extract_mid;
        }
 }
 
-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;