config: add js

[ps-cgit] / ui-atom.c

diff --git a/ui-atom.c b/ui-atom.c
index 0bf2cf20c7af1834dfcd8b4eaa1dcff08471499b..5f4ad7df3f90b2cba6b5ae9a8632c42e4173d8c1 100644 (file)
--- a/ui-atom.c
+++ b/ui-atom.c
@@ -17,11 +17,6 @@ static void add_entry(struct commit *commit, const char *host)
        char *hex;
        char *mail, *t, *t2;
        struct commitinfo *info;
-       struct date_mode mode = {
-               .type = DATE_STRFTIME,
-               .strftime_fmt = FMT_ATOMDATE,
-               .local = 0,
-       };
 
        info = cgit_parse_commit(commit);
        hex = oid_to_hex(&commit->object.oid);
@@ -30,7 +25,8 @@ static void add_entry(struct commit *commit, const char *host)
        html_txt(info->subject);
        html("</title>\n");
        html("<updated>");
-       html_txt(show_date(info->committer_date, 0, &mode));
+       html_txt(show_date(info->committer_date, 0,
+                    date_mode_from_type(DATE_ISO8601_STRICT)));
        html("</updated>\n");
        html("<author>\n");
        if (info->author) {
@@ -55,7 +51,8 @@ static void add_entry(struct commit *commit, const char *host)
        }
        html("</author>\n");
        html("<published>");
-       html_txt(show_date(info->author_date, 0, &mode));
+       html_txt(show_date(info->author_date, 0,
+                    date_mode_from_type(DATE_ISO8601_STRICT)));
        html("</published>\n");
        if (host) {
                char *pageurl;
@@ -66,33 +63,29 @@ static void add_entry(struct commit *commit, const char *host)
                html_attr(pageurl);
                if (ctx.cfg.virtual_root)
                        delim = '?';
-               htmlf("%cid=%s", delim, hex);
+               html_attrf("%cid=%s", delim, hex);
                html("'/>\n");
                free(pageurl);
        }
-       htmlf("<id>%s</id>\n", hex);
+       html("<id>");
+       html_txtf("urn:%s:%s", the_hash_algo->name, hex);
+       html("</id>\n");
        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, char *path, int max_count)
+void cgit_print_atom(char *tip, const char *path, int max_count)
 {
        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";
@@ -133,18 +126,30 @@ void cgit_print_atom(char *tip, 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(cgit_httpscheme());
-               html_attr(host);
-               html_attr(repourl);
+               html_attrf("%s%s%s", cgit_httpscheme(), host, repourl);
                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);
-               free_commit_buffer(commit);
-               free_commit_list(commit->parents);
+               release_commit_memory(the_repository->parsed_objects, commit);
                commit->parents = NULL;
        }
        html("</feed>\n");