From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 09/10] search: match the behavior of WWW for indexing text
Date: Fri, 9 Sep 2016 00:01:30 +0000 [thread overview]
Message-ID: <20160909000131.18584-10-e@80x24.org> (raw)
In-Reply-To: <20160909000131.18584-1-e@80x24.org>
The basic rule is that if it is displayable via our WWW
interface, it should be indexable text for Xapian search.
---
lib/PublicInbox/SearchIdx.pm | 21 ++++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
diff --git a/lib/PublicInbox/SearchIdx.pm b/lib/PublicInbox/SearchIdx.pm
index 0e2d225..fb68f4b 100644
--- a/lib/PublicInbox/SearchIdx.pm
+++ b/lib/PublicInbox/SearchIdx.pm
@@ -148,7 +148,6 @@ sub add_message {
my ($doc_id, $old_tid);
my $mid = mid_clean(mid_mime($mime));
- my $ct_msg = $mime->header('Content-Type') || 'text/plain';
eval {
die 'Message-ID too long' if length($mid) > MAX_MID_SIZE;
@@ -181,10 +180,22 @@ sub add_message {
msg_iter($mime, sub {
my ($part, $depth, @idx) = @{$_[0]};
- my $ct = $part->content_type || $ct_msg;
-
- # account for filter bugs...
- $ct =~ m!\btext/plain\b!i or return;
+ my $ct = $part->content_type || 'text/plain';
+
+ return if $ct =~ m!\btext/x?html\b!i;
+
+ my $s = eval { $part->body_str };
+ if ($@) {
+ if ($ct =~ m!\btext/plain\b!i) {
+ # Try to assume UTF-8 because Alpine
+ # seems to do wacky things and set
+ # charset=X-UNKNOWN
+ $part->charset_set('UTF-8');
+ $s = eval { $part->body_str };
+ $s = $part->body if $@;
+ }
+ }
+ defined $s or return;
my (@orig, @quot);
my $body = $part->body;
--
EW
next prev parent reply other threads:[~2016-09-09 0:01 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-09 0:01 [PATCH 0/10] search: more mairix prefix compatibility Eric Wong
2016-09-09 0:01 ` [PATCH 01/10] search: allow searching user fields (To/Cc/From) Eric Wong
2016-09-09 0:01 ` [PATCH 02/10] search: drop longer subject: prefix for search Eric Wong
2016-09-09 0:01 ` [PATCH 03/10] search: more granular message body searching Eric Wong
2016-09-09 0:01 ` [PATCH 04/10] search: fix space regressions from recent changes Eric Wong
2016-09-09 0:01 ` [PATCH 05/10] search: match quote detection behavior of view Eric Wong
2016-09-09 0:01 ` [PATCH 06/10] search: increase term positions for each quoted hunk Eric Wong
2016-09-09 0:01 ` [PATCH 07/10] search: fix compatibility with Debian wheezy Eric Wong
2016-09-09 0:01 ` [PATCH 08/10] search: avoid mindlessly calling body_set Eric Wong
2016-09-09 0:01 ` Eric Wong [this message]
2016-09-09 0:01 ` [PATCH 10/10] search: index attachment filenames Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160909000131.18584-10-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).