Diffstat (limited to 'ui-atom.c')
| -rw-r--r-- | ui-atom.c | 61 |
1 files changed, 22 insertions, 39 deletions
@@ -6,8 +6,6 @@ * (see COPYING for full license text) */ -#define USE_THE_REPOSITORY_VARIABLE - #include "cgit.h" #include "ui-atom.h" #include "html.h" @@ -21,14 +19,13 @@ static void add_entry(struct commit *commit, const char *host) struct commitinfo *info; info = cgit_parse_commit(commit); - hex = oid_to_hex(&commit->object.oid); + hex = sha1_to_hex(commit->object.sha1); html("<entry>\n"); html("<title>"); html_txt(info->subject); html("</title>\n"); html("<updated>"); - html_txt(show_date(info->committer_date, 0, - date_mode_from_type(DATE_ISO8601_STRICT))); + cgit_print_date(info->committer_date, FMT_ATOMDATE, 0); html("</updated>\n"); html("<author>\n"); if (info->author) { @@ -53,41 +50,41 @@ static void add_entry(struct commit *commit, const char *host) } html("</author>\n"); html("<published>"); - html_txt(show_date(info->author_date, 0, - date_mode_from_type(DATE_ISO8601_STRICT))); + cgit_print_date(info->author_date, FMT_ATOMDATE, 0); html("</published>\n"); if (host) { - char *pageurl; html("<link rel='alternate' type='text/html' href='"); html(cgit_httpscheme()); html_attr(host); - pageurl = cgit_pageurl(ctx.repo->url, "commit", NULL); - html_attr(pageurl); + html_attr(cgit_pageurl(ctx.repo->url, "commit", NULL)); if (ctx.cfg.virtual_root) delim = '?'; - html_attrf("%cid=%s", delim, hex); + htmlf("%cid=%s", delim, hex); html("'/>\n"); - free(pageurl); } - html("<id>"); - html_txtf("urn:%s:%s", the_hash_algo->name, hex); - html("</id>\n"); + htmlf("<id>%s</id>\n", hex); html("<content type='text'>\n"); html_txt(info->msg); html("</content>\n"); + html("<content type='xhtml'>\n"); + html("<div xmlns='http://www.w3.org/1999/xhtml'>\n"); + html("<pre>\n"); + html_txt(info->msg); + html("</pre>\n"); + html("</div>\n"); + html("</content>\n"); html("</entry>\n"); cgit_free_commitinfo(info); } -void cgit_print_atom(char *tip, const char *path, int max_count) +void cgit_print_atom(char *tip, char *path, int max_count) { - char *host; + const char *host; const char *argv[] = {NULL, tip, NULL, NULL, NULL}; struct commit *commit; struct rev_info rev; int argc = 2; - bool first = true; if (ctx.qry.show_all) argv[1] = "--all"; @@ -99,7 +96,7 @@ void cgit_print_atom(char *tip, const char *path, int max_count) argv[argc++] = path; } - repo_init_revisions(the_repository, &rev, NULL); + init_revisions(&rev, NULL); rev.abbrev = DEFAULT_ABBREV; rev.commit_format = CMIT_FMT_DEFAULT; rev.verbose_header = 1; @@ -128,32 +125,18 @@ void cgit_print_atom(char *tip, const char *path, int max_count) html_txt(ctx.repo->desc); html("</subtitle>\n"); if (host) { - char *fullurl = cgit_currentfullurl(); - char *repourl = cgit_repourl(ctx.repo->url); - html("<id>"); - html_txtf("%s%s%s", cgit_httpscheme(), host, fullurl); - html("</id>\n"); - html("<link rel='self' href='"); - html_attrf("%s%s%s", cgit_httpscheme(), host, fullurl); - html("'/>\n"); html("<link rel='alternate' type='text/html' href='"); - html_attrf("%s%s%s", cgit_httpscheme(), host, repourl); + html(cgit_httpscheme()); + html_attr(host); + html_attr(cgit_repourl(ctx.repo->url)); html("'/>\n"); - free(fullurl); - free(repourl); } while ((commit = get_revision(&rev)) != NULL) { - if (first) { - html("<updated>"); - html_txt(show_date(commit->date, 0, - date_mode_from_type(DATE_ISO8601_STRICT))); - html("</updated>\n"); - first = false; - } add_entry(commit, host); - release_commit_memory(the_repository->parsed_objects, commit); + free(commit->buffer); + commit->buffer = NULL; + free_commit_list(commit->parents); commit->parents = NULL; } html("</feed>\n"); - free(host); } |