Photos
Blog
Projects
vanrenterghem.biz
projects
/
git.ikiwiki.info.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(no commit message)
[git.ikiwiki.info.git]
/
IkiWiki
/
Plugin
/
meta.pm
diff --git
a/IkiWiki/Plugin/meta.pm
b/IkiWiki/Plugin/meta.pm
index cb0768b91799ad4e642b8f1f67dee73f691748b5..cd367da704a2913d7076289eb2f0a81194e20143 100644
(file)
--- a/
IkiWiki/Plugin/meta.pm
+++ b/
IkiWiki/Plugin/meta.pm
@@
-107,12
+107,12
@@
sub preprocess (@) {
# fallthrough
}
elsif ($key eq 'license') {
# fallthrough
}
elsif ($key eq 'license') {
- push @{$metaheaders{$page}}, '<link rel="license" href="#page
_
license" />';
+ push @{$metaheaders{$page}}, '<link rel="license" href="#pagelicense" />';
$pagestate{$page}{meta}{license}=$value;
return "";
}
elsif ($key eq 'copyright') {
$pagestate{$page}{meta}{license}=$value;
return "";
}
elsif ($key eq 'copyright') {
- push @{$metaheaders{$page}}, '<link rel="copyright" href="#page
_
copyright" />';
+ push @{$metaheaders{$page}}, '<link rel="copyright" href="#pagecopyright" />';
$pagestate{$page}{meta}{copyright}=$value;
return "";
}
$pagestate{$page}{meta}{copyright}=$value;
return "";
}
@@
-122,7
+122,16
@@
sub preprocess (@) {
return "";
}
elsif ($key eq 'enclosure') {
return "";
}
elsif ($key eq 'enclosure') {
+ my $link=bestlink($page, $value);
+ if (! length $link) {
+ error gettext("enclosure not found")
+ }
+ add_depends($page, $link, deptype("presence"));
+
+ $value=urlto($link, $page, 1);
$pagestate{$page}{meta}{enclosure}=$value;
$pagestate{$page}{meta}{enclosure}=$value;
+ $pagestate{$page}{meta}{enclosurefile}=$link;
+ # fallthrough
}
elsif ($key eq 'author') {
$pagestate{$page}{meta}{author}=$value;
}
elsif ($key eq 'author') {
$pagestate{$page}{meta}{author}=$value;
@@
-146,14
+155,30
@@
sub preprocess (@) {
eval q{use Date::Parse};
if (! $@) {
my $time = str2time($value);
eval q{use Date::Parse};
if (! $@) {
my $time = str2time($value);
- $IkiWiki::pagectime{$page}=$time if defined $time;
+ if (defined $time) {
+ $IkiWiki::pagectime{$page}=$time;
+ }
+ else {
+ error(sprintf(gettext('cannot parse date/time: %s'), $value));
+ }
+ }
+ else {
+ error $@;
}
}
elsif ($key eq 'updated') {
eval q{use Date::Parse};
if (! $@) {
my $time = str2time($value);
}
}
elsif ($key eq 'updated') {
eval q{use Date::Parse};
if (! $@) {
my $time = str2time($value);
- $pagestate{$page}{meta}{updated}=$time if defined $time;
+ if (defined $time) {
+ $pagestate{$page}{meta}{updated}=$time;
+ }
+ else {
+ error(sprintf(gettext('cannot parse date/time: %s'), $value));
+ }
+ }
+ else {
+ error $@;
}
}
}
}
@@
-285,6
+310,7
@@
sub preprocess (@) {
elsif ($key eq 'name') {
push @{$metaheaders{$page}}, scrub('<meta name="'.
encode_entities($value).
elsif ($key eq 'name') {
push @{$metaheaders{$page}}, scrub('<meta name="'.
encode_entities($value).
+ '" '.
join(' ', map { "$_=\"$params{$_}\"" } keys %params).
' />', $page, $destpage);
}
join(' ', map { "$_=\"$params{$_}\"" } keys %params).
' />', $page, $destpage);
}
@@
-322,8
+348,7
@@
sub pagetemplate (@) {
}
if (exists $pagestate{$page}{meta}{enclosure}) {
}
if (exists $pagestate{$page}{meta}{enclosure}) {
- # XXX what if the enclosure doesn't exist?
- $template->param(enclosure => $pagestate{$page}{meta}{enclosure});
+ $template->param(enclosure => HTML::Entities::encode_entities(IkiWiki::urlabs($pagestate{$page}{meta}{enclosure}, $config{url})));
}
foreach my $field (qw{authorurl}) {
}
foreach my $field (qw{authorurl}) {