diff options
| author | Adrian Kummerländer | 2014-04-29 19:24:58 +0200 |
|---|---|---|
| committer | Adrian Kummerländer | 2014-04-29 19:24:58 +0200 |
| commit | ddfe25807ef90ddd3d10fd4532875ffdb5d5e9c5 (patch) | |
| tree | fb8a7851cf2bf5fa4eac3420d218745cf0930756 /dummy/transform.xsl | |
| parent | d573e3160131e6776a9c148ca3a6754533378a76 (diff) | |
| download | InputXSLT-ddfe25807ef90ddd3d10fd4532875ffdb5d5e9c5.tar InputXSLT-ddfe25807ef90ddd3d10fd4532875ffdb5d5e9c5.tar.gz InputXSLT-ddfe25807ef90ddd3d10fd4532875ffdb5d5e9c5.tar.bz2 InputXSLT-ddfe25807ef90ddd3d10fd4532875ffdb5d5e9c5.tar.lz InputXSLT-ddfe25807ef90ddd3d10fd4532875ffdb5d5e9c5.tar.xz InputXSLT-ddfe25807ef90ddd3d10fd4532875ffdb5d5e9c5.tar.zst InputXSLT-ddfe25807ef90ddd3d10fd4532875ffdb5d5e9c5.zip | |
Simplified external function result node set
* all functions return a single "error" node in the case that something went wrong
* otherwise they return one or more "result" nodes that contain the function results and may be distinguished by one or more attributes
* this makes handling the return values easier and more pleasing to the eye as not everything has to be prefixed by "self::*"
* updated test transformation accordingly
Diffstat (limited to 'dummy/transform.xsl')
| -rw-r--r-- | dummy/transform.xsl | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/dummy/transform.xsl b/dummy/transform.xsl index 359db05..eab7a81 100644 --- a/dummy/transform.xsl +++ b/dummy/transform.xsl @@ -20,11 +20,11 @@ <div id="raw"> <xsl:variable name="testFile" select="external:read-file('test.txt')"/> <xsl:choose> - <xsl:when test="$testFile/self::status = 'successful'"> - <xsl:value-of select="$testFile/self::content"/> + <xsl:when test="$testFile/self::error"> + Could not read text file. </xsl:when> <xsl:otherwise> - Could not read text file. + <xsl:value-of select="$testFile[@name='test.txt']"/> </xsl:otherwise> </xsl:choose> </div> @@ -32,15 +32,15 @@ <div id="xml"> <xsl:variable name="testXml" select="external:read-xml-file('test.txt')"/> <xsl:choose> - <xsl:when test="$testXml/self::status = 'successful'"> + <xsl:when test="$testXml/self::error"> + Could not read XML file. + </xsl:when> + <xsl:otherwise> <ul id="xml"> - <xsl:for-each select="$testXml/self::content/tester/eintrag"> + <xsl:for-each select="$testXml[@name='test.txt']/tester/eintrag"> <li><xsl:value-of select="."/></li> </xsl:for-each> </ul> - </xsl:when> - <xsl:otherwise> - Could not read XML file. </xsl:otherwise> </xsl:choose> </div> @@ -48,20 +48,20 @@ <div id="filelists"> <xsl:variable name="fileList" select="external:read-directory('../')"/> <xsl:choose> - <xsl:when test="$fileList/self::status = 'successful'"> + <xsl:when test="$fileList/self::error"> + Could not read directory. + </xsl:when> + <xsl:otherwise> <ul id="filelist1"> - <xsl:for-each select="$fileList/self::content/item[@type='file']"> + <xsl:for-each select="$fileList[@type='file']"> <li><xsl:value-of select="."/></li> </xsl:for-each> </ul> <ul id="filelist2"> - <xsl:for-each select="$fileList/self::content/item[@type='directory']"> + <xsl:for-each select="$fileList[@type='directory']"> <li><xsl:value-of select="."/></li> </xsl:for-each> </ul> - </xsl:when> - <xsl:otherwise> - Could not read directory. </xsl:otherwise> </xsl:choose> </div> |