update

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

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index a470041c97a528700b575e5b1f59c7c31a390764..128a6342c74a4ad13adb2f0521d85ddfb29232bb 100644 (file)
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -13,7 +13,6 @@ sub import {
        hook(type => "needsbuild", id => "meta", call => \&needsbuild);
        hook(type => "preprocess", id => "meta", call => \&preprocess, scan => 1);
        hook(type => "pagetemplate", id => "meta", call => \&pagetemplate);
        hook(type => "needsbuild", id => "meta", call => \&needsbuild);
        hook(type => "preprocess", id => "meta", call => \&preprocess, scan => 1);
        hook(type => "pagetemplate", id => "meta", call => \&pagetemplate);

-       hook(type => "sort", id => "meta_title", call => \&sort_meta_title);

 }
 
 sub getsetup () {
 }
 
 sub getsetup () {


@@ -89,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);
-               if (exists $params{sort}) {
-                       $pagestate{$page}{meta}{titlesort}=$params{sort};
+               $pagestate{$page}{meta}{title}=$value;
+               if (exists $params{sortas}) {
+                       $pagestate{$page}{meta}{titlesort}=$params{sortas};

                }
                else {
                }
                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') {


@@ -123,6 +122,12 @@ sub preprocess (@) {
        }
        elsif ($key eq 'author') {
                $pagestate{$page}{meta}{author}=$value;
        }
        elsif ($key eq 'author') {
                $pagestate{$page}{meta}{author}=$value;

+               if (exists $params{sortas}) {
+                       $pagestate{$page}{meta}{authorsort}=$params{sortas};
+               }
+               else {
+                       delete $pagestate{$page}{meta}{authorsort};
+               }

                # fallthorough
        }
        elsif ($key eq 'authorurl') {
                # fallthorough
        }
        elsif ($key eq 'authorurl') {


@@ -271,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} ||


@@ -289,18 +299,31 @@ sub pagetemplate (@) {
        }
 }
 
        }
 }
 

-sub titlesort {
-       my $key = $pagestate{$_[0]}{meta}{titlesort};
+sub get_sort_key {
+       my $page = shift;
+       my $meta = shift;

 
 

-       if (defined $key) {
-               return $key;
-       }
+       # e.g. titlesort (also makes sense for author)
+       my $key = $pagestate{$page}{meta}{$meta . "sort"};
+       return $key if defined $key;

 
 

-       return pagetitle(IkiWiki::basename($_[0]));
-}
+       # e.g. title
+       $key = $pagestate{$page}{meta}{$meta};
+       return $key if defined $key;

 
 

-sub sort_meta_title {
-       return titlesort($_[0]) cmp titlesort($_[1]);
+       # fall back to closer-to-core things
+       if ($meta eq 'title') {
+               return pagetitle(IkiWiki::basename($page));
+       }
+       elsif ($meta eq 'date') {
+               return $IkiWiki::pagectime{$page};
+       }
+       elsif ($meta eq 'updated') {
+               return $IkiWiki::pagemtime{$page};
+       }
+       else {
+               return '';
+       }

 }
 
 sub match {
 }
 
 sub match {


@@ -353,4 +376,27 @@ sub match_copyright ($$;@) {
        IkiWiki::Plugin::meta::match("copyright", @_);
 }
 
        IkiWiki::Plugin::meta::match("copyright", @_);
 }
 

+package IkiWiki::SortSpec;
+
+sub cmp_meta {
+       my $meta = shift;
+       error(gettext("sort=meta requires a parameter")) unless defined $meta;
+
+       if ($meta eq 'updated' || $meta eq 'date') {
+               return IkiWiki::Plugin::meta::get_sort_key($a, $meta)
+                       <=>
+                       IkiWiki::Plugin::meta::get_sort_key($b, $meta);
+       }
+
+       return IkiWiki::Plugin::meta::get_sort_key($a, $meta)
+               cmp
+               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 {
+       $_[0] = 'title';
+       return cmp_meta(@_);
+}
+

 1
 1