author | Lars Hjemli <hjemli@gmail.com> | 2008-11-29 13:27:35 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-11-29 13:27:35 (UTC) |
commit | 54272e60965ec6a98b49cbf67d72a4b1f5adc55b (patch) (unidiff) | |
tree | 183bc1876d0c53b879627bb9fd66f2978d41929e | |
parent | f250c1ca2ea7f35d65f639e42e8b8f0657515e5d (diff) | |
download | cgit-54272e60965ec6a98b49cbf67d72a4b1f5adc55b.zip cgit-54272e60965ec6a98b49cbf67d72a4b1f5adc55b.tar.gz cgit-54272e60965ec6a98b49cbf67d72a4b1f5adc55b.tar.bz2 |
ui-repolist: sort null values last
When sorting on e.g. owner, it's not interesting to get all repos
without owner at the top of the list.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | ui-repolist.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui-repolist.c b/ui-repolist.c index 0de328b..cf27cb3 100644 --- a/ui-repolist.c +++ b/ui-repolist.c | |||
@@ -55,131 +55,131 @@ static void print_modtime(struct cgit_repo *repo) | |||
55 | } | 55 | } |
56 | 56 | ||
57 | int is_match(struct cgit_repo *repo) | 57 | int is_match(struct cgit_repo *repo) |
58 | { | 58 | { |
59 | if (!ctx.qry.search) | 59 | if (!ctx.qry.search) |
60 | return 1; | 60 | return 1; |
61 | if (repo->url && strcasestr(repo->url, ctx.qry.search)) | 61 | if (repo->url && strcasestr(repo->url, ctx.qry.search)) |
62 | return 1; | 62 | return 1; |
63 | if (repo->name && strcasestr(repo->name, ctx.qry.search)) | 63 | if (repo->name && strcasestr(repo->name, ctx.qry.search)) |
64 | return 1; | 64 | return 1; |
65 | if (repo->desc && strcasestr(repo->desc, ctx.qry.search)) | 65 | if (repo->desc && strcasestr(repo->desc, ctx.qry.search)) |
66 | return 1; | 66 | return 1; |
67 | if (repo->owner && strcasestr(repo->owner, ctx.qry.search)) | 67 | if (repo->owner && strcasestr(repo->owner, ctx.qry.search)) |
68 | return 1; | 68 | return 1; |
69 | return 0; | 69 | return 0; |
70 | } | 70 | } |
71 | 71 | ||
72 | int is_in_url(struct cgit_repo *repo) | 72 | int is_in_url(struct cgit_repo *repo) |
73 | { | 73 | { |
74 | if (!ctx.qry.url) | 74 | if (!ctx.qry.url) |
75 | return 1; | 75 | return 1; |
76 | if (repo->url && !prefixcmp(repo->url, ctx.qry.url)) | 76 | if (repo->url && !prefixcmp(repo->url, ctx.qry.url)) |
77 | return 1; | 77 | return 1; |
78 | return 0; | 78 | return 0; |
79 | } | 79 | } |
80 | 80 | ||
81 | void print_sort_header(const char *title, const char *sort) | 81 | void print_sort_header(const char *title, const char *sort) |
82 | { | 82 | { |
83 | htmlf("<th class='left'><a href='./?s=%s", sort); | 83 | htmlf("<th class='left'><a href='./?s=%s", sort); |
84 | if (ctx.qry.search) { | 84 | if (ctx.qry.search) { |
85 | html("&q="); | 85 | html("&q="); |
86 | html_url_arg(ctx.qry.search); | 86 | html_url_arg(ctx.qry.search); |
87 | } | 87 | } |
88 | htmlf("'>%s</a></th>", title); | 88 | htmlf("'>%s</a></th>", title); |
89 | } | 89 | } |
90 | 90 | ||
91 | void print_header(int columns) | 91 | void print_header(int columns) |
92 | { | 92 | { |
93 | html("<tr class='nohover'>"); | 93 | html("<tr class='nohover'>"); |
94 | print_sort_header("Name", "name"); | 94 | print_sort_header("Name", "name"); |
95 | print_sort_header("Description", "desc"); | 95 | print_sort_header("Description", "desc"); |
96 | print_sort_header("Owner", "owner"); | 96 | print_sort_header("Owner", "owner"); |
97 | print_sort_header("Idle", "idle"); | 97 | print_sort_header("Idle", "idle"); |
98 | if (ctx.cfg.enable_index_links) | 98 | if (ctx.cfg.enable_index_links) |
99 | html("<th class='left'>Links</th>"); | 99 | html("<th class='left'>Links</th>"); |
100 | html("</tr>\n"); | 100 | html("</tr>\n"); |
101 | } | 101 | } |
102 | 102 | ||
103 | 103 | ||
104 | void print_pager(int items, int pagelen, char *search) | 104 | void print_pager(int items, int pagelen, char *search) |
105 | { | 105 | { |
106 | int i; | 106 | int i; |
107 | html("<div class='pager'>"); | 107 | html("<div class='pager'>"); |
108 | for(i = 0; i * pagelen < items; i++) | 108 | for(i = 0; i * pagelen < items; i++) |
109 | cgit_index_link(fmt("[%d]", i+1), fmt("Page %d", i+1), NULL, | 109 | cgit_index_link(fmt("[%d]", i+1), fmt("Page %d", i+1), NULL, |
110 | search, i * pagelen); | 110 | search, i * pagelen); |
111 | html("</div>"); | 111 | html("</div>"); |
112 | } | 112 | } |
113 | 113 | ||
114 | static int cmp(const char *s1, const char *s2) | 114 | static int cmp(const char *s1, const char *s2) |
115 | { | 115 | { |
116 | if (s1 && s2) | 116 | if (s1 && s2) |
117 | return strcmp(s1, s2); | 117 | return strcmp(s1, s2); |
118 | if (s1 && !s2) | 118 | if (s1 && !s2) |
119 | return 1; | ||
120 | if (s2 && !s1) | ||
121 | return -1; | 119 | return -1; |
120 | if (s2 && !s1) | ||
121 | return 1; | ||
122 | return 0; | 122 | return 0; |
123 | } | 123 | } |
124 | 124 | ||
125 | static int sort_name(const void *a, const void *b) | 125 | static int sort_name(const void *a, const void *b) |
126 | { | 126 | { |
127 | const struct cgit_repo *r1 = a; | 127 | const struct cgit_repo *r1 = a; |
128 | const struct cgit_repo *r2 = b; | 128 | const struct cgit_repo *r2 = b; |
129 | 129 | ||
130 | return cmp(r1->name, r2->name); | 130 | return cmp(r1->name, r2->name); |
131 | } | 131 | } |
132 | 132 | ||
133 | static int sort_desc(const void *a, const void *b) | 133 | static int sort_desc(const void *a, const void *b) |
134 | { | 134 | { |
135 | const struct cgit_repo *r1 = a; | 135 | const struct cgit_repo *r1 = a; |
136 | const struct cgit_repo *r2 = b; | 136 | const struct cgit_repo *r2 = b; |
137 | 137 | ||
138 | return cmp(r1->desc, r2->desc); | 138 | return cmp(r1->desc, r2->desc); |
139 | } | 139 | } |
140 | 140 | ||
141 | static int sort_owner(const void *a, const void *b) | 141 | static int sort_owner(const void *a, const void *b) |
142 | { | 142 | { |
143 | const struct cgit_repo *r1 = a; | 143 | const struct cgit_repo *r1 = a; |
144 | const struct cgit_repo *r2 = b; | 144 | const struct cgit_repo *r2 = b; |
145 | 145 | ||
146 | return cmp(r1->owner, r2->owner); | 146 | return cmp(r1->owner, r2->owner); |
147 | } | 147 | } |
148 | 148 | ||
149 | static int sort_idle(const void *a, const void *b) | 149 | static int sort_idle(const void *a, const void *b) |
150 | { | 150 | { |
151 | const struct cgit_repo *r1 = a; | 151 | const struct cgit_repo *r1 = a; |
152 | const struct cgit_repo *r2 = b; | 152 | const struct cgit_repo *r2 = b; |
153 | time_t t1, t2; | 153 | time_t t1, t2; |
154 | 154 | ||
155 | t1 = t2 = 0; | 155 | t1 = t2 = 0; |
156 | get_repo_modtime(r1, &t1); | 156 | get_repo_modtime(r1, &t1); |
157 | get_repo_modtime(r2, &t2); | 157 | get_repo_modtime(r2, &t2); |
158 | return t2 - t1; | 158 | return t2 - t1; |
159 | } | 159 | } |
160 | 160 | ||
161 | struct sortcolumn { | 161 | struct sortcolumn { |
162 | const char *name; | 162 | const char *name; |
163 | int (*fn)(const void *a, const void *b); | 163 | int (*fn)(const void *a, const void *b); |
164 | }; | 164 | }; |
165 | 165 | ||
166 | struct sortcolumn sortcolumn[] = { | 166 | struct sortcolumn sortcolumn[] = { |
167 | {"name", sort_name}, | 167 | {"name", sort_name}, |
168 | {"desc", sort_desc}, | 168 | {"desc", sort_desc}, |
169 | {"owner", sort_owner}, | 169 | {"owner", sort_owner}, |
170 | {"idle", sort_idle}, | 170 | {"idle", sort_idle}, |
171 | {NULL, NULL} | 171 | {NULL, NULL} |
172 | }; | 172 | }; |
173 | 173 | ||
174 | int sort_repolist(char *field) | 174 | int sort_repolist(char *field) |
175 | { | 175 | { |
176 | struct sortcolumn *column; | 176 | struct sortcolumn *column; |
177 | 177 | ||
178 | for (column = &sortcolumn[0]; column->name; column++) { | 178 | for (column = &sortcolumn[0]; column->name; column++) { |
179 | if (strcmp(field, column->name)) | 179 | if (strcmp(field, column->name)) |
180 | continue; | 180 | continue; |
181 | qsort(cgit_repolist.repos, cgit_repolist.count, | 181 | qsort(cgit_repolist.repos, cgit_repolist.count, |
182 | sizeof(struct cgit_repo), column->fn); | 182 | sizeof(struct cgit_repo), column->fn); |
183 | return 1; | 183 | return 1; |
184 | } | 184 | } |
185 | return 0; | 185 | return 0; |