X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/ec0363c510a8c9ee62a0d0558696d5a923bb997f..03abf85a7ec9775993766a3fd10cd2876aef0b42:/common.inc.plp
diff --git a/common.inc.plp b/common.inc.plp
index 31c2c22..4c7fbb9 100644
--- a/common.inc.plp
+++ b/common.inc.plp
@@ -20,20 +20,25 @@ sub Alert {
say "$body
\n";
}
-$PLP::ERROR = sub {
- my ($text, $html) = @_;
- Alert("Fatal error: $html.");
- warn $text;
-};
-
BEGIN {
require Time::HiRes;
- our $Time = [Time::HiRes::gettimeofday];
+ our $Time = [Time::HiRes::gettimeofday()];
+
+ $PLP::ERROR = sub {
+ my ($text, $html) = @_;
+ warn $text;
+ unless ($PLP::sentheaders and $PLP::sentheaders->[0] !~ m{/PLP\.pm\z}) {
+ Html({nocache => 1});
+ say 'Page unavailable
';
+ }
+ Alert("Fatal error: $html.");
+ };
+
+ # user request
+ our $Dev = $ENV{HTTP_HOST} =~ /\bdev\./;
+ our ($file) = $ENV{SCRIPT_FILENAME} =~ m{ ([^/]+) \.plp$ }x;
}
-# user request
-our $Dev = $ENV{HTTP_HOST} =~ /\bdev\./;
-our ($file) = $ENV{SCRIPT_FILENAME} =~ m{ ([^/]+) \.plp$ }x;
our $Request = decode_utf8($ENV{PATH_INFO} =~ s{^/}{}r);
our $style;
@@ -89,13 +94,15 @@ sub checkmodified {
sub Html {
my ($meta) = @_;
- # announce and check data modification
- checkmodified(
- $ENV{SCRIPT_FILENAME},
- (grep { /\bShiar_/ } values %INC),
- $meta->{data} ? @{ $meta->{data} } : (),
- );
- $header{'Cache-Control'} = sprintf 'max-age: ', 24*60*60;
+ unless ($meta->{nocache}) {
+ # announce and check data modification
+ checkmodified(
+ $ENV{SCRIPT_FILENAME},
+ (grep { /\bShiar_/ } values %INC),
+ $meta->{data} ? @{ $meta->{data} } : (),
+ );
+ $header{'Cache-Control'} = 'max-age='.(24*60*60);
+ }
# default fallbacks
$meta->{stylesheet} ||= [qw'light dark circus mono red terse'];
@@ -105,6 +112,11 @@ 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}"
+ unless $PLP::sentheaders;
+ unshift @{ $meta->{raw} }, stylesheet($meta->{stylesheet});
+
# optional amends
push @{ $meta->{raw} }, (
'',
@@ -116,7 +128,6 @@ sub Html {
) if $meta->{keys};
# leading output
- $header{content_type} = "text/html; charset=$meta->{charset}";
say '';
say '';
say '';
@@ -129,7 +140,6 @@ sub Html {
for join(', ', @{ $meta->{keywords} }) || ();
say '';
say '';
- say for stylesheet($meta->{stylesheet});
say for map { @{$_} } $meta->{raw} || ();
say '' if $Dev;
say '';
@@ -166,3 +176,11 @@ EOT
};
}
+sub showlink {
+ my ($title, $href, $selected) = @_;
+ return sprintf(
+ $selected ? '%s' : '%s',
+ EscapeHTML($title), EscapeHTML($href)
+ );
+}
+