From: Mischa POSLAWSKY <perl@shiar.org>
Date: Wed, 10 Nov 2021 23:37:52 +0000 (+0100)
Subject: sc: redirect subpage aliases to preferred canonical names
X-Git-Tag: v1.13~95
X-Git-Url: http://git.shiar.nl/sheet.git/commitdiff_plain/9e77d528b81a90babfcc565609030fa01712b4a1

sc: redirect subpage aliases to preferred canonical names
---

diff --git a/index.plp b/index.plp
index 7377784..e3cd122 100644
--- a/index.plp
+++ b/index.plp
@@ -77,8 +77,7 @@ if (open my $log, '<', 'UPDATE') {{
 <li><a href="/perl">perl versions</a>
 <li><a href="/apl">apl symbols</a>
 <li><a href="/termcol">terminal colours</a>
-<li><a href="/sc/2">starcraft 2 units</a>
-	(<a href="/sc" title="StarCraft: Brood War">bw</a>)
+<li><a href="/sc/lotv">starcraft units</a>
 <li><a href="/emoji">emoticons</a>
 <li><a href="/dieren">dieren (Dutch animals)</a>
 </ul>
diff --git a/sc.plp b/sc.plp
index 19149cf..b3c27fc 100644
--- a/sc.plp
+++ b/sc.plp
@@ -20,13 +20,20 @@ my %scvers = (
 		game => 'StarCraft II LotV',
 		major => 2,
 	},
+	index => 'bw',
+	1     => 'bw',
+	2     => 'lotv',
 );
 
-$Request ||= 'bw';
-$Request = 'lotv' if $Request eq '2';
-my %scver = %{ $scvers{$Request} // {} }
+my $requestver = $scvers{$Request ||= 'index'}
 	or Html(), Abort("Requested version <q>$Request</q> not available", '404 request not found');
 
+if (ref $requestver ne 'HASH') {
+	$header{Location} = $requestver;
+	Abort("Canonical URL for $Request is at $requestver", '302 subpage alias');
+}
+
+my %scver = %{$requestver};
 my $datafile = "sc-units-$Request.inc.pl";
 
 Html({
diff --git a/tools/mksitemap b/tools/mksitemap
index 01ec211..7407392 100755
--- a/tools/mksitemap
+++ b/tools/mksitemap
@@ -12,7 +12,7 @@ my @pages = (
 	[qw( vi digraphs charset browser writing sc/lotv termcol dieren )],
 	[qw( readline latin unicode countries emoji perl )],
 	[qw( vimperator mutt nethack mplayer font codec )],
-	[qw( apl less screen digits sc sc/hots termcol/legacy keyboard )],
+	[qw( apl less screen digits sc/bw sc/hots termcol/legacy keyboard )],
 	[qw( chars/table/html sample source plan )],
 );