common: silence warning in showlink about unused href

[sheet.git] / common.inc.plp

diff --git a/common.inc.plp b/common.inc.plp
index 39865bdb55f2ca961da6d7f0ebcaecbc760aab9a..898e8bbcd5dd24774d6a32f166f14dae0def9fee 100644 (file)
--- a/common.inc.plp
+++ b/common.inc.plp
@@ -102,7 +102,11 @@ sub checkmodified {
 sub Data {
        my ($filename) = @_;
        my @data = eval {
-               do "$filename.inc.pl";
+               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', $@ || $!];
@@ -229,10 +233,9 @@ BEGIN {
 
 sub showlink {
        my ($title, $href, $selected) = @_;
-       return sprintf(
-               !$href ? '%s' :
-               $selected ? '<strong>%s</strong>' : '<a href="%2$s">%s</a>',
-               EscapeHTML($title), EscapeHTML($href)
-       );
+       EscapeHTML($title);
+       return $title if not $href;
+       return "<strong>$title</strong>" if $selected;
+       return sprintf '<a href="%s">%s</a>', EscapeHTML($href), $title;
 }