Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

[git.ikiwiki.info.git] / IkiWiki / Plugin / meta.pm

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 4992617d02376c15f822d586550c04c397e4795f..128a6342c74a4ad13adb2f0521d85ddfb29232bb 100644 (file)
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -88,21 +88,21 @@ sub preprocess (@) {
 
        # Metadata collection that needs to happen during the scan pass.
        if ($key eq 'title') {
 
        # Metadata collection that needs to happen during the scan pass.
        if ($key eq 'title') {

-               $pagestate{$page}{meta}{title}=HTML::Entities::encode_numeric($value);
+               $pagestate{$page}{meta}{title}=$value;

                if (exists $params{sortas}) {
                        $pagestate{$page}{meta}{titlesort}=$params{sortas};
                }
                else {
                if (exists $params{sortas}) {
                        $pagestate{$page}{meta}{titlesort}=$params{sortas};
                }
                else {

-                       $pagestate{$page}{meta}{titlesort}=$value;
+                       delete $pagestate{$page}{meta}{titlesort};

                }
                return "";
        }
        elsif ($key eq 'description') {
                }
                return "";
        }
        elsif ($key eq 'description') {

-               $pagestate{$page}{meta}{description}=HTML::Entities::encode_numeric($value);
+               $pagestate{$page}{meta}{description}=$value;

                # fallthrough
        }
        elsif ($key eq 'guid') {
                # fallthrough
        }
        elsif ($key eq 'guid') {

-               $pagestate{$page}{meta}{guid}=HTML::Entities::encode_numeric($value);
+               $pagestate{$page}{meta}{guid}=$value;

                # fallthrough
        }
        elsif ($key eq 'license') {
                # fallthrough
        }
        elsif ($key eq 'license') {


@@ -126,7 +126,7 @@ sub preprocess (@) {
                        $pagestate{$page}{meta}{authorsort}=$params{sortas};
                }
                else {
                        $pagestate{$page}{meta}{authorsort}=$params{sortas};
                }
                else {

-                       $pagestate{$page}{meta}{authorsort}=$value;
+                       delete $pagestate{$page}{meta}{authorsort};

                }
                # fallthorough
        }
                }
                # fallthorough
        }


@@ -276,15 +276,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(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);
        }
 
                $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);
        }
 
                $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} ||
        foreach my $field (qw{license copyright}) {
                if (exists $pagestate{$page}{meta}{$field} && $template->query(name => $field) &&
                    ($page eq $destpage || ! exists $pagestate{$destpage}{meta}{$field} ||


@@ -295,8 +300,8 @@ sub pagetemplate (@) {
 }
 
 sub get_sort_key {
 }
 
 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"};
 
        # e.g. titlesort (also makes sense for author)
        my $key = $pagestate{$page}{meta}{$meta . "sort"};


@@ -374,25 +379,23 @@ sub match_copyright ($$;@) {
 package IkiWiki::SortSpec;
 
 sub cmp_meta {
 package IkiWiki::SortSpec;
 
 sub cmp_meta {

-       my $left = $_[0];
-       my $right = $_[1];
-       my $meta = $_[2];
+       my $meta = shift;

        error(gettext("sort=meta requires a parameter")) unless defined $meta;
 
        if ($meta eq 'updated' || $meta eq 'date') {
        error(gettext("sort=meta requires a parameter")) unless defined $meta;
 
        if ($meta eq 'updated' || $meta eq 'date') {

-               return IkiWiki::Plugin::meta::get_sort_key($left, $meta)
+               return IkiWiki::Plugin::meta::get_sort_key($a, $meta)

                        <=>
                        <=>

-                       IkiWiki::Plugin::meta::get_sort_key($right, $meta);
+                       IkiWiki::Plugin::meta::get_sort_key($b, $meta);

        }
 
        }
 

-       return IkiWiki::Plugin::meta::get_sort_key($left, $meta)
+       return IkiWiki::Plugin::meta::get_sort_key($a, $meta)

                cmp
                cmp

-               IkiWiki::Plugin::meta::get_sort_key($right, $meta);
+               IkiWiki::Plugin::meta::get_sort_key($b, $meta);

 }
 
 # A prototype of how sort=title could behave in 4.0 or something
 sub cmp_meta_title {
 }
 
 # A prototype of how sort=title could behave in 4.0 or something
 sub cmp_meta_title {

-       $_[2] = 'title';
+       $_[0] = 'title';

        return cmp_meta(@_);
 }
 
        return cmp_meta(@_);
 }