diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/VNDB/DB/Discussions.pm | 22 | ||||
-rw-r--r-- | lib/VNDB/Handler/Discussions.pm | 16 |
2 files changed, 33 insertions, 5 deletions
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; } diff --git a/lib/VNDB/Handler/Discussions.pm b/lib/VNDB/Handler/Discussions.pm index 27548baf..0362dce3 100644 --- a/lib/VNDB/Handler/Discussions.pm +++ b/lib/VNDB/Handler/Discussions.pm @@ -415,7 +415,7 @@ sub search { # TODO: Allow or-matching too. But what syntax? (my $ts = $frm->{bq}) =~ y{+|&:*()="';!?$%^\\[]{}<>~` }{ }s; $ts =~ s/ / & /g; - $ts =~ y/-/!/; + $ts =~ s/(^| )-([^ ]+)/ !$1 /; ($l, $np) = $self->dbPostGet( keys %boards ? ( type => [keys %boards] ) : (), search => $ts, @@ -424,6 +424,13 @@ sub search { hide => 1, what => 'thread user', sort => 'date', reverse => 1, + headline => { + # HACK: The bbcodes are stripped from the original messages when + # creating the headline, so they are guaranteed not to show up in the + # message. This means we can re-use them for highlighting without + # worrying that they conflict with the message contents. + MaxFragments => 2, MinWords => 15, MaxWords => 40, StartSel => '[raw]', StopSel => '[/raw]', FragmentDelimiter => '[code]', + }, ); } @@ -460,9 +467,12 @@ sub search { div class => 'title'; a href => $link, $l->{title}; end; - # TODO: ts_headline() or something like it. + my $h = xml_escape $l->{headline}; + $h =~ s/\[raw\]/<b class="standout">/g; + $h =~ s/\[\/raw\]/<\/b>/g; + $h =~ s/\[code\]/<b class="grayedout">...<\/b><br \/>/g; div class => 'thread'; - lit bb2html($l->{msg}, 300); + lit $h; end; end; end; |