entity-categories added to sp summary

space normalized (extra newlines removed)
SWAMIDOPS-6922

1 files changed, 17 insertions, 10 deletions

diff --git a/xslt/sp-summary.xslt b/xslt/sp-summary.xslt
index 2e0981df..8f1e8241 100644
--- a/xslt/sp-summary.xslt
+++ b/xslt/sp-summary.xslt
@@ -5,6 +5,8 @@
                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                 xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
                 xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
+		xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute"
+		xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion"
                 xmlns:exsl="http://exslt.org/common"
                 extension-element-prefixes="exsl"
                 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0">
@@ -26,18 +28,19 @@
   </xsl:template>
 
   <xsl:template match="/md:EntitiesDescriptor">
-    <xsl:text>||EntityID||Service Name||Service Description||Organization||Technical Contact||Administrative Contact||
+    <xsl:text>||EntityID||Service Name||Service Description||Organization||Technical Contact||Administrative Contact||Entity Categories||
 </xsl:text>
     <xsl:apply-templates select="md:EntityDescriptor[md:SPSSODescriptor]"/>
   </xsl:template>
 
   <xsl:template match="md:EntityDescriptor">
-     <xsl:text> | </xsl:text><xsl:value-of select="@entityID"/><xsl:text> </xsl:text>
-     <xsl:text> | </xsl:text><xsl:apply-templates select="md:SPSSODescriptor/md:AttributeConsumingService/md:ServiceName"/><xsl:text> </xsl:text>
-     <xsl:text> | </xsl:text><xsl:apply-templates select="md:SPSSODescriptor/md:AttributeConsumingService/md:ServiceDescription"/><xsl:text> </xsl:text>
-     <xsl:text> | </xsl:text><xsl:apply-templates select="md:Organization"/><xsl:text> </xsl:text>
-     <xsl:text> | </xsl:text><xsl:apply-templates select="md:ContactPerson[@contactType='technical']"/><xsl:text> </xsl:text>
-     <xsl:text> | </xsl:text><xsl:apply-templates select="md:ContactPerson[@contactType='administrative']"/><xsl:text>|
+     <xsl:text> | </xsl:text><xsl:value-of select="@entityID"/>
+     <xsl:text> | </xsl:text><xsl:apply-templates select="md:SPSSODescriptor/md:AttributeConsumingService/md:ServiceName"/>
+     <xsl:text> | </xsl:text><xsl:apply-templates select="md:SPSSODescriptor/md:AttributeConsumingService/md:ServiceDescription"/>
+     <xsl:text> | </xsl:text><xsl:apply-templates select="md:Organization"/>
+     <xsl:text> | </xsl:text><xsl:apply-templates select="md:ContactPerson[@contactType='technical']"/>
+     <xsl:text> | </xsl:text><xsl:apply-templates select="md:ContactPerson[@contactType='administrative']"/>
+     <xsl:text> | </xsl:text><xsl:apply-templates select="md:Extensions/mdattr:EntityAttributes/samla:Attribute[@Name='http://macedir.org/entity-category']/samla:AttributeValue"/><xsl:text> |
 </xsl:text>
   </xsl:template>
 
@@ -46,13 +49,17 @@
   </xsl:template>
 
   <xsl:template match="md:ServiceDescription">
-    <xsl:value-of select="text()"/>
+    <xsl:value-of select="normalize-space(text())"/><xsl:text> </xsl:text>
   </xsl:template>
 
   <xsl:template match="md:ServiceName">
     <xsl:value-of select="text()"/>
   </xsl:template>
 
+  <xsl:template match="samla:AttributeValue">
+    <xsl:value-of select="substring-after(text(),'/category/')"/><xsl:text> </xsl:text>
+  </xsl:template> 
+
   <xsl:template match="md:ContactPerson">
     <xsl:apply-templates select="md:EmailAddress"/><xsl:text> </xsl:text>
   </xsl:template> 
@@ -71,11 +78,11 @@
   </xsl:template>
 
   <xsl:template match="md:OrganizationDisplayName">
-     <xsl:value-of select="text()"/>
+     <xsl:value-of select="normalize-space(text())"/>
   </xsl:template>
 
   <xsl:template match="md:OrganizationURL">
-     <xsl:value-of select="text()"/>
+     <xsl:value-of select="normalize-space(text())"/>
   </xsl:template>
 
   <xsl:template match="shibmd:Scope">