summaryrefslogtreecommitdiffabout
authorAaron Griffin <agriffin@datalogics.com>2010-02-05 00:08:16 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2010-03-22 22:46:00 (UTC)
commit80476b0d2873eb212fad38487fd6189bd6629cbe (patch) (unidiff)
treebdacb5527659ebb8296e95dfbe3ea5f74fe3a9ac
parent65ced7c00907af7e8bd5d239a4fa854a84535520 (diff)
downloadcgit-80476b0d2873eb212fad38487fd6189bd6629cbe.zip
cgit-80476b0d2873eb212fad38487fd6189bd6629cbe.tar.gz
cgit-80476b0d2873eb212fad38487fd6189bd6629cbe.tar.bz2
Add 'max-atom-items' config variable
This allows one to specify the items in the RSS feeds Signed-off-by: Aaron Griffin <agriffin@datalogics.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.c3
-rw-r--r--cgit.h1
-rw-r--r--cgitrc.5.txt4
-rw-r--r--cmd.c2
4 files changed, 9 insertions, 1 deletions
diff --git a/cgit.c b/cgit.c
index ed2be64..bf64c9e 100644
--- a/cgit.c
+++ b/cgit.c
@@ -156,24 +156,26 @@ void config_cb(const char *name, const char *value)
156 else if (!strcmp(name, "cache-scanrc-ttl")) 156 else if (!strcmp(name, "cache-scanrc-ttl"))
157 ctx.cfg.cache_scanrc_ttl = atoi(value); 157 ctx.cfg.cache_scanrc_ttl = atoi(value);
158 else if (!strcmp(name, "cache-static-ttl")) 158 else if (!strcmp(name, "cache-static-ttl"))
159 ctx.cfg.cache_static_ttl = atoi(value); 159 ctx.cfg.cache_static_ttl = atoi(value);
160 else if (!strcmp(name, "cache-dynamic-ttl")) 160 else if (!strcmp(name, "cache-dynamic-ttl"))
161 ctx.cfg.cache_dynamic_ttl = atoi(value); 161 ctx.cfg.cache_dynamic_ttl = atoi(value);
162 else if (!strcmp(name, "about-filter")) 162 else if (!strcmp(name, "about-filter"))
163 ctx.cfg.about_filter = new_filter(value, 0); 163 ctx.cfg.about_filter = new_filter(value, 0);
164 else if (!strcmp(name, "commit-filter")) 164 else if (!strcmp(name, "commit-filter"))
165 ctx.cfg.commit_filter = new_filter(value, 0); 165 ctx.cfg.commit_filter = new_filter(value, 0);
166 else if (!strcmp(name, "embedded")) 166 else if (!strcmp(name, "embedded"))
167 ctx.cfg.embedded = atoi(value); 167 ctx.cfg.embedded = atoi(value);
168 else if (!strcmp(name, "max-atom-items"))
169 ctx.cfg.max_atom_items = atoi(value);
168 else if (!strcmp(name, "max-message-length")) 170 else if (!strcmp(name, "max-message-length"))
169 ctx.cfg.max_msg_len = atoi(value); 171 ctx.cfg.max_msg_len = atoi(value);
170 else if (!strcmp(name, "max-repodesc-length")) 172 else if (!strcmp(name, "max-repodesc-length"))
171 ctx.cfg.max_repodesc_len = atoi(value); 173 ctx.cfg.max_repodesc_len = atoi(value);
172 else if (!strcmp(name, "max-blob-size")) 174 else if (!strcmp(name, "max-blob-size"))
173 ctx.cfg.max_blob_size = atoi(value); 175 ctx.cfg.max_blob_size = atoi(value);
174 else if (!strcmp(name, "max-repo-count")) 176 else if (!strcmp(name, "max-repo-count"))
175 ctx.cfg.max_repo_count = atoi(value); 177 ctx.cfg.max_repo_count = atoi(value);
176 else if (!strcmp(name, "max-commit-count")) 178 else if (!strcmp(name, "max-commit-count"))
177 ctx.cfg.max_commit_count = atoi(value); 179 ctx.cfg.max_commit_count = atoi(value);
178 else if (!strcmp(name, "scan-path")) 180 else if (!strcmp(name, "scan-path"))
179 if (!ctx.cfg.nocache && ctx.cfg.cache_size) 181 if (!ctx.cfg.nocache && ctx.cfg.cache_size)
@@ -285,24 +287,25 @@ static void prepare_context(struct cgit_context *ctx)
285 ctx->cfg.max_blob_size = 0; 287 ctx->cfg.max_blob_size = 0;
286 ctx->cfg.max_stats = 0; 288 ctx->cfg.max_stats = 0;
287 ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; 289 ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s";
288 ctx->cfg.renamelimit = -1; 290 ctx->cfg.renamelimit = -1;
289 ctx->cfg.robots = "index, nofollow"; 291 ctx->cfg.robots = "index, nofollow";
290 ctx->cfg.root_title = "Git repository browser"; 292 ctx->cfg.root_title = "Git repository browser";
291 ctx->cfg.root_desc = "a fast webinterface for the git dscm"; 293 ctx->cfg.root_desc = "a fast webinterface for the git dscm";
292 ctx->cfg.script_name = CGIT_SCRIPT_NAME; 294 ctx->cfg.script_name = CGIT_SCRIPT_NAME;
293 ctx->cfg.section = ""; 295 ctx->cfg.section = "";
294 ctx->cfg.summary_branches = 10; 296 ctx->cfg.summary_branches = 10;
295 ctx->cfg.summary_log = 10; 297 ctx->cfg.summary_log = 10;
296 ctx->cfg.summary_tags = 10; 298 ctx->cfg.summary_tags = 10;
299 ctx->cfg.max_atom_items = 10;
297 ctx->cfg.ssdiff = 0; 300 ctx->cfg.ssdiff = 0;
298 ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); 301 ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG"));
299 ctx->env.http_host = xstrdupn(getenv("HTTP_HOST")); 302 ctx->env.http_host = xstrdupn(getenv("HTTP_HOST"));
300 ctx->env.https = xstrdupn(getenv("HTTPS")); 303 ctx->env.https = xstrdupn(getenv("HTTPS"));
301 ctx->env.no_http = xstrdupn(getenv("NO_HTTP")); 304 ctx->env.no_http = xstrdupn(getenv("NO_HTTP"));
302 ctx->env.path_info = xstrdupn(getenv("PATH_INFO")); 305 ctx->env.path_info = xstrdupn(getenv("PATH_INFO"));
303 ctx->env.query_string = xstrdupn(getenv("QUERY_STRING")); 306 ctx->env.query_string = xstrdupn(getenv("QUERY_STRING"));
304 ctx->env.request_method = xstrdupn(getenv("REQUEST_METHOD")); 307 ctx->env.request_method = xstrdupn(getenv("REQUEST_METHOD"));
305 ctx->env.script_name = xstrdupn(getenv("SCRIPT_NAME")); 308 ctx->env.script_name = xstrdupn(getenv("SCRIPT_NAME"));
306 ctx->env.server_name = xstrdupn(getenv("SERVER_NAME")); 309 ctx->env.server_name = xstrdupn(getenv("SERVER_NAME"));
307 ctx->env.server_port = xstrdupn(getenv("SERVER_PORT")); 310 ctx->env.server_port = xstrdupn(getenv("SERVER_PORT"));
308 ctx->page.mimetype = "text/html"; 311 ctx->page.mimetype = "text/html";
diff --git a/cgit.h b/cgit.h
index 478aebb..7fafb58 100644
--- a/cgit.h
+++ b/cgit.h
@@ -175,24 +175,25 @@ struct cgit_config {
175 int cache_repo_ttl; 175 int cache_repo_ttl;
176 int cache_root_ttl; 176 int cache_root_ttl;
177 int cache_scanrc_ttl; 177 int cache_scanrc_ttl;
178 int cache_static_ttl; 178 int cache_static_ttl;
179 int embedded; 179 int embedded;
180 int enable_filter_overrides; 180 int enable_filter_overrides;
181 int enable_index_links; 181 int enable_index_links;
182 int enable_log_filecount; 182 int enable_log_filecount;
183 int enable_log_linecount; 183 int enable_log_linecount;
184 int enable_remote_branches; 184 int enable_remote_branches;
185 int enable_tree_linenumbers; 185 int enable_tree_linenumbers;
186 int local_time; 186 int local_time;
187 int max_atom_items;
187 int max_repo_count; 188 int max_repo_count;
188 int max_commit_count; 189 int max_commit_count;
189 int max_lock_attempts; 190 int max_lock_attempts;
190 int max_msg_len; 191 int max_msg_len;
191 int max_repodesc_len; 192 int max_repodesc_len;
192 int max_blob_size; 193 int max_blob_size;
193 int max_stats; 194 int max_stats;
194 int nocache; 195 int nocache;
195 int noplainemail; 196 int noplainemail;
196 int noheader; 197 int noheader;
197 int renamelimit; 198 int renamelimit;
198 int snapshots; 199 int snapshots;
diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index d74d9e7..6cdfd03 100644
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -157,24 +157,28 @@ local-time::
157 Flag which, if set to "1", makes cgit print commit and tag times in the 157 Flag which, if set to "1", makes cgit print commit and tag times in the
158 servers timezone. Default value: "0". 158 servers timezone. Default value: "0".
159 159
160logo:: 160logo::
161 Url which specifies the source of an image which will be used as a logo 161 Url which specifies the source of an image which will be used as a logo
162 on all cgit pages. Default value: "/cgit.png". 162 on all cgit pages. Default value: "/cgit.png".
163 163
164logo-link:: 164logo-link::
165 Url loaded when clicking on the cgit logo image. If unspecified the 165 Url loaded when clicking on the cgit logo image. If unspecified the
166 calculated url of the repository index page will be used. Default 166 calculated url of the repository index page will be used. Default
167 value: none. 167 value: none.
168 168
169max-atom-items::
170 Specifies the number of items to display in atom feeds view. Default
171 value: "10".
172
169max-commit-count:: 173max-commit-count::
170 Specifies the number of entries to list per page in "log" view. Default 174 Specifies the number of entries to list per page in "log" view. Default
171 value: "50". 175 value: "50".
172 176
173max-message-length:: 177max-message-length::
174 Specifies the maximum number of commit message characters to display in 178 Specifies the maximum number of commit message characters to display in
175 "log" view. Default value: "80". 179 "log" view. Default value: "80".
176 180
177max-repo-count:: 181max-repo-count::
178 Specifies the number of entries to list per page on therepository 182 Specifies the number of entries to list per page on therepository
179 index page. Default value: "50". 183 index page. Default value: "50".
180 184
diff --git a/cmd.c b/cmd.c
index 766f903..ad784fc 100644
--- a/cmd.c
+++ b/cmd.c
@@ -24,25 +24,25 @@
24#include "ui-stats.h" 24#include "ui-stats.h"
25#include "ui-summary.h" 25#include "ui-summary.h"
26#include "ui-tag.h" 26#include "ui-tag.h"
27#include "ui-tree.h" 27#include "ui-tree.h"
28 28
29static void HEAD_fn(struct cgit_context *ctx) 29static void HEAD_fn(struct cgit_context *ctx)
30{ 30{
31 cgit_clone_head(ctx); 31 cgit_clone_head(ctx);
32} 32}
33 33
34static void atom_fn(struct cgit_context *ctx) 34static void atom_fn(struct cgit_context *ctx)
35{ 35{
36 cgit_print_atom(ctx->qry.head, ctx->qry.path, 10); 36 cgit_print_atom(ctx->qry.head, ctx->qry.path, ctx->cfg.max_atom_items);
37} 37}
38 38
39static void about_fn(struct cgit_context *ctx) 39static void about_fn(struct cgit_context *ctx)
40{ 40{
41 if (ctx->repo) 41 if (ctx->repo)
42 cgit_print_repo_readme(ctx->qry.path); 42 cgit_print_repo_readme(ctx->qry.path);
43 else 43 else
44 cgit_print_site_readme(); 44 cgit_print_site_readme();
45} 45}
46 46
47static void blob_fn(struct cgit_context *ctx) 47static void blob_fn(struct cgit_context *ctx)
48{ 48{