X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/9e4974683459036041b339e6576f6d9e2e48edaa..HEAD:/common.inc.plp

diff --git a/common.inc.plp b/common.inc.plp
index 9d34128..a634733 100644
--- a/common.inc.plp
+++ b/common.inc.plp
@@ -76,7 +76,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.14", $_
+		$_ eq $style ? 'stylesheet' : 'alternate stylesheet', "/$_.css?1.18", $_
 	) } @avail;
 }
 
@@ -106,7 +106,7 @@ sub Data {
 		local $/; # slurp
 		return JSON::decode_json(readline $cache);
 	};
-	if ($! or $@ or !@data or !$data[0]) {
+	if ($@ or !@data or !$data[0]) {
 		die ['Table data not found', $@ || $!];
 	}
 	if (@data == 1 and ref $data[0] eq 'HASH' and not %{$data[0]}) {
@@ -157,7 +157,8 @@ sub Html {
 
 	my ($file) = $ENV{SCRIPT_FILENAME} =~ m{ ([^/]+) \.plp$ }x;
 
-	if (my $url = $meta->{canonical} // "/$file/$Request") {
+	$meta->{canonical} //= "/$file" . ($Request ne '' && "/$Request");
+	if (my $url = $meta->{canonical}) {
 		$url = "https://sheet.shiar.nl$url";
 		push @{ $meta->{raw} }, qq(<link rel="canonical" href="$url" />);
 	}