From f74b64dbe75226b996367a6049ebd00a3e39ba49 Mon Sep 17 00:00:00 2001
From: Eric Wong <e@80x24.org>
Date: Sat, 7 Jan 2017 01:44:52 +0000
Subject: [PATCH] search: remove subject_summary
Apparently it never actually got used, and the world seems
fine without it, so we can drop it.
While we're at it, consider removing our subject_path
usage from existence, too. We are not using fancy subject-line
based URLs, here.
---
lib/PublicInbox/Search.pm | 27 +--------------------------
lib/PublicInbox/SearchMsg.pm | 1 +
t/search.t | 17 -----------------
3 files changed, 2 insertions(+), 43 deletions(-)
diff --git a/lib/PublicInbox/Search.pm b/lib/PublicInbox/Search.pm
index 86354b57..a1bae419 100644
--- a/lib/PublicInbox/Search.pm
+++ b/lib/PublicInbox/Search.pm
@@ -326,6 +326,7 @@ sub find_doc_ids_for_term {
}
# normalize subjects so they are suitable as pathnames for URLs
+# XXX: consider for removal
sub subject_path {
my $subj = pop;
$subj = subject_normalized($subj);
@@ -343,32 +344,6 @@ sub subject_normalized {
$subj;
}
-# for doc data
-sub subject_summary {
- my $subj = pop;
- my $max = 68;
- if (length($subj) > $max) {
- my @subj = split(/\s+/, $subj);
- $subj = '';
- my $l;
-
- while ($l = shift @subj) {
- my $new = $subj . $l . ' ';
- last if length($new) >= $max;
- $subj = $new;
- }
- if ($subj ne '') {
- my $r = scalar @subj ? ' ...' : '';
- $subj =~ s/ \z/$r/s;
- } else {
- # subject has one REALLY long word, and NOT spam? wtf
- @subj = ($l =~ /\A(.{1,72})/);
- $subj = $subj[0] . ' ...';
- }
- }
- $subj;
-}
-
sub enquire {
my ($self) = @_;
$self->{enquire} ||= Search::Xapian::Enquire->new($self->{xdb});
diff --git a/lib/PublicInbox/SearchMsg.pm b/lib/PublicInbox/SearchMsg.pm
index 5bb00778..b8eee665 100644
--- a/lib/PublicInbox/SearchMsg.pm
+++ b/lib/PublicInbox/SearchMsg.pm
@@ -155,6 +155,7 @@ sub thread_id {
$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};
diff --git a/t/search.t b/t/search.t
index c16811d8..c9c4e346 100644
--- a/t/search.t
+++ b/t/search.t
@@ -15,23 +15,6 @@ is(0, system(qw(git init -q --bare), $git_dir), "git init (main)");
eval { PublicInbox::Search->new($git_dir) };
ok($@, "exception raised on non-existent DB");
-{
- my $orig = "FOO " x 30;
- my $summ = PublicInbox::Search::subject_summary($orig);
-
- $summ = length($summ);
- $orig = length($orig);
- ok($summ < $orig && $summ > 0, "summary shortened ($orig => $summ)");
-
- $orig = "FOO" x 30;
- $summ = PublicInbox::Search::subject_summary($orig);
-
- $summ = length($summ);
- $orig = length($orig);
- ok($summ < $orig && $summ > 0,
- "summary shortened but not empty: $summ");
-}
-
my $rw = PublicInbox::SearchIdx->new($git_dir, 1);
$rw->_xdb_acquire;
$rw->_xdb_release;
--
2.51.0