X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/108d13f833e9daeff4ea1552e2e1bee1e0ed8c22..ff4a38aff3e2d22ef34e33cd5df7a16d8ceeb196:/common.inc.plp
diff --git a/common.inc.plp b/common.inc.plp
index 0a010d2..d7e2b79 100644
--- a/common.inc.plp
+++ b/common.inc.plp
@@ -8,22 +8,33 @@ use open ':std' => ':utf8';
use File::stat 'stat';
use HTTP::Date;
-
-$PLP::ERROR = sub {
- my ($text, $html) = @_;
- print '
Fatal error: '.$html."
\n\n";
- warn $text;
-};
+use Encode qw( decode_utf8 );
+
+sub Alert {
+ my ($html, $debug) = @_;
+ ref $html eq 'ARRAY' or $html = [$html];
+ my ($title, @lines) = @{$html};
+ $body = "$title
";
+ $body .= "\n$_
" for @lines;
+ $body .= "\n$debug
" if $Dev and $debug;
+ say "$body
\n";
+}
BEGIN {
require Time::HiRes;
- our $Time = [Time::HiRes::gettimeofday];
+ our $Time = [Time::HiRes::gettimeofday()];
+
+ $PLP::ERROR = sub {
+ my ($text, $html) = @_;
+ warn $text;
+ Alert("Fatal error: $html.");
+ };
}
# user request
our $Dev = $ENV{HTTP_HOST} =~ /\bdev\./;
our ($file) = $ENV{SCRIPT_FILENAME} =~ m{ ([^/]+) \.plp$ }x;
-our $Request = $ENV{PATH_INFO} =~ s{^/}{}r;
+our $Request = decode_utf8($ENV{PATH_INFO} =~ s{^/}{}r);
our $style;
our $showkeys = !exists $get{keys} ? undef :
@@ -94,6 +105,10 @@ sub Html {
ref $_ eq 'ARRAY' or $_ = [$_]
for grep {$_} $meta->{raw}, $meta->{description}, $meta->{keywords};
+ # document headers before output
+ $header{content_type} = "text/html; charset=$meta->{charset}";
+ unshift @{ $meta->{raw} }, stylesheet($meta->{stylesheet});
+
# optional amends
push @{ $meta->{raw} }, (
'',
@@ -105,7 +120,6 @@ sub Html {
) if $meta->{keys};
# leading output
- $header{content_type} = "text/html; charset=$meta->{charset}";
say '';
say '';
say '';
@@ -118,7 +132,6 @@ sub Html {
for join(', ', @{ $meta->{keywords} }) || ();
say '';
say '';
- say for stylesheet($meta->{stylesheet});
say for map { @{$_} } $meta->{raw} || ();
say '' if $Dev;
say '';
@@ -148,10 +161,18 @@ sub Html {
AGPLv3
EOT
- say sprintf '⢠%.3fs', Time::HiRes::tv_interval($Time) if $Dev;
+ say sprintf '⢠%.3fs', Time::HiRes::tv_interval($Time) if $Dev and $Time;
say '';
say '';
say '