X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/be1d97c0bd495fe876853d7d7f6eb42041867649..f5c270b11dbfb2589df21388a07f55002e076d3c:/IkiWiki/Plugin/meta.pm?ds=sidebyside
diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 7f19b46a3..5cfa72833 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -37,6 +37,7 @@ sub needsbuild (@) {
}
}
}
+ return $needsbuild;
}
sub scrub ($$) {
@@ -88,26 +89,21 @@ sub preprocess (@) {
# Metadata collection that needs to happen during the scan pass.
if ($key eq 'title') {
- my $encoded = HTML::Entities::encode_numeric($value);
- $pagestate{$page}{meta}{title} = $encoded;
-
+ $pagestate{$page}{meta}{title}=$value;
if (exists $params{sortas}) {
$pagestate{$page}{meta}{titlesort}=$params{sortas};
}
- elsif ($encoded ne $value) {
- $pagestate{$page}{meta}{titlesort}=$value;
- }
else {
delete $pagestate{$page}{meta}{titlesort};
}
return "";
}
elsif ($key eq 'description') {
- $pagestate{$page}{meta}{description}=HTML::Entities::encode_numeric($value);
+ $pagestate{$page}{meta}{description}=$value;
# fallthrough
}
elsif ($key eq 'guid') {
- $pagestate{$page}{meta}{guid}=HTML::Entities::encode_numeric($value);
+ $pagestate{$page}{meta}{guid}=$value;
# fallthrough
}
elsif ($key eq 'license') {
@@ -131,7 +127,7 @@ sub preprocess (@) {
$pagestate{$page}{meta}{authorsort}=$params{sortas};
}
else {
- $pagestate{$page}{meta}{authorsort}=$value;
+ delete $pagestate{$page}{meta}{authorsort};
}
# fallthorough
}
@@ -202,8 +198,12 @@ sub preprocess (@) {
'" rel="openid2.local_id" />' if $delegate ne 1;
}
if (exists $params{"xrds-location"} && safeurl($params{"xrds-location"})) {
- push @{$metaheaders{$page}}, '';
+ # force url absolute
+ eval q{use URI};
+ error($@) if $@;
+ my $url=URI->new_abs($params{"xrds-location"}, $config{url});
+ push @{$metaheaders{$page}}, '';
}
}
elsif ($key eq 'redir') {
@@ -258,12 +258,20 @@ sub preprocess (@) {
' content="'.encode_entities($value).'" />';
}
elsif ($key eq 'description') {
- push @{$metaheaders{$page}}, '';
}
+ elsif ($key eq 'name') {
+ push @{$metaheaders{$page}}, scrub('', $destpage);
+ }
else {
- push @{$metaheaders{$page}}, scrub('', $destpage);
+ push @{$metaheaders{$page}}, scrub('', $destpage);
}
return "";
@@ -281,15 +289,20 @@ sub pagetemplate (@) {
$template->param(meta => join("\n", grep { (! $seen{$_}) && ($seen{$_}=1) } @{$metaheaders{$page}}));
}
if (exists $pagestate{$page}{meta}{title} && $template->query(name => "title")) {
- $template->param(title => $pagestate{$page}{meta}{title});
+ $template->param(title => HTML::Entities::encode_numeric($pagestate{$page}{meta}{title}));
$template->param(title_overridden => 1);
}
- foreach my $field (qw{author authorurl description permalink}) {
+ foreach my $field (qw{author authorurl permalink}) {
$template->param($field => $pagestate{$page}{meta}{$field})
if exists $pagestate{$page}{meta}{$field} && $template->query(name => $field);
}
+ foreach my $field (qw{description}) {
+ $template->param($field => HTML::Entities::encode_numeric($pagestate{$page}{meta}{$field}))
+ if exists $pagestate{$page}{meta}{$field} && $template->query(name => $field);
+ }
+
foreach my $field (qw{license copyright}) {
if (exists $pagestate{$page}{meta}{$field} && $template->query(name => $field) &&
($page eq $destpage || ! exists $pagestate{$destpage}{meta}{$field} ||
@@ -300,8 +313,8 @@ sub pagetemplate (@) {
}
sub get_sort_key {
- my $page = $_[0];
- my $meta = $_[1];
+ my $page = shift;
+ my $meta = shift;
# e.g. titlesort (also makes sense for author)
my $key = $pagestate{$page}{meta}{$meta . "sort"};
@@ -346,11 +359,11 @@ sub match {
return IkiWiki::SuccessReason->new("$re matches $field of $page", $page => $IkiWiki::DEPEND_CONTENT, "" => 1);
}
else {
- return IkiWiki::FailReason->new("$re does not match $field of $page", "" => 1);
+ return IkiWiki::FailReason->new("$re does not match $field of $page", $page => $IkiWiki::DEPEND_CONTENT, "" => 1);
}
}
else {
- return IkiWiki::FailReason->new("$page does not have a $field", "" => 1);
+ return IkiWiki::FailReason->new("$page does not have a $field", $page => $IkiWiki::DEPEND_CONTENT);
}
}
@@ -376,10 +389,14 @@ sub match_copyright ($$;@) {
IkiWiki::Plugin::meta::match("copyright", @_);
}
+sub match_guid ($$;@) {
+ IkiWiki::Plugin::meta::match("guid", @_);
+}
+
package IkiWiki::SortSpec;
sub cmp_meta {
- my $meta = $_[0];
+ my $meta = shift;
error(gettext("sort=meta requires a parameter")) unless defined $meta;
if ($meta eq 'updated' || $meta eq 'date') {