X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FSearchView.pm;h=4fbf59ef2ca080d22db624c393d0db1dcc9084d6;hb=87678710135973f72722258e171fc00f85c86ec8;hp=9723306943f1d3433a35761cd7cf7b95a22a0436;hpb=d4cb7fb06031435cd25f5e000bf9c0e4b8b30177;p=public-inbox.git
diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm
index 97233069..4fbf59ef 100644
--- a/lib/PublicInbox/SearchView.pm
+++ b/lib/PublicInbox/SearchView.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2019 all contributors
+# Copyright (C) 2015-2020 all contributors
# License: AGPL-3.0+
#
# Displays search results for the web interface
@@ -6,8 +6,8 @@ package PublicInbox::SearchView;
use strict;
use warnings;
use URI::Escape qw(uri_unescape uri_escape);
-use PublicInbox::SearchMsg;
-use PublicInbox::Hval qw/ascii_html obfuscate_addrs/;
+use PublicInbox::Smsg;
+use PublicInbox::Hval qw(ascii_html obfuscate_addrs mid_href);
use PublicInbox::View;
use PublicInbox::WwwAtomStream;
use PublicInbox::SearchThread;
@@ -100,7 +100,7 @@ sub mset_summary {
foreach my $m ($mset->items) {
my $rank = sprintf("%${pad}d", $m->get_rank + 1);
my $pct = get_pct($m);
- my $smsg = PublicInbox::SearchMsg::from_mitem($m, $srch);
+ my $smsg = PublicInbox::Smsg::from_mitem($m, $srch);
unless ($smsg) {
eval {
$m = "$m ".$m->get_docid . " expired\n";
@@ -108,14 +108,14 @@ sub mset_summary {
};
next;
}
- my $s = ascii_html($smsg->subject);
- my $f = ascii_html($smsg->from_name);
+ my $s = ascii_html($smsg->{subject});
+ my $f = ascii_html($smsg->{from_name});
if ($obfs_ibx) {
obfuscate_addrs($obfs_ibx, $s);
obfuscate_addrs($obfs_ibx, $f);
}
- my $date = PublicInbox::View::fmt_ts($smsg->ds);
- my $mid = PublicInbox::Hval->new_msgid($smsg->mid)->{href};
+ my $date = PublicInbox::View::fmt_ts($smsg->{ds});
+ my $mid = mid_href($smsg->{mid});
$s = '(no subject)' if $s eq '';
$$res .= qq{$rank. }.
$s . "\n";
@@ -260,7 +260,7 @@ sub load_msgs {
my ($mset) = @_;
[ map {
my $mi = $_;
- my $smsg = PublicInbox::SearchMsg::from_mitem($mi);
+ my $smsg = PublicInbox::Smsg::from_mitem($mi);
$smsg->{pct} = get_pct($mi);
$smsg;
} ($mset->items) ]
@@ -268,7 +268,8 @@ sub load_msgs {
sub mset_thread {
my ($ctx, $mset, $q) = @_;
- my $msgs = $ctx->{-inbox}->search->retry_reopen(\&load_msgs, $mset);
+ my $ibx = $ctx->{-inbox};
+ my $msgs = $ibx->search->retry_reopen(\&load_msgs, $mset);
my $r = $q->{r};
my $rootset = PublicInbox::SearchThread::thread($msgs,
$r ? \&sort_relevance : \&PublicInbox::View::sort_ds,
@@ -285,7 +286,7 @@ sub mset_thread {
$ctx->{s_nr} = scalar(@$msgs).'+ results';
# reduce hash lookups in skel_dump
- $ctx->{-obfuscate} = $ctx->{-inbox}->{obfuscate};
+ $ctx->{-obfs_ibx} = $ibx->{obfuscate} ? $ibx : undef;
PublicInbox::View::walk_thread($rootset, $ctx,
\&PublicInbox::View::pre_thread);
@@ -337,7 +338,7 @@ sub adump_i {
my ($ctx) = @_;
while (my $mi = shift @{$ctx->{items}}) {
my $smsg = eval {
- PublicInbox::SearchMsg::from_mitem($mi, $ctx->{srch});
+ PublicInbox::Smsg::from_mitem($mi, $ctx->{srch});
} or next;
$ctx->{-inbox}->smsg_mime($smsg) and return $smsg;
}
@@ -365,14 +366,10 @@ sub new {
}
sub qs_html {
- my ($self, %over) = @_;
+ my ($self, %override) = @_;
- if (keys %over) {
- my $tmp = bless { %$self }, ref($self);
- foreach my $k (keys %over) {
- $tmp->{$k} = $over{$k};
- }
- $self = $tmp;
+ if (scalar(keys(%override))) {
+ $self = bless { (%$self, %override) }, ref($self);
}
my $q = uri_escape($self->{'q'}, MID_ESC);