From 1ac3134bb4cc47db05d9e4260e593f7867b46dcb Mon Sep 17 00:00:00 2001
From: Eric Wong <e@80x24.org>
Date: Tue, 21 Jun 2016 03:16:52 +0000
Subject: searchidx: simplify ghost creation

Remove some worthless parameters and redundant no-ops
to make the next (important) patch easier-to-review.
---
 lib/PublicInbox/SearchIdx.pm | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

(limited to 'lib/PublicInbox/SearchIdx.pm')

diff --git a/lib/PublicInbox/SearchIdx.pm b/lib/PublicInbox/SearchIdx.pm
index a259d86f..31346876 100644
--- a/lib/PublicInbox/SearchIdx.pm
+++ b/lib/PublicInbox/SearchIdx.pm
@@ -150,11 +150,11 @@ sub add_message {
 
 		if ($was_ghost) {
 			$doc_id = $smsg->doc_id;
-			$self->link_message($smsg, 0);
+			$self->link_message($smsg);
 			$doc->set_data($smsg->to_doc_data);
 			$db->replace_document($doc_id, $doc);
 		} else {
-			$self->link_message($smsg, 0);
+			$self->link_message($smsg);
 			$doc->set_data($smsg->to_doc_data);
 			$doc_id = $db->add_document($doc);
 		}
@@ -211,16 +211,6 @@ sub next_thread_id {
 }
 
 sub link_message {
-	my ($self, $smsg, $is_ghost) = @_;
-
-	if ($is_ghost) {
-		$smsg->ensure_metadata;
-	} else {
-		$self->link_message_to_parents($smsg);
-	}
-}
-
-sub link_message_to_parents {
 	my ($self, $smsg) = @_;
 	my $doc = $smsg->{doc};
 	my $mid = $smsg->mid;
@@ -414,17 +404,15 @@ sub _resolve_mid_to_tid {
 }
 
 sub create_ghost {
-	my ($self, $mid, $tid) = @_;
-
-	$tid = $self->next_thread_id unless defined $tid;
+	my ($self, $mid) = @_;
 
+	my $tid = $self->next_thread_id;
 	my $doc = Search::Xapian::Document->new;
 	$doc->add_term(xpfx('mid') . $mid);
 	$doc->add_term(xpfx('thread') . $tid);
 	$doc->add_term(xpfx('type') . 'ghost');
 
 	my $smsg = PublicInbox::SearchMsg->wrap($doc, $mid);
-	$self->link_message($smsg, 1);
 	$self->{xdb}->add_document($doc);
 
 	$smsg;
-- 
cgit v1.2.3-24-ge0c7