about summary refs log tree commit homepage
diff options
context:
space:
mode:
-rw-r--r--lib/PublicInbox/Inbox.pm3
-rw-r--r--lib/PublicInbox/Search.pm2
-rw-r--r--lib/PublicInbox/SearchIdx.pm4
-rw-r--r--lib/PublicInbox/SearchMsg.pm33
4 files changed, 7 insertions, 35 deletions
diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm
index f77944f5..aa4e141f 100644
--- a/lib/PublicInbox/Inbox.pm
+++ b/lib/PublicInbox/Inbox.pm
@@ -216,7 +216,8 @@ sub msg_by_smsg ($$;$) {
 
         # backwards compat to fallback to msg_by_mid
         # TODO: remove if we bump SCHEMA_VERSION in Search.pm:
-        defined(my $blob = $smsg->blob) or return msg_by_mid($self, $smsg->mid);
+        defined(my $blob = $smsg->{blob}) or
+                        return msg_by_mid($self, $smsg->mid);
 
         my $str = git($self)->cat_file($blob, $ref);
         $$str =~ s/\A[\r\n]*From [^\r\n]*\r?\n//s if $str;
diff --git a/lib/PublicInbox/Search.pm b/lib/PublicInbox/Search.pm
index b59430d8..86354b57 100644
--- a/lib/PublicInbox/Search.pm
+++ b/lib/PublicInbox/Search.pm
@@ -282,7 +282,7 @@ sub lookup_message {
                 # raises on error:
                 my $doc = $self->{xdb}->get_document($doc_id);
                 $smsg = PublicInbox::SearchMsg->wrap($doc, $mid);
-                $smsg->doc_id($doc_id);
+                $smsg->{doc_id} = $doc_id;
         }
         $smsg;
 }
diff --git a/lib/PublicInbox/SearchIdx.pm b/lib/PublicInbox/SearchIdx.pm
index 832d1cbf..87ee0d46 100644
--- a/lib/PublicInbox/SearchIdx.pm
+++ b/lib/PublicInbox/SearchIdx.pm
@@ -155,7 +155,7 @@ sub add_message {
                 if ($smsg) {
                         # convert a ghost to a regular message
                         # it will also clobber any existing regular message
-                        $doc_id = $smsg->doc_id;
+                        $doc_id = $smsg->{doc_id};
                         $old_tid = $smsg->thread_id;
                 }
                 $smsg = PublicInbox::SearchMsg->new($mime);
@@ -289,7 +289,7 @@ sub link_message {
         my ($self, $smsg, $old_tid) = @_;
         my $doc = $smsg->{doc};
         my $mid = $smsg->mid;
-        my $mime = $smsg->mime;
+        my $mime = $smsg->{mime};
         my $hdr = $mime->header_obj;
         my $refs = $hdr->header_raw('References');
         my @refs = $refs ? ($refs =~ /<([^>]+)>/g) : ();
diff --git a/lib/PublicInbox/SearchMsg.pm b/lib/PublicInbox/SearchMsg.pm
index 4522eb62..5bb00778 100644
--- a/lib/PublicInbox/SearchMsg.pm
+++ b/lib/PublicInbox/SearchMsg.pm
@@ -103,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 {
@@ -146,36 +146,7 @@ sub 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) = @_;