Only store authorsort in meta pagestate if it differs from author

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

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index c9fdbc9341ac32f899be991a4956fa06b2a5b96c..34e902bec4d19d98730612e6ee78cc157ce7299d 100644 (file)
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -88,13 +88,18 @@ sub preprocess (@) {
 
        # Metadata collection that needs to happen during the scan pass.
        if ($key eq 'title') {
-               $pagestate{$page}{meta}{title}=HTML::Entities::encode_numeric($value);
-               if (exists $params{sort}) {
-                       $pagestate{$page}{meta}{titlesort}=$params{sort};
+               my $encoded = HTML::Entities::encode_numeric($value);
+               $pagestate{$page}{meta}{title} = $encoded;
+
+               if (exists $params{sortas}) {
+                       $pagestate{$page}{meta}{titlesort}=$params{sortas};
                }
-               else {
+               elsif ($encoded ne $value) {
                        $pagestate{$page}{meta}{titlesort}=$value;
                }
+               else {
+                       delete $pagestate{$page}{meta}{titlesort};
+               }
                return "";
        }
        elsif ($key eq 'description') {
@@ -122,11 +127,11 @@ sub preprocess (@) {
        }
        elsif ($key eq 'author') {
                $pagestate{$page}{meta}{author}=$value;
-               if (exists $params{sort}) {
-                       $pagestate{$page}{meta}{authorsort}=$params{sort};
+               if (exists $params{sortas}) {
+                       $pagestate{$page}{meta}{authorsort}=$params{sortas};
                }
                else {
-                       $pagestate{$page}{meta}{authorsort}=$value;
+                       delete $pagestate{$page}{meta}{authorsort};
                }
                # fallthorough
        }
@@ -374,25 +379,23 @@ sub match_copyright ($$;@) {
 package IkiWiki::SortSpec;
 
 sub cmp_meta {
-       my $left = $_[0];
-       my $right = $_[1];
-       my $meta = $_[2];
+       my $meta = $_[0];
        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
-               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 {
-       $_[2] = 'title';
+       $_[0] = 'title';
        return cmp_meta(@_);
 }