From fdebe00a1a944fc83fc0d776dd0209c726eee130 Mon Sep 17 00:00:00 2001
From: Alex Stuart <alex.stuart@jisc.ac.uk>
Date: Mon, 9 Nov 2020 20:53:40 +0000
Subject: [PATCH] =?UTF-8?q?Change=20=C3=89=20into=20HTML=20character=20ent?=
 =?UTF-8?q?ity=20reference=20in=20generate.html.orgnamescope?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

See ukf/ukf-meta#258 for details.
---
 build.xml                 |  6 ++++++
 utilities/bodge-eacute.pl | 11 +++++++++++
 2 files changed, 17 insertions(+)
 create mode 100755 utilities/bodge-eacute.pl

diff --git a/build.xml b/build.xml
index a879e1a4..4561d35f 100644
--- a/build.xml
+++ b/build.xml
@@ -2809,6 +2809,8 @@
         generate.html.orgnamescope
 
         Generates a HTML table of IdPs and their scopes
+
+        bodge-eacute.pl is an awful bodge to fix encodings
     -->
     <target name="generate.html.orgnamescope">
         <echo>Running generate.html.orgnamescope XSLT</echo>
@@ -2818,6 +2820,10 @@
             <arg value="${utilities.dir}/orgnamescope.xsl" />
             <arg value="${aggregates.dir}/ukfederation-metadata.xml" />
         </exec>
+        <exec executable="perl" failonerror="true">
+            <arg value="${utilities.dir}/bodge-eacute.pl" />
+            <arg value="${build.dir}/orgnamescope.html" />
+        </exec>
     </target>
 
     <!--
diff --git a/utilities/bodge-eacute.pl b/utilities/bodge-eacute.pl
new file mode 100755
index 00000000..bc39faa6
--- /dev/null
+++ b/utilities/bodge-eacute.pl
@@ -0,0 +1,11 @@
+#!/usr/bin/perl -w -p -i
+#
+# É is changed to HTML character entity reference &Eacute;
+#
+# An awful bodge to fix output of IdPInfoList. Our instance of
+# PMwiki encodes pages in windows-1252 (single byte character encoding),
+# and IdPInfoList includes a file encoded in UTF-8. All is well until
+# we have a 2-byte character in GÉANT.
+# 
+binmode(STDOUT, ":encoding(UTF-8)");
+s/É/&Eacute;/g;