Changeset 2027


Ignore:
Timestamp:
07/11/12 13:39:43 (12 years ago)
Author:
larlam
Message:

A resource link address containing initial whitespace could kill resolve-uri(). Fixed. Mirrors MPI svn changeset 31899.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • metadata/trunk/toolkit/xslt/imdi2clarin.xsl

    r2026 r2027  
    120120                        <xsl:when test="starts-with(., 'hdl:')"><xsl:value-of select="."/></xsl:when>
    121121                        <xsl:when test="$uri-base=''"><xsl:value-of select="."/>.cmdi</xsl:when>
    122                         <xsl:otherwise><xsl:value-of select="concat(resolve-uri(., $uri-base), '.cmdi')"/></xsl:otherwise>
     122                        <xsl:otherwise><xsl:value-of select="concat(resolve-uri(normalize-space(.), $uri-base), '.cmdi')"/></xsl:otherwise>
    123123                    </xsl:choose>
    124124                </ResourceRef>
    … …  
    139139                    <xsl:choose>
    140140                        <xsl:when test="not(normalize-space(ResourceLink/@ArchiveHandle)='')"><xsl:value-of select="ResourceLink/@ArchiveHandle"/></xsl:when>
    141                         <xsl:when test="not($uri-base='')"><xsl:value-of select="resolve-uri(ResourceLink/., $uri-base)"/></xsl:when>
     141                        <xsl:when test="not($uri-base='')"><xsl:value-of select="resolve-uri(normalize-space(ResourceLink/.), $uri-base)"/></xsl:when>
    142142                    </xsl:choose>
    143143                </ResourceRef>
    … …  
    155155                    <xsl:choose>
    156156                        <xsl:when test="not(normalize-space(ResourceLink/@ArchiveHandle)='')"><xsl:value-of select="ResourceLink/@ArchiveHandle"/></xsl:when>
    157                         <xsl:when test="not($uri-base='')"><xsl:value-of select="resolve-uri(ResourceLink/., $uri-base)"/></xsl:when>
     157                        <xsl:when test="not($uri-base='')"><xsl:value-of select="resolve-uri(normalize-space(ResourceLink/.), $uri-base)"/></xsl:when>
    158158                    </xsl:choose>
    159159                </ResourceRef>
Note: See TracChangeset for help on using the changeset viewer.