From d0fb726671b98771b982000d408db14ad492c5e1 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Thu, 20 Aug 2015 02:30:29 +0000 Subject: index: simplify main landing page if search-enabled We can display /t/$MESSAGE_ID.html easily with a Xapian search index, so rely on it instead of trying to display messages inline. --- lib/PublicInbox/Search.pm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'lib/PublicInbox/Search.pm') diff --git a/lib/PublicInbox/Search.pm b/lib/PublicInbox/Search.pm index b9f283fb..c28401bc 100644 --- a/lib/PublicInbox/Search.pm +++ b/lib/PublicInbox/Search.pm @@ -492,14 +492,21 @@ sub merge_threads { # normalize subjects so they are suitable as pathnames for URLs sub subject_path { my $subj = pop; - - $subj =~ s/\A\s+//; - $subj =~ s/\s+\z//; - $subj =~ s/$REPLY_RE//igo; # remove reply prefix + $subj = subject_normalized($subj); $subj =~ s![^a-zA-Z0-9_\.~/\-]+!_!g; lc($subj); } +sub subject_normalized { + my $subj = pop; + $subj =~ s/\A\s+//s; # no leading space + $subj =~ s/\s+\z//s; # no trailing space + $subj =~ s/\s+/ /gs; # no redundant spaces + $subj =~ s/\.+\z//; # no trailing '.' + $subj =~ s/$REPLY_RE//igo; # remove reply prefix + $subj; +} + sub do_cat_mail { my ($git, $blob) = @_; my $mime = eval { -- cgit v1.2.3-24-ge0c7