error if ping fails, rather than printing debug

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

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

-use IkiWiki;
+use IkiWiki 2.00;

 use HTML::Template;
 use Encode;
 
 sub import { #{{{
 use HTML::Template;
 use Encode;
 
 sub import { #{{{

-       IkiWiki::hook(type => "preprocess", id => "template", 
-               call => \&preprocess);
+       hook(type => "getsetup", id => "template", call => \&getsetup);
+       hook(type => "preprocess", id => "template", call => \&preprocess);

 } # }}}
 
 } # }}}
 

+sub getsetup () { #{{{
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+               },
+} #}}}
+

 sub preprocess (@) { #{{{
        my %params=@_;
 
        if (! exists $params{id}) {
 sub preprocess (@) { #{{{
        my %params=@_;
 
        if (! exists $params{id}) {

-               return "[[template missing id parameter]]"
+               error gettext("missing id parameter")

        }
 
        my $template_page="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,
-       );
+       add_depends($params{page}, $template_page);
+
+       my $template_file=$pagesources{$template_page};
+       return sprintf(gettext("template %s not found"),
+               htmllink($params{page}, $params{destpage}, $template_page))
+                       unless defined $template_file;
+
+       my $template;
+       eval {
+               $template=HTML::Template->new(
+                       filter => sub {
+                               my $text_ref = shift;
+                               $$text_ref=&Encode::decode_utf8($$text_ref);
+                               chomp $$text_ref;
+                       },
+                       filename => srcfile($template_file),
+                               die_on_bad_params => 0,
+                       no_includes => 1,
+                       blind_cache => 1,
+               );
+       };
+       if ($@) {
+               error gettext("failed to process:")." $@"
+       }
+
+       $params{basename}=IkiWiki::basename($params{page});

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

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

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

-               $template->output);
+               IkiWiki::filter($params{page}, $params{destpage},
+               $template->output));

 } # }}}
 
 1
 } # }}}
 
 1