undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gitweb: Separate search regexp from search text

Browse Source 
Separate search text, which is saved in $searchtext global variable,
and is used in links, as default value for the textfield in search
form, and for pickaxe search, from search regexp, which is saved in
$search_regexp global variable, and is used as parameter to --grep,
--committer or --author options to git-rev-list, and for searching
commit body in gitweb.  For now $search_regexp is unconditionallt
equal to quotemeta($searchtext), meaning that we always search for
fixed string.

This fixes bug where 'next page' links for 'search' view didn't work
for searchtext containing quotable characters, like `@'.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Jakub Narebski 2007-05-16 01:56:10 +02:00 committed by Junio C Hamano
parent b211c320eb
commit 7e431ef9ab
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gitweb/gitweb.perl
View File

@ -365,6 +365,7 @@ if (defined $page) {
} }
our $searchtext = $cgi->param('s'); our $searchtext = $cgi->param('s');
our $search_regexp;
if (defined $searchtext) { if (defined $searchtext) {
if ($searchtext =~ m/[^a-zA-Z0-9_\.\/\-\+\:\@ ]/) { if ($searchtext =~ m/[^a-zA-Z0-9_\.\/\-\+\:\@ ]/) {
die_error(undef, "Invalid search parameter"); die_error(undef, "Invalid search parameter");
@ -372,7 +373,7 @@ if (defined $searchtext) {
if (length($searchtext) < 2) { if (length($searchtext) < 2) {
die_error(undef, "At least two characters are required for search parameter"); die_error(undef, "At least two characters are required for search parameter");
} }
$searchtext = quotemeta $searchtext; $search_regexp = quotemeta $searchtext;
} }
our $searchtype = $cgi->param('st'); our $searchtype = $cgi->param('st');
@ -3244,7 +3245,7 @@ sub git_search_grep_body {
esc_html(chop_str($co{'title'}, 50)) . "<br/>"); esc_html(chop_str($co{'title'}, 50)) . "<br/>");
my $comment = $co{'comment'}; my $comment = $co{'comment'};
foreach my $line (@$comment) { foreach my $line (@$comment) {
if ($line =~ m/^(.*)($searchtext)(.*)$/i) { if ($line =~ m/^(.*)($search_regexp)(.*)$/i) {
my $lead = esc_html($1) || ""; my $lead = esc_html($1) || "";
$lead = chop_str($lead, 30, 10); $lead = chop_str($lead, 30, 10);
my $match = esc_html($2) || ""; my $match = esc_html($2) || "";
@ -4626,7 +4627,7 @@ sub git_search {
} elsif ($searchtype eq 'committer') { } elsif ($searchtype eq 'committer') {
$greptype = "--committer="; $greptype = "--committer=";
} }
$greptype .= $searchtext; $greptype .= $search_regexp;
my @commitlist = parse_commits($hash, 101, (100 * $page), $greptype); my @commitlist = parse_commits($hash, 101, (100 * $page), $greptype);
my $paging_nav = ''; my $paging_nav = '';