From 5e41d252c6fd6f3bc9b16b90362d2ac816aad063 Mon Sep 17 00:00:00 2001
From: nckroy <roy.nicholas@gmail.com>
Date: Wed, 7 Feb 2018 14:24:50 -0700
Subject: [PATCH] Removed incorrect combining of displaynames

---
 lib/baseline_report_csv.xsl | 30 ++----------------------------
 1 file changed, 2 insertions(+), 28 deletions(-)

diff --git a/lib/baseline_report_csv.xsl b/lib/baseline_report_csv.xsl
index 7c07b38..ef7e61b 100644
--- a/lib/baseline_report_csv.xsl
+++ b/lib/baseline_report_csv.xsl
@@ -25,7 +25,7 @@ IdPs:
       2. timestamp
       3. Organization Display Name
       4. "IdP" string literal
-	  5. IdP Display Name: mdui:DisplayName or md:OrganizationDisplayName (in that order)
+	  5. IdP Display Name: mdui:DisplayName
 	  6. IdP Privacy URL or NONE
 	  7. IdP Logo present TRUE/FALSE
 	  8. IdP Tech contact or NONE
@@ -45,7 +45,7 @@ SPs:
       2. timestamp
       3. Organization Display Name
       4. "SP" string literal
-	  5. SP Display Name: mdui:DisplayName or md:OrganizationDisplayName (in that order)
+	  5. SP Display Name: mdui:DisplayName
 	  6. SP Privacy URL or NONE
 	  7. SP Logo present TRUE/FALSE
 	  8. SP Tech contact or NONE
@@ -150,19 +150,6 @@ SPs:
 				<xsl:value-of select="$escapedDisplayName"/>
 				<xsl:text>"</xsl:text>
 			</xsl:when>
-			<xsl:when test="$orgDisplayName != ''">
-				<!-- escape literal double quotes in md:OrganizationDisplayName -->
-				<xsl:variable name="escapedOrgDisplayName">
-					<xsl:call-template name="string-replace-all">
-						<xsl:with-param name="string" select="$orgDisplayName"/>
-						<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="$escapedOrgDisplayName"/>
-				<xsl:text>"</xsl:text>
-			</xsl:when>
 			<xsl:otherwise>
 				<xsl:text>NONE</xsl:text>
 			</xsl:otherwise>
@@ -331,19 +318,6 @@ SPs:
 				<xsl:value-of select="$escapedDisplayName"/>
 				<xsl:text>"</xsl:text>
 			</xsl:when>
-			<xsl:when test="$orgDisplayName != ''">
-				<!-- escape literal double quotes in md:OrganizationDisplayName -->
-				<xsl:variable name="escapedOrgDisplayName">
-					<xsl:call-template name="string-replace-all">
-						<xsl:with-param name="string" select="$orgDisplayName"/>
-						<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="$escapedOrgDisplayName"/>
-				<xsl:text>"</xsl:text>
-			</xsl:when>
 			<xsl:otherwise>
 				<xsl:text>NONE</xsl:text>
 			</xsl:otherwise>