about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorLars Hjemli2008-04-13 11:57:10 +0200
committerLars Hjemli2008-04-13 12:10:03 +0200
commit536b0541fcfea2169e4df33043cd9ff14c657bce (patch)
treec27848059cd256541d79b01ab91fa07897a5da7d
parentMore layout fixes (diff)
downloadcgit-536b0541fcfea2169e4df33043cd9ff14c657bce.tar.gz
cgit-536b0541fcfea2169e4df33043cd9ff14c657bce.zip
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 <hjemli@gmail.com>
-rw-r--r--ui-repolist.c49
-rw-r--r--ui-shared.c11
2 files changed, 47 insertions, 13 deletions
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)
44 cgit_print_age(s.st_mtime, -1, NULL); 44 cgit_print_age(s.st_mtime, -1, NULL);
45} 45}
46 46
47void cgit_print_repolist() 47int is_match(struct cgit_repo *repo)
48{ 48{
49 int i, columns = 4; 49 if (!ctx.qry.search)
50 char *last_group = NULL; 50 return 1;
51 51 if (repo->url && strstr(repo->url, ctx.qry.search))
52 if (ctx.cfg.enable_index_links) 52 return 1;
53 columns++; 53 if (repo->name && strstr(repo->name, ctx.qry.search))
54 54 return 1;
55 ctx.page.title = ctx.cfg.root_title; 55 if (repo->desc && strstr(repo->desc, ctx.qry.search))
56 cgit_print_http_headers(&ctx); 56 return 1;
57 cgit_print_docstart(&ctx); 57 if (repo->owner && strstr(repo->owner, ctx.qry.search))
58 cgit_print_pageheader(&ctx); 58 return 1;
59 return 0;
60}
59 61
60 html("<table summary='repository list' class='list nowrap'>"); 62void print_header(int columns)
63{
61 if (ctx.cfg.index_header) { 64 if (ctx.cfg.index_header) {
62 htmlf("<tr class='nohover'><td colspan='%d' class='include-block'>", 65 htmlf("<tr class='nohover'><td colspan='%d' class='include-block'>",
63 columns); 66 columns);
@@ -72,9 +75,29 @@ void cgit_print_repolist()
72 if (ctx.cfg.enable_index_links) 75 if (ctx.cfg.enable_index_links)
73 html("<th class='left'>Links</th>"); 76 html("<th class='left'>Links</th>");
74 html("</tr>\n"); 77 html("</tr>\n");
78}
75 79
80void cgit_print_repolist()
81{
82 int i, columns = 4, hits = 0, header = 0;
83 char *last_group = NULL;
84
85 if (ctx.cfg.enable_index_links)
86 columns++;
87
88 ctx.page.title = ctx.cfg.root_title;
89 cgit_print_http_headers(&ctx);
90 cgit_print_docstart(&ctx);
91 cgit_print_pageheader(&ctx);
92
93 html("<table summary='repository list' class='list nowrap'>");
76 for (i=0; i<cgit_repolist.count; i++) { 94 for (i=0; i<cgit_repolist.count; i++) {
77 ctx.repo = &cgit_repolist.repos[i]; 95 ctx.repo = &cgit_repolist.repos[i];
96 if (!is_match(ctx.repo))
97 continue;
98 if (!header++)
99 print_header(columns);
100 hits++;
78 if ((last_group == NULL && ctx.repo->group != NULL) || 101 if ((last_group == NULL && ctx.repo->group != NULL) ||
79 (last_group != NULL && ctx.repo->group == NULL) || 102 (last_group != NULL && ctx.repo->group == NULL) ||
80 (last_group != NULL && ctx.repo->group != NULL && 103 (last_group != NULL && ctx.repo->group != NULL &&
@@ -110,5 +133,7 @@ void cgit_print_repolist()
110 html("</tr>\n"); 133 html("</tr>\n");
111 } 134 }
112 html("</table>"); 135 html("</table>");
136 if (!hits)
137 cgit_print_error("No repositories found");
113 cgit_print_docend(); 138 cgit_print_docend();
114} 139}
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)
555 html_option("author", "author", ctx->qry.grep); 555 html_option("author", "author", ctx->qry.grep);
556 html_option("committer", "committer", ctx->qry.grep); 556 html_option("committer", "committer", ctx->qry.grep);
557 html("</select>\n"); 557 html("</select>\n");
558 html("<input class='txt' type='text' size='8' name='q' value='"); 558 html("<input class='txt' type='text' size='10' name='q' value='");
559 html_attr(ctx->qry.search); 559 html_attr(ctx->qry.search);
560 html("'/>\n"); 560 html("'/>\n");
561 html("<input type='submit' value='search'/>\n"); 561 html("<input type='submit' value='search'/>\n");
@@ -564,6 +564,15 @@ void cgit_print_pageheader(struct cgit_context *ctx)
564 html("<a class='active' href='"); 564 html("<a class='active' href='");
565 html_attr(cgit_rooturl()); 565 html_attr(cgit_rooturl());
566 html("'>index</a>\n"); 566 html("'>index</a>\n");
567 html("</td><td class='form'>");
568 html("<form method='get' action='");
569 html_attr(cgit_rooturl());
570 html("'>\n");
571 html("<input type='text' name='q' size='10' value='");
572 html_attr(ctx->qry.search);
573 html("'/>\n");
574 html("<input type='submit' value='search'/>\n");
575 html("</form>");
567 } 576 }
568 html("</td></tr></table>\n"); 577 html("</td></tr></table>\n");
569 html("<div class='content'>"); 578 html("<div class='content'>");