Merge branch 'master' into BRANCH_EML_2_2

NCEAS · Jul 7, 2017 · 75bcc48 · 75bcc48
2 parents 1dacda8 + 1ed88e3
commit 75bcc48
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/style/eml/eml-dataset.xsl b/style/eml/eml-dataset.xsl
@@ -126,10 +126,11 @@
              </xsl:for-each>
              </xsl:if>
              <!-- put in the alternate identifiers -->
-             <xsl:if test="keywordSet">
+             <xsl:if test="alternateIdentifier">
              <xsl:for-each select="alternateIdentifier">
                <xsl:call-template name="resourcealternateIdentifier">
-                 <xsl:with-param name="resfirstColStyle" select="$firstColStyle"/>
+                   <xsl:with-param name="system" select="./@system"/>
+                   <xsl:with-param name="resfirstColStyle" select="$firstColStyle"/>
                  <xsl:with-param name="ressecondColStyle" select="$secondColStyle"/>
                </xsl:call-template>
              </xsl:for-each>

diff --git a/style/eml/eml-resource.xsl b/style/eml/eml-resource.xsl
@@ -47,6 +47,7 @@
 
   <!-- style the alternate identifier elements -->
   <xsl:template name="resourcealternateIdentifier" >
+      <xsl:param name="system"/>
       <xsl:param name="resfirstColStyle"/>
       <xsl:param name="ressecondColStyle"/>
       <xsl:if test="normalize-space(.)!=''">
@@ -56,6 +57,9 @@
         	<xsl:call-template name="i18n">
        			<xsl:with-param name="i18nElement" select="."/>
        		</xsl:call-template>
+          <xsl:if test="normalize-space($system)!=''">
+              &#160;(<xsl:value-of select="$system"/>)
+          </xsl:if>
         </td>
       </tr>
       </xsl:if>