X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/69adcf65e2485a578d91c747fc764f3c43834f7b..b86bbb8de10c94737088dbc8b3c8c2fd9d7d0770:/common.inc.plp
diff --git a/common.inc.plp b/common.inc.plp
index b8dac37..6ea1197 100644
--- a/common.inc.plp
+++ b/common.inc.plp
@@ -47,10 +47,10 @@ BEGIN {
our $Dev = $ENV{HTTP_HOST} =~ /\bdev\./;
}
-our $Request = decode_utf8($ENV{PATH_INFO} =~ s{^/}{}r);
+our $Request //= decode_utf8($ENV{PATH_INFO} =~ s{^/}{}r);
our $style;
-our $showkeys = !exists $get{keys} ? undef :
+our $showkeys //= !exists $get{keys} ? undef :
($get{keys} ne '0' && ($get{keys} || 'always'));
$header{content_type} = 'text/html; charset=utf-8';
@@ -78,7 +78,7 @@ sub stylesheet {
return map { sprintf(
'',
- $_ eq $style ? 'stylesheet' : 'alternate stylesheet', "/$_.css?1.11", $_
+ $_ eq $style ? 'stylesheet' : 'alternate stylesheet', "/$_.css?1.13", $_
) } @avail;
}
@@ -99,6 +99,24 @@ sub checkmodified {
$header{'Last-Modified'} = time2str($lastmod);
}
+sub Data {
+ my ($filename) = @_;
+ my @data = eval {
+ open my $cache, '<:raw', "data/$filename.json"
+ or return do "./$filename.inc.pl"; # silent fallback to original code
+ require JSON;
+ local $/; # slurp
+ return JSON::decode_json(readline $cache);
+ };
+ if ($! or $@ or !@data or !$data[0]) {
+ die ['Table data not found', $@ || $!];
+ }
+ if (@data == 1 and ref $data[0] eq 'HASH' and not %{$data[0]}) {
+ die ['Table data missing'];
+ }
+ return wantarray ? @data : $data[0]; # list compatibility like do does
+}
+
sub Html {
my ($meta) = @_;
@@ -115,6 +133,7 @@ sub Html {
# default fallbacks
$meta->{stylesheet} ||= [qw( light dark circus mono red )];
$meta->{charset} ||= 'utf-8';
+ $meta->{lang} ||= 'en';
# convert options to arrays
ref $_ eq 'ARRAY' or $_ = [$_]
@@ -143,7 +162,7 @@ sub Html {
PLP_START {
# leading output
say '';
- say '';
+ say qq();
say '';
say '';
say sprintf '', $_
@@ -196,22 +215,28 @@ EOT
BEGIN {
$PLP::ERROR = sub {
- my ($text, $html) = @_;
- warn $text;
+ my ($message, $html) = @_;
+ if (ref $message) {
+ warn join ': ', @{$message};
+ $html = shift @{$message};
+ }
+ else {
+ warn $message;
+ $message = [];
+ }
unless ($PLP::sentheaders) {
Html({nocache => 1});
say 'Page unavailable
';
}
- Alert("Fatal error: $html.");
+ Alert("Fatal error: $html.", @{$message});
};
}
sub showlink {
my ($title, $href, $selected) = @_;
- return sprintf(
- !$href ? '%s' :
- $selected ? '%s' : '%s',
- EscapeHTML($title), EscapeHTML($href)
- );
+ EscapeHTML($title);
+ return $title if not $href;
+ return "$title" if $selected;
+ return sprintf '%s', EscapeHTML($href), $title;
}