Divide projects list and project search results into pages of
$page_size (currently 100) elements. Pagination links look
like shown below:
first prev 1 2 3 *4* 5 6 next last
where *4* denotes current page, is in bold, and isn't a link.
This would need to be improved for extremely large number of projects
(repositories), where number of projects divided by page size is very
large.
Currently pagination interacts with sorting in a bit strange way.
When clicking on "sort by" link when on some later page the result is
not this page sorted, by given page of sorted output. Perhaps "sort
by" links should always show first page...
git_project_list_body() subroutine takes care to fill field (key) we
sort by for all projects, sort by given ordering, and fill the rest of
project info only for projects shown.
NOTE: currently code is not optimal, as it contains a few unnecessary
array copying, or array fragment copying.
Signed-off-by: Jakub Narebski <jnareb@xxxxxxxxx>
---
This patch depends on earlier "gitweb: Project search", but conceptually
they are independent; probably fill_project_list_info() improvement to
do partial filling should be in seaparet commit...
gitweb/gitweb.perl | 57 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 51 insertions(+), 6 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 7e1a9b4..716f7ad 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -3709,10 +3709,10 @@ sub print_sort_th_num {
sub git_project_list_body {
my ($projlist, $order, $from, $to, $extra, $no_header) = @_;
+ $order ||= $default_projects_order;
my ($check_forks) = gitweb_check_feature('forks');
- my @projects = fill_project_list_info($projlist, $check_forks);
+ my @projects = fill_project_list_info($projlist, $check_forks, $order);
- $order ||= $default_projects_order;
$from = 0 unless defined $from;
$to = $#projects if (!defined $to || $#projects < $to);
@@ -3733,9 +3733,10 @@ sub git_project_list_body {
print "<th></th>\n" . # for links
"</tr>\n";
}
+ @projects = @projects[$from..$to];
+ @projects = fill_project_list_info(\@projects, $check_forks);
my $alternate = 1;
- for (my $i = $from; $i <= $to; $i++) {
- my $pr = $projects[$i];
+ foreach my $pr (@projects) {
if ($alternate) {
print "<tr class=\"dark\">\n";
} else {
@@ -4066,6 +4067,46 @@ sub git_project_list {
die_error(undef, "No projects found");
}
+ my $page_size = 100;
+ # +1 for incomplete page (not having $page_size items)
+ my $npages = int(@list / $page_size)+((@list % $page_size) > 0);
+ # pages are numbered 0..$npages-1
+ $page = 0 if (!defined $page || $page < 0);
+ $page = $npages-1 if ($page >= $npages);
+ my $paging_nav;
+
+ if ($npages > 1) {
+ my @paging = ();
+ push @paging, $cgi->a({-href => href(-replay=>1, page=>0)},
+ "first");
+ if ($page > 0) {
+ push @paging, $cgi->a({-href => href(-replay=>1, page=>$page-1),
+ -accesskey => "p", -title => "Alt-p"},
+ "prev");
+ } else {
+ push @paging, "prev";
+ }
+ for (my $pg = 0; $pg < $npages; $pg++) {
+ # links to individual pages are numbered 1..$npages
+ if ($page == $pg) {
+ push @paging, '<b>'.($pg+1).'</b>';
+ } else {
+ push @paging, $cgi->a({-href => href(-replay=>1, page=>$pg)},
+ $pg+1);
+ }
+ }
+ if ($page < $npages-1) {
+ push @paging, $cgi->a({-href => href(-replay=>1, page=>$page+1),
+ -accesskey => "n", -title => "Alt-n"},
+ "next");
+ } else {
+ push @paging, "next";
+ }
+ push @paging, $cgi->a({-href => href(-replay=>1, page=>$npages-1)},
+ "last");
+ $paging_nav = join(' ⋅ ', @paging);
+ }
+
git_header_html();
if (-f $home_text) {
print "<div class=\"index_include\">\n";
@@ -4081,10 +4122,14 @@ sub git_project_list {
if (defined $searchtype) {
filter_project_list(\@list, $searchtype, $search_regexp)
unless ($searchtype eq 'list_all');
- git_project_list_body(\@list, $order);
+ git_project_list_body(\@list, $order,
+ $page*$page_size, ($page+1)*$page_size - 1,
+ $paging_nav);
}
} else {
- git_project_list_body(\@list, $order);
+ git_project_list_body(\@list, $order,
+ $page*$page_size, ($page+1)*$page_size - 1,
+ $paging_nav);
}
git_footer_html();
}
--
1.5.5
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
