author | Lars Hjemli <hjemli@gmail.com> | 2006-12-28 01:45:28 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2006-12-28 01:45:28 (UTC) |
commit | 732d68d240b95dc428c92fc94bce9adb8912094e (patch) (unidiff) | |
tree | 24c6ab907c2a8574da12e426144706ad63780868 /cgit.c | |
parent | e39d738c39d37cdef115c145027f3eec85a62272 (diff) | |
download | cgit-732d68d240b95dc428c92fc94bce9adb8912094e.zip cgit-732d68d240b95dc428c92fc94bce9adb8912094e.tar.gz cgit-732d68d240b95dc428c92fc94bce9adb8912094e.tar.bz2 |
Add basic log filtering
This enables case-insensitive grep on logentris using the new search box
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.c | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -1,80 +1,83 @@ | |||
1 | /* cgit.c: cgi for the git scm | 1 | /* cgit.c: cgi for the git scm |
2 | * | 2 | * |
3 | * Copyright (C) 2006 Lars Hjemli | 3 | * Copyright (C) 2006 Lars Hjemli |
4 | * | 4 | * |
5 | * Licensed under GNU General Public License v2 | 5 | * Licensed under GNU General Public License v2 |
6 | * (see COPYING for full license text) | 6 | * (see COPYING for full license text) |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include "cgit.h" | 9 | #include "cgit.h" |
10 | 10 | ||
11 | const char cgit_version[] = CGIT_VERSION; | 11 | const char cgit_version[] = CGIT_VERSION; |
12 | 12 | ||
13 | static void cgit_print_repo_page(struct cacheitem *item) | 13 | static void cgit_print_repo_page(struct cacheitem *item) |
14 | { | 14 | { |
15 | if (chdir(fmt("%s/%s", cgit_root, cgit_query_repo)) || | 15 | if (chdir(fmt("%s/%s", cgit_root, cgit_query_repo)) || |
16 | cgit_read_config("info/cgit", cgit_repo_config_cb)) { | 16 | cgit_read_config("info/cgit", cgit_repo_config_cb)) { |
17 | char *title = fmt("%s - %s", cgit_root_title, "Bad request"); | 17 | char *title = fmt("%s - %s", cgit_root_title, "Bad request"); |
18 | cgit_print_docstart(title, item); | 18 | cgit_print_docstart(title, item); |
19 | cgit_print_pageheader(title, 0); | 19 | cgit_print_pageheader(title, 0); |
20 | cgit_print_error(fmt("Unable to scan repository: %s", | 20 | cgit_print_error(fmt("Unable to scan repository: %s", |
21 | strerror(errno))); | 21 | strerror(errno))); |
22 | cgit_print_docend(); | 22 | cgit_print_docend(); |
23 | return; | 23 | return; |
24 | } | 24 | } |
25 | setenv("GIT_DIR", fmt("%s/%s", cgit_root, cgit_query_repo), 1); | 25 | setenv("GIT_DIR", fmt("%s/%s", cgit_root, cgit_query_repo), 1); |
26 | char *title = fmt("%s - %s", cgit_repo_name, cgit_repo_desc); | 26 | char *title = fmt("%s - %s", cgit_repo_name, cgit_repo_desc); |
27 | int show_search = 0; | ||
28 | if (cgit_query_page && !strcmp(cgit_query_page, "log")) | ||
29 | show_search = 1; | ||
27 | cgit_print_docstart(title, item); | 30 | cgit_print_docstart(title, item); |
28 | cgit_print_pageheader(title, 0); | 31 | cgit_print_pageheader(title, show_search); |
29 | if (!cgit_query_page) { | 32 | if (!cgit_query_page) { |
30 | cgit_print_summary(); | 33 | cgit_print_summary(); |
31 | } else if (!strcmp(cgit_query_page, "log")) { | 34 | } else if (!strcmp(cgit_query_page, "log")) { |
32 | cgit_print_log(cgit_query_head, cgit_query_ofs, 100); | 35 | cgit_print_log(cgit_query_head, cgit_query_ofs, 100, cgit_query_search); |
33 | } else if (!strcmp(cgit_query_page, "tree")) { | 36 | } else if (!strcmp(cgit_query_page, "tree")) { |
34 | cgit_print_tree(cgit_query_sha1); | 37 | cgit_print_tree(cgit_query_sha1); |
35 | } else if (!strcmp(cgit_query_page, "commit")) { | 38 | } else if (!strcmp(cgit_query_page, "commit")) { |
36 | cgit_print_commit(cgit_query_sha1); | 39 | cgit_print_commit(cgit_query_sha1); |
37 | } else if (!strcmp(cgit_query_page, "view")) { | 40 | } else if (!strcmp(cgit_query_page, "view")) { |
38 | cgit_print_view(cgit_query_sha1); | 41 | cgit_print_view(cgit_query_sha1); |
39 | } else if (!strcmp(cgit_query_page, "diff")) { | 42 | } else if (!strcmp(cgit_query_page, "diff")) { |
40 | cgit_print_diff(cgit_query_sha1, cgit_query_sha2); | 43 | cgit_print_diff(cgit_query_sha1, cgit_query_sha2); |
41 | } | 44 | } |
42 | cgit_print_docend(); | 45 | cgit_print_docend(); |
43 | } | 46 | } |
44 | 47 | ||
45 | static void cgit_fill_cache(struct cacheitem *item) | 48 | static void cgit_fill_cache(struct cacheitem *item) |
46 | { | 49 | { |
47 | static char buf[PATH_MAX]; | 50 | static char buf[PATH_MAX]; |
48 | 51 | ||
49 | getcwd(buf, sizeof(buf)); | 52 | getcwd(buf, sizeof(buf)); |
50 | htmlfd = item->fd; | 53 | htmlfd = item->fd; |
51 | item->st.st_mtime = time(NULL); | 54 | item->st.st_mtime = time(NULL); |
52 | if (cgit_query_repo) | 55 | if (cgit_query_repo) |
53 | cgit_print_repo_page(item); | 56 | cgit_print_repo_page(item); |
54 | else | 57 | else |
55 | cgit_print_repolist(item); | 58 | cgit_print_repolist(item); |
56 | chdir(buf); | 59 | chdir(buf); |
57 | } | 60 | } |
58 | 61 | ||
59 | static void cgit_check_cache(struct cacheitem *item) | 62 | static void cgit_check_cache(struct cacheitem *item) |
60 | { | 63 | { |
61 | int i = 0; | 64 | int i = 0; |
62 | 65 | ||
63 | cache_prepare(item); | 66 | cache_prepare(item); |
64 | top: | 67 | top: |
65 | if (++i > cgit_max_lock_attempts) { | 68 | if (++i > cgit_max_lock_attempts) { |
66 | die("cgit_refresh_cache: unable to lock %s: %s", | 69 | die("cgit_refresh_cache: unable to lock %s: %s", |
67 | item->name, strerror(errno)); | 70 | item->name, strerror(errno)); |
68 | } | 71 | } |
69 | if (!cache_exist(item)) { | 72 | if (!cache_exist(item)) { |
70 | if (!cache_lock(item)) { | 73 | if (!cache_lock(item)) { |
71 | sleep(1); | 74 | sleep(1); |
72 | goto top; | 75 | goto top; |
73 | } | 76 | } |
74 | if (!cache_exist(item)) { | 77 | if (!cache_exist(item)) { |
75 | cgit_fill_cache(item); | 78 | cgit_fill_cache(item); |
76 | cache_unlock(item); | 79 | cache_unlock(item); |
77 | } else { | 80 | } else { |
78 | cache_cancel_lock(item); | 81 | cache_cancel_lock(item); |
79 | } | 82 | } |
80 | } else if (cache_expired(item) && cache_lock(item)) { | 83 | } else if (cache_expired(item) && cache_lock(item)) { |