summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Petr Baudis <pasky@suse.cz>2008-10-03 09:29:45 +0200
committerLibravatar Shawn O. Pearce <spearce@spearce.org>2008-10-03 07:29:56 -0700
commit0d1d154dbe4d16a802c2e357de96e349f04d2f2c (patch)
treeced93eb652f3f9804d5488af74526a1cd87263b6
parentgitweb: Make the by_tag filter delve in forks as well (diff)
downloadtgif-0d1d154dbe4d16a802c2e357de96e349f04d2f2c.tar.xz
gitweb: Support for simple project search form
This is a trivial patch adding support for searching projects by name and description, making use of the "infrastructure" provided by the tag cloud generation. Signed-off-by: Petr Baudis <petr.baudis@novartis.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
-rw-r--r--gitweb/gitweb.css4
-rwxr-xr-xgitweb/gitweb.perl12
2 files changed, 14 insertions, 2 deletions
diff --git a/gitweb/gitweb.css b/gitweb/gitweb.css
index 07f5b53788..a01eac814e 100644
--- a/gitweb/gitweb.css
+++ b/gitweb/gitweb.css
@@ -435,6 +435,10 @@ div.search {
right: 12px
}
+p.projsearch {
+ text-align: center;
+}
+
td.linenr {
text-align: right;
}
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 99fdb13f1f..b46af77da0 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -3767,11 +3767,14 @@ sub git_project_list_body {
my $pr = $projects[$i];
next if $tagfilter and $show_ctags and not grep { lc $_ eq lc $tagfilter } keys %{$pr->{'ctags'}};
- # Weed out forks
+ next if $searchtext and not $pr->{'path'} =~ /$searchtext/
+ and not $pr->{'descr_long'} =~ /$searchtext/;
+ # Weed out forks or non-matching entries of search
if ($check_forks) {
my $forkbase = $project; $forkbase ||= ''; $forkbase =~ s#\.git$#/#;
$forkbase="^$forkbase" if $forkbase;
- next if not $tagfilter and $pr->{'path'} =~ m#$forkbase.*/.*#; # regexp-safe
+ next if not $searchtext and not $tagfilter and $show_ctags
+ and $pr->{'path'} =~ m#$forkbase.*/.*#; # regexp-safe
}
if ($alternate) {
@@ -4108,6 +4111,11 @@ sub git_project_list {
close $fd;
print "</div>\n";
}
+ print $cgi->startform(-method => "get") .
+ "<p class=\"projsearch\">Search:\n" .
+ $cgi->textfield(-name => "s", -value => $searchtext) . "\n" .
+ "</p>" .
+ $cgi->end_form() . "\n";
git_project_list_body(\@list, $order);
git_footer_html();
}