summaryrefslogtreecommitdiffabout
authorDiego Ongaro <ongardie@gmail.com>2009-06-10 23:18:34 (UTC)
committer Diego Ongaro <ongardie@gmail.com>2009-06-11 05:01:32 (UTC)
commit694dd43886f23723f415aed3afb62131cdbcaa51 (patch) (unidiff)
tree891ce59bcac2673e9ca294cfa83e69eec23ccbd5
parent87a89aed41136d388537b146000c4af6c1135a8c (diff)
downloadcgit-694dd43886f23723f415aed3afb62131cdbcaa51.zip
cgit-694dd43886f23723f415aed3afb62131cdbcaa51.tar.gz
cgit-694dd43886f23723f415aed3afb62131cdbcaa51.tar.bz2
use cgit_httpscheme() for atom feed
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--ui-atom.c6
-rw-r--r--ui-shared.c3
2 files changed, 6 insertions, 3 deletions
diff --git a/ui-atom.c b/ui-atom.c
index a6ea3ee..e5c31d9 100644
--- a/ui-atom.c
+++ b/ui-atom.c
@@ -31,49 +31,50 @@ void add_entry(struct commit *commit, char *host)
31 html("<name>"); 31 html("<name>");
32 html_txt(info->author); 32 html_txt(info->author);
33 html("</name>\n"); 33 html("</name>\n");
34 } 34 }
35 if (info->author_email) { 35 if (info->author_email) {
36 mail = xstrdup(info->author_email); 36 mail = xstrdup(info->author_email);
37 t = strchr(mail, '<'); 37 t = strchr(mail, '<');
38 if (t) 38 if (t)
39 t++; 39 t++;
40 else 40 else
41 t = mail; 41 t = mail;
42 t2 = strchr(t, '>'); 42 t2 = strchr(t, '>');
43 if (t2) 43 if (t2)
44 *t2 = '\0'; 44 *t2 = '\0';
45 html("<email>"); 45 html("<email>");
46 html_txt(t); 46 html_txt(t);
47 html("</email>\n"); 47 html("</email>\n");
48 free(mail); 48 free(mail);
49 } 49 }
50 html("</author>\n"); 50 html("</author>\n");
51 html("<published>"); 51 html("<published>");
52 cgit_print_date(info->author_date, FMT_ATOMDATE, ctx.cfg.local_time); 52 cgit_print_date(info->author_date, FMT_ATOMDATE, ctx.cfg.local_time);
53 html("</published>\n"); 53 html("</published>\n");
54 if (host) { 54 if (host) {
55 html("<link rel='alternate' type='text/html' href='http://"); 55 html("<link rel='alternate' type='text/html' href='");
56 html(cgit_httpscheme());
56 html_attr(host); 57 html_attr(host);
57 html_attr(cgit_pageurl(ctx.repo->url, "commit", NULL)); 58 html_attr(cgit_pageurl(ctx.repo->url, "commit", NULL));
58 if (ctx.cfg.virtual_root) 59 if (ctx.cfg.virtual_root)
59 delim = '?'; 60 delim = '?';
60 htmlf("%cid=%s", delim, hex); 61 htmlf("%cid=%s", delim, hex);
61 html("'/>\n"); 62 html("'/>\n");
62 } 63 }
63 htmlf("<id>%s</id>\n", hex); 64 htmlf("<id>%s</id>\n", hex);
64 html("<content type='text'>\n"); 65 html("<content type='text'>\n");
65 html_txt(info->msg); 66 html_txt(info->msg);
66 html("</content>\n"); 67 html("</content>\n");
67 html("<content type='xhtml'>\n"); 68 html("<content type='xhtml'>\n");
68 html("<div xmlns='http://www.w3.org/1999/xhtml'>\n"); 69 html("<div xmlns='http://www.w3.org/1999/xhtml'>\n");
69 html("<pre>\n"); 70 html("<pre>\n");
70 html_txt(info->msg); 71 html_txt(info->msg);
71 html("</pre>\n"); 72 html("</pre>\n");
72 html("</div>\n"); 73 html("</div>\n");
73 html("</content>\n"); 74 html("</content>\n");
74 html("</entry>\n"); 75 html("</entry>\n");
75 cgit_free_commitinfo(info); 76 cgit_free_commitinfo(info);
76} 77}
77 78
78 79
79void cgit_print_atom(char *tip, char *path, int max_count) 80void cgit_print_atom(char *tip, char *path, int max_count)
@@ -92,38 +93,39 @@ void cgit_print_atom(char *tip, char *path, int max_count)
92 argv[argc++] = path; 93 argv[argc++] = path;
93 } 94 }
94 95
95 init_revisions(&rev, NULL); 96 init_revisions(&rev, NULL);
96 rev.abbrev = DEFAULT_ABBREV; 97 rev.abbrev = DEFAULT_ABBREV;
97 rev.commit_format = CMIT_FMT_DEFAULT; 98 rev.commit_format = CMIT_FMT_DEFAULT;
98 rev.verbose_header = 1; 99 rev.verbose_header = 1;
99 rev.show_root_diff = 0; 100 rev.show_root_diff = 0;
100 rev.max_count = max_count; 101 rev.max_count = max_count;
101 setup_revisions(argc, argv, &rev, NULL); 102 setup_revisions(argc, argv, &rev, NULL);
102 prepare_revision_walk(&rev); 103 prepare_revision_walk(&rev);
103 104
104 host = cgit_hosturl(); 105 host = cgit_hosturl();
105 ctx.page.mimetype = "text/xml"; 106 ctx.page.mimetype = "text/xml";
106 ctx.page.charset = "utf-8"; 107 ctx.page.charset = "utf-8";
107 cgit_print_http_headers(&ctx); 108 cgit_print_http_headers(&ctx);
108 html("<feed xmlns='http://www.w3.org/2005/Atom'>\n"); 109 html("<feed xmlns='http://www.w3.org/2005/Atom'>\n");
109 html("<title>"); 110 html("<title>");
110 html_txt(ctx.repo->name); 111 html_txt(ctx.repo->name);
111 html("</title>\n"); 112 html("</title>\n");
112 html("<subtitle>"); 113 html("<subtitle>");
113 html_txt(ctx.repo->desc); 114 html_txt(ctx.repo->desc);
114 html("</subtitle>\n"); 115 html("</subtitle>\n");
115 if (host) { 116 if (host) {
116 html("<link rel='alternate' type='text/html' href='http://"); 117 html("<link rel='alternate' type='text/html' href='");
118 html(cgit_httpscheme());
117 html_attr(host); 119 html_attr(host);
118 html_attr(cgit_repourl(ctx.repo->url)); 120 html_attr(cgit_repourl(ctx.repo->url));
119 html("'/>\n"); 121 html("'/>\n");
120 } 122 }
121 while ((commit = get_revision(&rev)) != NULL) { 123 while ((commit = get_revision(&rev)) != NULL) {
122 add_entry(commit, host); 124 add_entry(commit, host);
123 free(commit->buffer); 125 free(commit->buffer);
124 commit->buffer = NULL; 126 commit->buffer = NULL;
125 free_commit_list(commit->parents); 127 free_commit_list(commit->parents);
126 commit->parents = NULL; 128 commit->parents = NULL;
127 } 129 }
128 html("</feed>\n"); 130 html("</feed>\n");
129} 131}
diff --git a/ui-shared.c b/ui-shared.c
index 749ea35..5ce2bc5 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -482,49 +482,50 @@ void cgit_print_http_headers(struct cgit_context *ctx)
482 html("\n"); 482 html("\n");
483} 483}
484 484
485void cgit_print_docstart(struct cgit_context *ctx) 485void cgit_print_docstart(struct cgit_context *ctx)
486{ 486{
487 char *host = cgit_hosturl(); 487 char *host = cgit_hosturl();
488 html(cgit_doctype); 488 html(cgit_doctype);
489 html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); 489 html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n");
490 html("<head>\n"); 490 html("<head>\n");
491 html("<title>"); 491 html("<title>");
492 html_txt(ctx->page.title); 492 html_txt(ctx->page.title);
493 html("</title>\n"); 493 html("</title>\n");
494 htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); 494 htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version);
495 if (ctx->cfg.robots && *ctx->cfg.robots) 495 if (ctx->cfg.robots && *ctx->cfg.robots)
496 htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots); 496 htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots);
497 html("<link rel='stylesheet' type='text/css' href='"); 497 html("<link rel='stylesheet' type='text/css' href='");
498 html_attr(ctx->cfg.css); 498 html_attr(ctx->cfg.css);
499 html("'/>\n"); 499 html("'/>\n");
500 if (ctx->cfg.favicon) { 500 if (ctx->cfg.favicon) {
501 html("<link rel='shortcut icon' href='"); 501 html("<link rel='shortcut icon' href='");
502 html_attr(ctx->cfg.favicon); 502 html_attr(ctx->cfg.favicon);
503 html("'/>\n"); 503 html("'/>\n");
504 } 504 }
505 if (host && ctx->repo) { 505 if (host && ctx->repo) {
506 html("<link rel='alternate' title='Atom feed' href='http://"); 506 html("<link rel='alternate' title='Atom feed' href='");
507 html(cgit_httpscheme());
507 html_attr(cgit_hosturl()); 508 html_attr(cgit_hosturl());
508 html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path, 509 html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path,
509 fmt("h=%s", ctx->qry.head))); 510 fmt("h=%s", ctx->qry.head)));
510 html("' type='application/atom+xml'/>"); 511 html("' type='application/atom+xml'/>");
511 } 512 }
512 html("</head>\n"); 513 html("</head>\n");
513 html("<body>\n"); 514 html("<body>\n");
514 if (ctx->cfg.header) 515 if (ctx->cfg.header)
515 html_include(ctx->cfg.header); 516 html_include(ctx->cfg.header);
516} 517}
517 518
518void cgit_print_docend() 519void cgit_print_docend()
519{ 520{
520 html("</div>"); 521 html("</div>");
521 if (ctx.cfg.footer) 522 if (ctx.cfg.footer)
522 html_include(ctx.cfg.footer); 523 html_include(ctx.cfg.footer);
523 else { 524 else {
524 htmlf("<div class='footer'>generated by cgit %s at ", 525 htmlf("<div class='footer'>generated by cgit %s at ",
525 cgit_version); 526 cgit_version);
526 cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time); 527 cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time);
527 html("</div>\n"); 528 html("</div>\n");
528 } 529 }
529 html("</body>\n</html>\n"); 530 html("</body>\n</html>\n");
530} 531}