MIR-1566 Improve metadata output

Author: golsch

mir-module/src/main/resources/xsl/mir-mods-utils.xsl

@@ -51,11 +51,10 @@
             </xsl:choose>
         </xsl:variable>
 
-        <xsl:variable name="affiliation" select="mods:affiliation[not(@*)]" />
-        <xsl:variable name="affiliation-ror" select="mods:affiliation[contains(@authorityURI, '//ror.org')]" />
+        <xsl:variable name="affiliations" select="mods:affiliation" />
         <xsl:variable name="personNodeId" select="generate-id(.)"/>
         <xsl:variable name="personName"><xsl:apply-templates select="." mode="nameString"/></xsl:variable>
-        <xsl:if test="count($nameIdentifiers) &gt; 0 or string-length($affiliation) &gt; 0">
+        <xsl:if test="count($nameIdentifiers) &gt; 0 or count($affiliations) &gt; 0">
             <!-- This content will be inserted as popover-->
             <div id="{$personNodeId}-content" class="d-none">
                 <dl>
@@ -71,40 +70,70 @@
                         </dd>
                     </xsl:for-each>
                   </xsl:if>
-                  <xsl:if test="count($affiliation) &gt; 0 or $affiliation-ror">
-                      <dt>
-                        <xsl:value-of select="mcri18n:translate('mir.affiliation')"/>
-                      </dt>
-                      <dd>
-                        <xsl:for-each select="$affiliation">
-                          <div class="mir-affiliation-plain" lang="{$CurrentLang}">
-                            <xsl:value-of select="text()"/>
-                          </div>
-                        </xsl:for-each>
-
-                        <xsl:for-each select="$affiliation-ror[@valueURI]">
-                            <xsl:sort select="@valueURI"/>
-                            <div class="mir-affiliation-ror">
-                                <a href="https://ror.org/" alt="ROR logo">
-                                    <img src="{$WebApplicationBaseURL}images/ror/ror-icon-rgb-transparent.svg"
-                                         class="pe-1 mir-ror-logo"/>
-                                </a>
-                                <a class="mir-ror-link" href="{@valueURI}">
-                                    <xsl:value-of select="@valueURI"/>
-                                </a>
-                            </div>
-                        </xsl:for-each>
-                      </dd>
-                  </xsl:if>
+                  <xsl:apply-templates select="$affiliations">
+                    <xsl:sort select="boolean(@authority)" data-type="number" order="ascending"/>
+                    <xsl:sort select="@valueURI" data-type="text" order="ascending"/>
+                  </xsl:apply-templates>
                 </dl>
             </div>
         </xsl:if>
         <a href="{concat($ServletsBaseURL,'solr/mods_nameIdentifier?q=',encoder:encode($query),'&amp;owner=',encoder:encode(concat('createdby:',$owner)))}"><xsl:value-of select="$personName" /></a>
-        <xsl:if test="count($nameIdentifiers) &gt; 0 or string-length($affiliation) &gt; 0">
+        <xsl:if test="count($nameIdentifiers) &gt; 0 or string-length($affiliations) &gt; 0">
             <!-- class personPopover triggers the javascript popover code -->
             <a id="{$personNodeId}" class="personPopover" title="{mcri18n:translate('mir.details.personpopover.title')}">
                 <span class="fa fa-info-circle"/>
             </a>
         </xsl:if>
     </xsl:template>
+
+  <xsl:template match="mods:affiliation[not(@*)]">
+    <div class="mir-affiliation-plain">
+      <xsl:value-of select="text()"/>
+    </div>
+  </xsl:template>
+
+  <xsl:template match="mods:affiliation[@authority]">
+    <xsl:param name="logo-uri" select="''" />
+    <xsl:param name="type" select="@authority" />
+
+    <xsl:variable name="logo-uri-val">
+      <xsl:choose>
+        <xsl:when test="$logo-uri != ''">
+          <xsl:value-of select="$logo-uri"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:call-template name="resolve-affiliation-logo-uri">
+            <xsl:with-param name="authority" select="@authority"/>
+          </xsl:call-template>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:variable name="type-val" select="
+      translate($type,'ABCDEFGHIJKLMNOPQRSTUVWXYZ','abcdefghijklmnopqrstuvwxyz')
+    " />
+
+    <div class="mir-affiliation-{$type-val}">
+      <xsl:if test="$logo-uri-val != ''">
+        <a href="{@authorityURI}">
+          <img src="{$logo-uri-val}" class="pe-1 mir-{$type-val}-logo" alt="{@authority} logo" />
+        </a>
+      </xsl:if>
+      <a class="mir-{$type-val}-link" href="{@valueURI}">
+        <xsl:value-of select="@valueURI"/>
+      </a>
+    </div>
+  </xsl:template>
+
+  <xsl:template name="resolve-affiliation-logo-uri">
+    <xsl:param name="authority" />
+    <xsl:choose>
+      <xsl:when test="$authority = 'ROR'">
+        <xsl:value-of select="concat($WebApplicationBaseURL, 'images/ror/ror-icon-rgb-transparent.svg')" />
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="''" />
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
 </xsl:stylesheet>