From f045f561f0d6b8b573f38a966365d8898178d242 Mon Sep 17 00:00:00 2001
From: Eric Wong <e@80x24.org>
Date: Thu, 20 Aug 2015 06:44:39 +0000
Subject: dead code cleanup

We may not be using subject_path after all.
---
 lib/PublicInbox/Thread.pm |  7 -------
 lib/PublicInbox/View.pm   | 46 +++++++++++++---------------------------------
 lib/PublicInbox/WWW.pm    | 18 ------------------
 3 files changed, 13 insertions(+), 58 deletions(-)

(limited to 'lib')

diff --git a/lib/PublicInbox/Thread.pm b/lib/PublicInbox/Thread.pm
index 92404faa..a3dedf54 100644
--- a/lib/PublicInbox/Thread.pm
+++ b/lib/PublicInbox/Thread.pm
@@ -24,13 +24,6 @@ sub sort_ts {
 	} @_;
 }
 
-sub rsort_ts {
-	sort {
-		(eval { $b->topmost->message->header('X-PI-TS') } || 0) <=>
-		(eval { $a->topmost->message->header('X-PI-TS') } || 0)
-	} @_;
-}
-
 package PublicInbox::Thread::Container;
 use strict;
 use warnings;
diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 17af21f7..e29922ef 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -153,10 +153,7 @@ sub thread_html {
 	my $msgs = load_results($res);
 	my $nr = scalar @$msgs;
 	return $rv if $nr == 0;
-	require PublicInbox::Thread;
-	my $th = PublicInbox::Thread->new(@$msgs);
-	$th->thread;
-	$th->order(*PublicInbox::Thread::sort_ts);
+	my $th = thread_results($msgs);
 	my $state = [ $srch, { root_anchor => anchor_for($mid) }, undef, 0 ];
 	{
 		require PublicInbox::GitCatFile;
@@ -176,30 +173,6 @@ sub thread_html {
 	$rv .= "<hr />" . PRE_WRAP . $next . $foot . "</pre>";
 }
 
-sub subject_path_html {
-	my (undef, $ctx, $foot, $srch) = @_;
-	my $path = $ctx->{subject_path};
-	my $res = $srch->get_subject_path($path);
-	my $rv = '';
-	my $msgs = load_results($res);
-	my $nr = scalar @$msgs;
-	return $rv if $nr == 0;
-	require PublicInbox::Thread;
-	my $th = PublicInbox::Thread->new(@$msgs);
-	$th->thread;
-	$th->order(*PublicInbox::Thread::sort_ts);
-	my $state = [ $srch, { root_anchor => 'dummy' }, undef, 0 ];
-	{
-		require PublicInbox::GitCatFile;
-		my $git = PublicInbox::GitCatFile->new($ctx->{git_dir});
-		thread_entry(\$rv, $git, $state, $_, 0) for $th->rootset;
-	}
-	my $final_anchor = $state->[3];
-	my $next = "<a\nid=\"s$final_anchor\">end of thread</a>\n";
-
-	$rv .= "<hr />" . PRE_WRAP . $next . $foot . "</pre>";
-}
-
 # only private functions below.
 
 sub index_walk {
@@ -560,12 +533,10 @@ sub simple_dump {
 
 sub thread_followups {
 	my ($dst, $root, $res) = @_;
-	my $msgs = load_results($res);
-	require PublicInbox::Thread;
 	$root->header_set('X-PI-TS', '0');
-	my $th = PublicInbox::Thread->new($root, @$msgs);
-	$th->thread;
-	$th->order(*PublicInbox::Thread::sort_ts);
+	my $msgs = load_results($res);
+	push @$msgs, $root;
+	my $th = thread_results($msgs);
 	my $srch = $res->{srch};
 	my $subj = $srch->subject_path($root->header('Subject'));
 	my %seen = ($subj => 1);
@@ -618,4 +589,13 @@ sub msg_timestamp {
 	defined($ts) ? $ts : 0;
 }
 
+sub thread_results {
+	my ($msgs) = @_;
+	require PublicInbox::Thread;
+	my $th = PublicInbox::Thread->new(@$msgs);
+	$th->thread;
+	$th->order(*PublicInbox::Thread::sort_ts);
+	$th
+}
+
 1;
diff --git a/lib/PublicInbox/WWW.pm b/lib/PublicInbox/WWW.pm
index e7c28d74..b0c13486 100644
--- a/lib/PublicInbox/WWW.pm
+++ b/lib/PublicInbox/WWW.pm
@@ -53,11 +53,6 @@ sub run {
 	} elsif ($path_info =~ m!$LISTNAME_RE/t/(\S+)\.html\z!o) {
 		invalid_list_mid(\%ctx, $1, $2) || get_thread(\%ctx, $cgi);
 
-	# subject_path display
-	} elsif ($path_info =~ m!$LISTNAME_RE/s/(\S+)\.html\z!o) {
-		my $sp = $2;
-		invalid_list(\%ctx, $1) || get_subject_path(\%ctx, $cgi, $sp);
-
 	} elsif ($path_info =~ m!$LISTNAME_RE/f/\S+\.txt\z!o) {
 		invalid_list_mid(\%ctx, $1, $2) ||
 			redirect_mid_txt(\%ctx, $cgi);
@@ -202,19 +197,6 @@ sub get_thread {
 	  [ $body ] ];
 }
 
-# /$LISTNAME/s/$SUBJECT_PATH.html
-sub get_subject_path {
-	my ($ctx, $cgi, $sp) = @_;
-	$ctx->{subject_path} = $sp;
-	my $srch = searcher($ctx) or return need_search($ctx);
-	require PublicInbox::View;
-	my $foot = footer($ctx);
-	my $body = PublicInbox::View->subject_path_html($ctx, $foot, $srch) or
-		return r404();
-	[ 200, [ 'Content-Type' => 'text/html; charset=UTF-8' ],
-	  [ $body ] ];
-}
-
 sub self_url {
 	my ($cgi) = @_;
 	ref($cgi) eq 'CGI' ? $cgi->self_url : $cgi->uri->as_string;
-- 
cgit v1.2.3-24-ge0c7