From 9eced4dff64e35a0135ce98609ad8f3f1c9c96a9 Mon Sep 17 00:00:00 2001 From: Andreas Brachold Date: Sun, 26 Oct 2008 17:22:02 +0000 Subject: * Verbose messages if parse of templates failed (HTML/MAIL/GRAB) --- lib/XXV/MODULES/GRAB.pm | 2 +- lib/XXV/MODULES/XMLTV.pm | 2 +- lib/XXV/OUTPUT/Html.pm | 10 ++++++++-- lib/XXV/OUTPUT/NEWS/MAIL.pm | 4 ++-- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/lib/XXV/MODULES/GRAB.pm b/lib/XXV/MODULES/GRAB.pm index 70684cc..a8fbefe 100644 --- a/lib/XXV/MODULES/GRAB.pm +++ b/lib/XXV/MODULES/GRAB.pm @@ -276,7 +276,7 @@ sub makeImgText { my $output = ''; $self->{tt}->process(\$text, $vars, \$output) - or return error($self->{tt}->error()); + or return error(sprintf("Can't parse grab overlay template : %s", $self->{tt}->error())); my $vpos = CORE::int(($height / $self->{ysize}) * $self->{vpos}); my $imgfontsize = CORE::int(($height / $self->{ysize}) * $self->{imgfontsize}); diff --git a/lib/XXV/MODULES/XMLTV.pm b/lib/XXV/MODULES/XMLTV.pm index f5a5388..62516b7 100644 --- a/lib/XXV/MODULES/XMLTV.pm +++ b/lib/XXV/MODULES/XMLTV.pm @@ -444,7 +444,7 @@ sub _parse_template { }; my $output = ''; $self->{tt}->process(\$text, $vars, \$output) - or return error($self->{tt}->error()); + or return error(sprintf("Can't parse xmltv template: %s", $self->{tt}->error())); return $output; } diff --git a/lib/XXV/OUTPUT/Html.pm b/lib/XXV/OUTPUT/Html.pm index 9b2ba5d..ae93f51 100644 --- a/lib/XXV/OUTPUT/Html.pm +++ b/lib/XXV/OUTPUT/Html.pm @@ -311,8 +311,14 @@ sub parseTemplateFile { }, }; - $self->{tt}->process($widget, $vars, \$output) - or return error($self->{tt}->error()); + $self->{tt}->process($widget, $vars, \$output) || do { + my $msg = $self->{tt}->error(); + error(sprintf("Can't parse html widget %s : %s", $widget, $msg )); + $msg =~ s/\n/
/g; + $output = $self->{cgi}->h1(sprintf(gettext("Can't proper parse html widget '%s.tmpl'"), ($call eq 'nothing') ? $name : $call)) + . $self->{cgi}->h2(gettext("Your skin may be outdated, please check project home page for updates!")) + . $self->{cgi}->p($msg); + }; return $output; } diff --git a/lib/XXV/OUTPUT/NEWS/MAIL.pm b/lib/XXV/OUTPUT/NEWS/MAIL.pm index 7b5be0b..f34eb65 100644 --- a/lib/XXV/OUTPUT/NEWS/MAIL.pm +++ b/lib/XXV/OUTPUT/NEWS/MAIL.pm @@ -268,7 +268,7 @@ sub parseHeader { my $template = $self->{TEMPLATES}->{'header'}; $self->{tt}->process($template, $vars, \$output) - or return error($self->{tt}->error()); + or return error(sprintf("Can't parse mail template %s : %s", $template, $self->{tt}->error())); return $output; } @@ -288,7 +288,7 @@ sub parseFooter { my $template = $self->{TEMPLATES}->{'footer'}; $self->{tt}->process($template, $vars, \$output) - or return error($self->{tt}->error()); + or return error(sprintf("Can't parse mail template %s : %s", $template, $self->{tt}->error())); return $output; } -- cgit v1.2.3