From 2bd8ada5a619a1c32bf19f44e4f96e083ceb17b8 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Sat, 12 Jul 2008 15:20:28 +0100 Subject: Accept [[!inline ... atomid="..."]] and use it to populate the feed's Atom . This is often the same as the feed's (in which case it can be omitted) but sometimes it's a urn:uuid: URN instead. --- IkiWiki/Plugin/inline.pm | 8 +++++--- 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{}; } @@ -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{}; } @@ -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 @@ - + + + + + ikiwiki -- cgit v1.2.3