Add simple pager to log page

Signed-off-by: Lars Hjemli <hjemli@gmail.com>

4 files changed, 37 insertions, 6 deletions

diff --git a/cgit.c b/cgit.c
index ada488b..d7e586d 100644
--- a/cgit.c
+++ b/cgit.c
@@ -24,17 +24,17 @@ static void cgit_print_repo_page(struct cacheitem *item)
 	}
 	setenv("GIT_DIR", fmt("%s/%s", cgit_root, cgit_query_repo), 1);
 	char *title = fmt("%s - %s", cgit_repo_name, cgit_repo_desc);
 	cgit_print_docstart(title, item);
 	cgit_print_pageheader(title);
 	if (!cgit_query_page) {
 		cgit_print_summary();
 	} else if (!strcmp(cgit_query_page, "log")) {
-		cgit_print_log(cgit_query_head, 0, 100);
+		cgit_print_log(cgit_query_head, cgit_query_ofs, 100);
 	} else if (!strcmp(cgit_query_page, "tree")) {
 		cgit_print_tree(cgit_query_sha1);
 	} else if (!strcmp(cgit_query_page, "view")) {
 		cgit_print_view(cgit_query_sha1);
 	}
 	cgit_print_docend();
 }
 
diff --git a/cgit.h b/cgit.h
index 2fdfab3..82e8681 100644
--- a/cgit.h
+++ b/cgit.h
@@ -39,16 +39,17 @@ extern char *cgit_repo_owner;
 extern int cgit_query_has_symref;
 extern int cgit_query_has_sha1;
 
 extern char *cgit_querystring;
 extern char *cgit_query_repo;
 extern char *cgit_query_page;
 extern char *cgit_query_head;
 extern char *cgit_query_sha1;
+extern int   cgit_query_ofs;
 
 extern int htmlfd;
 
 extern void cgit_global_config_cb(const char *name, const char *value);
 extern void cgit_repo_config_cb(const char *name, const char *value);
 extern void cgit_querystring_cb(const char *name, const char *value);
 
 extern char *fmt(const char *format,...);
diff --git a/shared.c b/shared.c
index c58a2ff..6b5cfc2 100644
--- a/shared.c
+++ b/shared.c
@@ -23,16 +23,17 @@ char *cgit_repo_owner   = NULL;
 int cgit_query_has_symref = 0;
 int cgit_query_has_sha1   = 0;
 
 char *cgit_querystring  = NULL;
 char *cgit_query_repo   = NULL;
 char *cgit_query_page   = NULL;
 char *cgit_query_head   = NULL;
 char *cgit_query_sha1   = NULL;
+int   cgit_query_ofs    = 0;
 
 int htmlfd = 0;
 
 void cgit_global_config_cb(const char *name, const char *value)
 {
 	if (!strcmp(name, "root"))
 		cgit_root = xstrdup(value);
 	else if (!strcmp(name, "root-title"))
@@ -54,21 +55,23 @@ void cgit_repo_config_cb(const char *name, const char *value)
 	else if (!strcmp(name, "desc"))
 		cgit_repo_desc = xstrdup(value);
 	else if (!strcmp(name, "owner"))
 		cgit_repo_owner = xstrdup(value);
 }
 
 void cgit_querystring_cb(const char *name, const char *value)
 {
-	if (!strcmp(name,"r"))
+	if (!strcmp(name,"r")) {
 		cgit_query_repo = xstrdup(value);
-	else if (!strcmp(name, "p"))
+	} else if (!strcmp(name, "p")) {
 		cgit_query_page = xstrdup(value);
-	else if (!strcmp(name, "h")) {
+	} else if (!strcmp(name, "h")) {
 		cgit_query_head = xstrdup(value);
 		cgit_query_has_symref = 1;
 	} else if (!strcmp(name, "id")) {
 		cgit_query_sha1 = xstrdup(value);
 		cgit_query_has_sha1 = 1;
+	} else if (!strcmp(name, "ofs")) {
+		cgit_query_ofs = atoi(value);
 	}
 }
 
diff --git a/ui-log.c b/ui-log.c
index 4d2c2e0..dce50f7 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -90,31 +90,58 @@ static void cgit_print_commit_shortlog(struct commit *commit)
 	html("</td></tr>\n");
 }
 
 void cgit_print_log(const char *tip, int ofs, int cnt)
 {
 	struct rev_info rev;
 	struct commit *commit;
 	const char *argv[2] = {NULL, tip};
-	int n = 0;
+	int i;
 	
 	init_revisions(&rev, NULL);
 	rev.abbrev = DEFAULT_ABBREV;
 	rev.commit_format = CMIT_FMT_DEFAULT;
 	rev.verbose_header = 1;
 	rev.show_root_diff = 0;
 	setup_revisions(2, argv, &rev, NULL);
 	prepare_revision_walk(&rev);
 
 	html("<h2>Log</h2>");
 	html("<table class='list'>");
 	html("<tr><th>Date</th><th>Message</th><th>Author</th><th>Link</th></tr>\n");
-	while ((commit = get_revision(&rev)) != NULL && n++ < 100) {
+
+	if (ofs<0)
+		ofs = 0;
+
+	for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) {
+		free(commit->buffer);
+		commit->buffer = NULL;
+		free_commit_list(commit->parents);
+		commit->parents = NULL;
+	}
+
+	for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) {
 		cgit_print_commit_shortlog(commit);
 		free(commit->buffer);
 		commit->buffer = NULL;
 		free_commit_list(commit->parents);
 		commit->parents = NULL;
 	}
 	html("</table>\n");
+
+	html("<div class='pager'>");
+	if (ofs > 0) {
+		html("&nbsp;<a href='");
+		html(cgit_pageurl(cgit_query_repo, cgit_query_page,
+				  fmt("h=%s&ofs=%d", tip, ofs-cnt)));
+		html("'>[prev]</a>&nbsp;");
+       	}
+
+	if ((commit = get_revision(&rev)) != NULL) {
+		html("&nbsp;<a href='");
+		html(cgit_pageurl(cgit_query_repo, "log",
+				  fmt("h=%s&ofs=%d", tip, ofs+cnt)));
+		html("'>[next]</a>&nbsp;");
+	}
+	html("</div>");
 }