From 5eee5ea9c145c00c8c623b9e1a791183fa897451 Mon Sep 17 00:00:00 2001
From: nckroy <roy.nicholas@gmail.com>
Date: Thu, 15 Oct 2020 09:33:44 -0600
Subject: [PATCH] Properly include both OrgName and OrgDisplayName

---
 lib/list_all_IdPs_csv.xsl | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/lib/list_all_IdPs_csv.xsl b/lib/list_all_IdPs_csv.xsl
index 15090d6..e8220b3 100644
--- a/lib/list_all_IdPs_csv.xsl
+++ b/lib/list_all_IdPs_csv.xsl
@@ -44,7 +44,7 @@
 
 	<!-- output the heading line -->
 	<xsl:template match="/">
-	  <xsl:text>Organization Name,IdP Display Name,IdP Entity ID,Registrar ID</xsl:text>
+	  <xsl:text>Organization Name,Organization Display Name,IdP Display Name,IdP Entity ID,Registrar ID</xsl:text>
 	  <xsl:text>&#x0a;</xsl:text>
 	  <xsl:apply-templates/>
 	</xsl:template>
@@ -52,11 +52,33 @@
 	<!-- match all entity descriptors with an IdP role -->
 	<xsl:template match="//md:EntityDescriptor[md:IDPSSODescriptor]">
 		
-		<!-- compute the normalized values of mdui:DisplayName and md:OrganizationDisplayName -->
+		<!-- compute the normalized values of mdui:DisplayName, md:OrganizationDisplayName and md:OrganizationName -->
 		<xsl:variable name="displayName" select="normalize-space(md:IDPSSODescriptor/md:Extensions/mdui:UIInfo/mdui:DisplayName[@xml:lang='en'])"/>
 		<xsl:variable name="orgDisplayName" select="normalize-space(md:Organization/md:OrganizationDisplayName[@xml:lang='en'])"/>
-		
+		<xsl:variable name="orgName" select="normalize-space(md:Organization/md:OrganizationName[@xml:lang='en'])"/>
+
+		<!-- output md:OrganizationName or "NONE" -->
+		<xsl:choose>
+			<xsl:when test="$orgName != ''">
+				<!-- escape literal double quotes in md:OrganizationDisplayName -->
+				<xsl:variable name="escapedOrgName">
+					<xsl:call-template name="string-replace-all">
+						<xsl:with-param name="string" select="$orgName"/>
+						<xsl:with-param name="search" select="$double_quote"/>
+						<xsl:with-param name="replace" select="$double_double_quote"/>
+					</xsl:call-template>
+				</xsl:variable>
+				<xsl:text>"</xsl:text>
+				<xsl:value-of select="$escapedOrgName"/>
+				<xsl:text>"</xsl:text>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:text>NONE</xsl:text>
+			</xsl:otherwise>
+		</xsl:choose>
+
 		<!-- output md:OrganizationDisplayName or "NONE" -->
+		<xsl:text>,</xsl:text>
 		<xsl:choose>
 			<xsl:when test="$orgDisplayName != ''">
 				<!-- escape literal double quotes in md:OrganizationDisplayName -->