diff options
| author | Simon McVittie <http://smcv.pseudorandom.co.uk/> | 2008-07-12 15:20:28 +0100 |
|---|---|---|
| committer | Simon McVittie <http://smcv.pseudorandom.co.uk/> | 2008-07-12 17:09:41 +0100 |
| commit | 2bd8ada5a619a1c32bf19f44e4f96e083ceb17b8 (patch) | |
| tree | 214638dd92ab21523cda104d8ce19fad96f27d10 | |
| parent | 50ec532bba1b4b319e598d8d424e79457465946a (diff) | |
| download | ikiwiki-2bd8ada5a619a1c32bf19f44e4f96e083ceb17b8.tar ikiwiki-2bd8ada5a619a1c32bf19f44e4f96e083ceb17b8.tar.gz | |
Accept [[!inline ... atomid="..."]] and use it to populate the feed's Atom <id>.
This is often the same as the feed's <link> (in which case it can be omitted) but sometimes it's a urn:uuid: URN instead.
| -rw-r--r-- | IkiWiki/Plugin/inline.pm | 8 | ||||
| -rw-r--r-- | templates/atompage.tmpl | 6 |
2 files changed, 10 insertions, 4 deletions
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm index 02c04cc00..802fae93a 100644 --- a/IkiWiki/Plugin/inline.pm +++ b/IkiWiki/Plugin/inline.pm @@ -308,7 +308,7 @@ sub preprocess_inline (@) { #{{{ if (! $params{preview}) { writefile($rssp, $config{destdir}, genfeed("rss", - $config{url}."/".rsspage($params{destpage}).$feednum, $desc, $params{destpage}, @feedlist)); + $config{url}."/".rsspage($params{destpage}).$feednum, $desc, $params{atomid}, $params{destpage}, @feedlist)); $toping{$params{destpage}}=1 unless $config{rebuild}; $feedlinks{$params{destpage}}=qq{<link rel="alternate" type="application/rss+xml" title="RSS" href="$rssurl" />}; } @@ -318,7 +318,7 @@ sub preprocess_inline (@) { #{{{ will_render($params{destpage}, $atomp); if (! $params{preview}) { writefile($atomp, $config{destdir}, - genfeed("atom", $config{url}."/".atompage($params{destpage}).$feednum, $desc, $params{destpage}, @feedlist)); + genfeed("atom", $config{url}."/".atompage($params{destpage}).$feednum, $desc, $params{atomid}, $params{destpage}, @feedlist)); $toping{$params{destpage}}=1 unless $config{rebuild}; $feedlinks{$params{destpage}}=qq{<link rel="alternate" type="application/atom+xml" title="Atom" href="$atomurl" />}; } @@ -411,10 +411,11 @@ sub atompage ($) { #{{{ return targetpage(shift, "atom"); } #}}} -sub genfeed ($$$$@) { #{{{ +sub genfeed ($$$$$@) { #{{{ my $feedtype=shift; my $feedurl=shift; my $feeddesc=shift; + my $atomid=shift; my $page=shift; my @pages=@_; @@ -484,6 +485,7 @@ sub genfeed ($$$$@) { #{{{ pageurl => $url, content => $content, feeddesc => $feeddesc, + atomid => $atomid, feeddate => date_3339($lasttime), feedurl => $feedurl, version => $IkiWiki::version, diff --git a/templates/atompage.tmpl b/templates/atompage.tmpl index b7ba74f47..9ec7df435 100644 --- a/templates/atompage.tmpl +++ b/templates/atompage.tmpl @@ -31,7 +31,11 @@ </rights> </TMPL_IF> </TMPL_IF> -<id><TMPL_VAR PAGEURL></id> +<TMPL_IF NAME="ATOMID"> + <id><TMPL_VAR ATOMID></id> +<TMPL_ELSE> + <id><TMPL_VAR PAGEURL></id> +</TMPL_IF> <subtitle type="html"><TMPL_VAR FEEDDESC ESCAPE=HTML></subtitle> <generator uri="http://ikiwiki.info/" version="<TMPL_VAR VERSION>">ikiwiki</generator> <updated><TMPL_VAR FEEDDATE></updated> |