From 931fc6d1e4986a4566647dda16af09bf69a28b89 Mon Sep 17 00:00:00 2001 From: Lars Hjemli Date: Sun, 13 Apr 2008 10:57:11 +0200 Subject: More layout fixes Signed-off-by: Lars Hjemli --- ui-repolist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ui-repolist.c') diff --git a/ui-repolist.c b/ui-repolist.c index eeeaf3d..9eba222 100644 --- a/ui-repolist.c +++ b/ui-repolist.c @@ -70,7 +70,7 @@ void cgit_print_repolist() "Owner" "Idle"); if (ctx.cfg.enable_index_links) - html("Links"); + html("Links"); html("\n"); for (i=0; i Date: Sun, 13 Apr 2008 11:57:10 +0200 Subject: Implement minimal freetext search in the repolist This makes the repolist much more usable when there's a lot of repositories registered in cgitrc. Signed-off-by: Lars Hjemli --- ui-repolist.c | 49 +++++++++++++++++++++++++++++++++++++------------ ui-shared.c | 11 ++++++++++- 2 files changed, 47 insertions(+), 13 deletions(-) (limited to 'ui-repolist.c') diff --git a/ui-repolist.c b/ui-repolist.c index 9eba222..a7de453 100644 --- a/ui-repolist.c +++ b/ui-repolist.c @@ -44,20 +44,23 @@ static void print_modtime(struct cgit_repo *repo) cgit_print_age(s.st_mtime, -1, NULL); } -void cgit_print_repolist() +int is_match(struct cgit_repo *repo) { - int i, columns = 4; - char *last_group = NULL; - - if (ctx.cfg.enable_index_links) - columns++; - - ctx.page.title = ctx.cfg.root_title; - cgit_print_http_headers(&ctx); - cgit_print_docstart(&ctx); - cgit_print_pageheader(&ctx); + if (!ctx.qry.search) + return 1; + if (repo->url && strstr(repo->url, ctx.qry.search)) + return 1; + if (repo->name && strstr(repo->name, ctx.qry.search)) + return 1; + if (repo->desc && strstr(repo->desc, ctx.qry.search)) + return 1; + if (repo->owner && strstr(repo->owner, ctx.qry.search)) + return 1; + return 0; +} - html(""); +void print_header(int columns) +{ if (ctx.cfg.index_header) { htmlf(""); html("\n"); +} +void cgit_print_repolist() +{ + int i, columns = 4, hits = 0, header = 0; + char *last_group = NULL; + + if (ctx.cfg.enable_index_links) + columns++; + + ctx.page.title = ctx.cfg.root_title; + cgit_print_http_headers(&ctx); + cgit_print_docstart(&ctx); + cgit_print_pageheader(&ctx); + + html("
", columns); @@ -72,9 +75,29 @@ void cgit_print_repolist() if (ctx.cfg.enable_index_links) html("Links
"); for (i=0; igroup != NULL) || (last_group != NULL && ctx.repo->group == NULL) || (last_group != NULL && ctx.repo->group != NULL && @@ -110,5 +133,7 @@ void cgit_print_repolist() html("\n"); } html("
"); + if (!hits) + cgit_print_error("No repositories found"); cgit_print_docend(); } diff --git a/ui-shared.c b/ui-shared.c index 782caa7..6253a90 100644 --- a/ui-shared.c +++ b/ui-shared.c @@ -555,7 +555,7 @@ void cgit_print_pageheader(struct cgit_context *ctx) html_option("author", "author", ctx->qry.grep); html_option("committer", "committer", ctx->qry.grep); html("\n"); - html("\n"); html("\n"); @@ -564,6 +564,15 @@ void cgit_print_pageheader(struct cgit_context *ctx) html("index\n"); + html(""); + html("
\n"); + html("\n"); + html("\n"); + html("
"); } html("\n"); html("
"); -- cgit v1.2.3-56-ge451 From 28d781f34b2c2d4c2b994ef3953d1cf37d8f28f0 Mon Sep 17 00:00:00 2001 From: Lars Hjemli Date: Sun, 13 Apr 2008 12:42:27 +0200 Subject: Make repository search case insensitive This reuses the strcasestr() compiled or linked by libgit.a to implement a case insensitive variation of the repository search. Signed-off-by: Lars Hjemli --- cgit.h | 7 +++++++ ui-repolist.c | 8 ++++---- 2 files changed, 11 insertions(+), 4 deletions(-) (limited to 'ui-repolist.c') diff --git a/cgit.h b/cgit.h index ee8c716..a3b6535 100644 --- a/cgit.h +++ b/cgit.h @@ -221,4 +221,11 @@ extern const char *cgit_repobasename(const char *reponame); extern int cgit_parse_snapshots_mask(const char *str); +/* libgit.a either links against or compiles its own implementation of + * strcasestr(), and we'd like to reuse it. Simply re-declaring it + * seems to do the trick. + */ +extern char *strcasestr(const char *haystack, const char *needle); + + #endif /* CGIT_H */ diff --git a/ui-repolist.c b/ui-repolist.c index a7de453..7a7e95a 100644 --- a/ui-repolist.c +++ b/ui-repolist.c @@ -48,13 +48,13 @@ int is_match(struct cgit_repo *repo) { if (!ctx.qry.search) return 1; - if (repo->url && strstr(repo->url, ctx.qry.search)) + if (repo->url && strcasestr(repo->url, ctx.qry.search)) return 1; - if (repo->name && strstr(repo->name, ctx.qry.search)) + if (repo->name && strcasestr(repo->name, ctx.qry.search)) return 1; - if (repo->desc && strstr(repo->desc, ctx.qry.search)) + if (repo->desc && strcasestr(repo->desc, ctx.qry.search)) return 1; - if (repo->owner && strstr(repo->owner, ctx.qry.search)) + if (repo->owner && strcasestr(repo->owner, ctx.qry.search)) return 1; return 0; } -- cgit v1.2.3-56-ge451