common: global Data() to parse perl code includes

[sheet.git] / common.inc.plp

diff --git a/common.inc.plp b/common.inc.plp
index f7ca70023bf9a7ff386cb5a9fabbebc37117e465..39865bdb55f2ca961da6d7f0ebcaecbc760aab9a 100644 (file)
--- a/common.inc.plp
+++ b/common.inc.plp
@@ -78,7 +78,7 @@ sub stylesheet {
 
        return map { sprintf(
                '<link rel="%s" type="text/css" media="all" href="%s" title="%s">',
-               $_ eq $style ? 'stylesheet' : 'alternate stylesheet', "/$_.css?1.12", $_
+               $_ eq $style ? 'stylesheet' : 'alternate stylesheet', "/$_.css?1.13", $_
        ) } @avail;
 }
 
@@ -99,6 +99,20 @@ sub checkmodified {
        $header{'Last-Modified'} = time2str($lastmod);
 }
 
+sub Data {
+       my ($filename) = @_;
+       my @data = eval {
+               do "$filename.inc.pl";
+       };
+       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) = @_;
 
@@ -196,13 +210,20 @@ 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 '<h1>Page unavailable</h1>';
                }
-               Alert("<strong>Fatal error</strong>: $html.");
+               Alert("Fatal error: $html.", @{$message});
        };
 }