From f51c7276fc65c2d1d46d3c8f915fb1e1412693e8 Mon Sep 17 00:00:00 2001 From: Yorhel Date: Mon, 7 Sep 2015 13:58:01 +0200 Subject: Handler::Discussions: Use ts_headline() to format search results And also fix strip_bb_tags() to be case-insensitive and fix a bug in converting the query into a tsquery. --- lib/VNDB/DB/Discussions.pm | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) (limited to 'lib/VNDB/DB') diff --git a/lib/VNDB/DB/Discussions.pm b/lib/VNDB/DB/Discussions.pm index 723170e2..a85205f2 100644 --- a/lib/VNDB/DB/Discussions.pm +++ b/lib/VNDB/DB/Discussions.pm @@ -193,9 +193,10 @@ sub dbPostGet { ); my @select = ( - qw|tp.num tp.msg tp.hidden|, q|extract('epoch' from tp.date) as date|, q|extract('epoch' from tp.edited) as edited|, + qw|tp.tid tp.num tp.hidden|, q|extract('epoch' from tp.date) as date|, q|extract('epoch' from tp.edited) as edited|, + $o{search} ? () : 'tp.msg', $o{what} =~ /user/ ? qw|tp.uid u.username| : (), - $o{what} =~ /thread/ ? (qw|tp.tid t.title|, 't.hidden AS thread_hidden') : (), + $o{what} =~ /thread/ ? ('t.title', 't.hidden AS thread_hidden') : (), ); my @join = ( $o{what} =~ /user/ ? 'JOIN users u ON u.id = tp.uid' : (), @@ -216,6 +217,23 @@ sub dbPostGet { join(', ', @select), join(' ', @join), \%where, $order ); + # Get headlines in a separate query + if($o{search} && $#$r) { + my %r = map { + ($r->[$_]{tid}.'.'.$r->[$_]{num}, $_) + } 0..$#$r; + my $where = join ' or ', ('(tid = ? and num = ?)')x@$r; + my @where = map +($_->{tid},$_->{num}), @$r; + my $h = join ',', map "$_=$o{headline}{$_}", $o{headline} ? keys %{$o{headline}} : (); + + $r->[$r{$_->{tid}.'.'.$_->{num}}]{headline} = $_->{headline} for (@{$self->dbAll(qq| + SELECT tid, num, ts_headline('english', strip_bb_tags(strip_spoilers(msg)), to_tsquery(?), ?) as headline + FROM threads_posts + WHERE $where|, + $o{search}, $h, @where + )}); + } + return wantarray ? ($r, $np) : $r; } -- cgit v1.2.3