Merge remote-tracking branch 'smcv/ready/no-trails-if-dynamic'

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

diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm
index 7e23306cb6a96f1ffd1e075760966b0039ca2164..3df06e652eeee285d51690b9d2178d6e0fb2b8ca 100644 (file)
--- a/IkiWiki/Plugin/template.pm
+++ b/IkiWiki/Plugin/template.pm
@@ -4,48 +4,68 @@ package IkiWiki::Plugin::template;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki;
-use HTML::Template;
+use IkiWiki 3.00;

 use Encode;
 
 use Encode;
 

-sub import { #{{{
-       IkiWiki::hook(type => "preprocess", id => "template", 
-               call => \&preprocess);
-} # }}}
+sub import {
+       hook(type => "getsetup", id => "template", call => \&getsetup);
+       hook(type => "preprocess", id => "template", call => \&preprocess,
+               scan => 1);
+}

 
 

-sub preprocess (@) { #{{{
+sub getsetup () {
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+                       section => "widget",
+               },
+}
+
+sub preprocess (@) {

        my %params=@_;
 
        my %params=@_;
 

+       # This needs to run even in scan mode, in order to process
+       # links and other metadata included via the template.
+       my $scan=! defined wantarray;
+

        if (! exists $params{id}) {
        if (! exists $params{id}) {

-               return "[[template missing id parameter]]"
+               error gettext("missing id parameter")
+       }
+
+       # The bare id is used, so a page templates/$id can be used as 
+       # the template.
+       my $template;
+       eval {
+               $template=template_depends($params{id}, $params{page},
+                       blind_cache => 1);
+       };
+       if ($@) {
+               error sprintf(gettext("failed to process template %s"),
+                       htmllink($params{page}, $params{destpage},
+                               "/templates/$params{id}"))." $@";

        }
 
        }
 

-       my $template_page="templates/$params{id}";
-       IkiWiki::add_depends($params{page}, $template_page);
-
-       my $template_file=$IkiWiki::pagesources{$template_page};
-       return "[[template ".
-              IkiWiki::htmllink($params{page}, $params{destpage}, $template_page).
-              " not found]]"
-               unless defined $template_file;
-
-       my $template=HTML::Template->new(
-               filter => sub {
-                        my $text_ref = shift;
-                        $$text_ref=&Encode::decode_utf8($$text_ref);
-                },
-                filename => IkiWiki::srcfile($template_file),
-                die_on_bad_params => 0,
-               no_includes => 1,
-               blind_cache => 1,
-       );
+       $params{basename}=IkiWiki::basename($params{page});

 
        foreach my $param (keys %params) {
 
        foreach my $param (keys %params) {

-               $template->param($param => $params{$param});
+               my $value=IkiWiki::preprocess($params{page}, $params{destpage},
+                         $params{$param}, $scan);
+               if ($template->query(name => $param)) {
+                       my $htmlvalue=IkiWiki::htmlize($params{page}, $params{destpage},
+                                       pagetype($pagesources{$params{page}}),
+                                       $value);
+                       chomp $htmlvalue;
+                       $template->param($param => $htmlvalue);
+               }
+               if ($template->query(name => "raw_$param")) {
+                       chomp $value;
+                       $template->param("raw_$param" => $value);
+               }

        }
 
        return IkiWiki::preprocess($params{page}, $params{destpage},
        }
 
        return IkiWiki::preprocess($params{page}, $params{destpage},

-               $template->output);
-} # }}}
+              $template->output, $scan);
+}

 
 1
 
 1