[PATCH 3/5] gitweb: Highlight matched part of project name when searching projects
From: Jakub Narebski <hidden>
Date: 2016-06-15 22:52:56
Subsystem:
the rest · Maintainer:
Linus Torvalds
Use newly introduced esc_html_match_hl() to escape HTML and mark match with span element with 'match' class. Currently only 'path' part (i.e. project name) is highlighted; match might be on the project description. The code makes use of the fact that defined $search_regexp means that there was search going on. Signed-off-by: Jakub Narebski <redacted> --- Introducing esc_html_match_hl() could have been split into a separate commit, but it would be subroutine without any use. gitweb/gitweb.perl | 28 +++++++++++++++++++++++++++- 1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 95ca00f..aef15c8 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl@@ -1715,6 +1715,30 @@ sub chop_and_escape_str { } } +# highlight match (if any), and escape HTML +sub esc_html_match_hl { + my ($str, $regexp) = @_; + return esc_html($str) unless defined $regexp; + + my @matches; + while ($str =~ /$regexp/g) { + push @matches, [$-[0], $+[0]]; + } + return esc_html($str) unless @matches; + + my $out = ''; + my $pos = 0; + for my $m (@matches) { + $out .= esc_html(substr $str, $pos, $m->[0] - $pos); + $out .= $cgi->span({-class => 'match'}, + esc_html(substr $str, $m->[0], $m->[1] - $m->[0])); + $pos = $m->[1]; + } + $out .= esc_html(substr $str, $pos); + + return $out; +} + ## ---------------------------------------------------------------------- ## functions returning short strings
@@ -5342,7 +5366,9 @@ sub git_project_list_rows { print "</td>\n"; } print "<td>" . $cgi->a({-href => href(project=>$pr->{'path'}, action=>"summary"), - -class => "list"}, esc_html($pr->{'path'})) . "</td>\n" . + -class => "list"}, + esc_html_match_hl($pr->{'path'}, $search_regexp)) . + "</td>\n" . "<td>" . $cgi->a({-href => href(project=>$pr->{'path'}, action=>"summary"), -class => "list", -title => $pr->{'descr_long'}}, esc_html($pr->{'descr'})) . "</td>\n" .
--
1.7.9