Index: documentation/trunk/tutorials/xml-source/tutorial_en.xml
===================================================================
--- documentation/trunk/tutorials/xml-source/tutorial_en.xml (revision 26037)
+++ documentation/trunk/tutorials/xml-source/tutorial_en.xml (revision 26050)
@@ -911,5 +911,5 @@
</td>
-There is no exp.Title metadata, so remove that element from the following
+Next edit the format features: there is no exp.Title metadata, so remove that element from the following
<gsf:choose-metadata>
<gsf:metadata name="dc.Title"/>
@@ -1027,10 +1027,5 @@
<td valign="top">
<gsf:link type="document">
- <gsf:choose-metadata>
- <gsf:metadata name="dc.Title"/>
- <gsf:metadata name="ex.dc.Title"/>
- <gsf:metadata name="Title"/>
- <gsf:default>Untitled</gsf:default>
- </gsf:choose-metadata>
+ <xsl:call-template name="choose-title"/>
<gsf:switch>
<gsf:metadata name="Source"/>
@@ -1495,5 +1490,5 @@
Building the collection at this point will have the effect that internally Greenstone will have captured this relationship between the different file versions of the same documents; however, until we make some adjustments to the format statements, none of this will be visible to the end-user. The collection built at this point (with default settings) allows a user to search the text from the Word document, browse by title metadata and so on, but when it comes to the point of viewing a document there will only be the choice of viewing the Word version of the document, or the HTML version that Greenstone automatically generates by processing the Word document.
-To go beyond this, the key change to make is to alter the part of the default VList statement that says: template of the format statement which chooses between thumbicon and srcicon, and replace this with a reference to equivDocIcon instead.
+To go beyond this, the key change to make is to alter the part of the default VList statement that says: template of the format statement which chooses between thumbicon and srcicon, and replace this with a reference to equivDocIcon instead.
@@ -1529,5 +1524,5 @@
The second (more minor) change in this edit is to simplify the statement a bit. The original uses a <gsf:choose-metadata/> statement to show a thumbnail version of the document, if Greenstone has one, in preference over the source icon. Since in this collection we have no thumbnails generated, it has been simplified by eliminating the <gsf:choose-metadata/> combination and going straight to the metadata item.
-To make the change then, switch to the panel and edit the template of the format statement
+To make the change then, switch to the panel and edit the template of the format statement
@@ -1548,11 +1543,5 @@
<td valign="top">
<gsf:link type="document">
- <gsf:choose-metadata>
- <gsf:metadata name="dc.Title"/>
- <gsf:metadata name="exp.Title"/>
- <gsf:metadata name="ex.dc.Title"/>
- <gsf:metadata name="Title"/>
- <gsf:default>Untitled</gsf:default>
- </gsf:choose-metadata>
+ <xsl:call-template name="choose-title"/>
</gsf:link>
<gsf:switch>
@@ -1568,19 +1557,9 @@
<td valign="top">
-
- <gsf:metadata name="equivDocLink"/>
- <gsf:metadata name="equivDocIcon"/>
- <gsf:metadata name="/equivDocLink"/>
-
+ <gsf:link type="equivdoc"/>
</td>
<td valign="top">
<gsf:link type="document">
- <gsf:choose-metadata>
- <gsf:metadata name="dc.Title"/>
- <gsf:metadata name="exp.Title"/>
- <gsf:metadata name="ex.dc.Title"/>
- <gsf:metadata name="Title"/>
- <gsf:default>Untitled</gsf:default>
- </gsf:choose-metadata>
+ <xsl:call-template name="choose-title"/>
</gsf:link>
<gsf:switch>
@@ -2012,5 +1991,5 @@
-To make use of the new URL metadata, the icon link must be changed to serve up the original URL rather than the copy stored in the digital library. Go to the panel, select the section and edit the template of the format statement by replacing
+To make use of the new URL metadata, the icon link must be changed to serve up the original URL rather than the copy stored in the digital library. Go to the panel, select the section and edit the template of the format statement by replacing
[link][icon][/link]
@@ -2026,7 +2005,7 @@
with
- <gsf:metadata name="weblink"/>
- <gsf:metadata name="webicon"/>
- <gsf:metadata name="/weblink"/>
+ <gsf:link type="web">
+ <gsf:icon type="web"/>
+ </gsf:link>
@@ -3593,5 +3572,5 @@
-Now select the section of the panel, and select the format statement in the list of assigned format statements. Add the following text before the final </td> of the template:
+Now select the section of the panel, and select the format statement in the list of assigned format statements. Add the following text before the final </td> of the template:
{If}{[ex.equivlink],<br>Also available as:[ex.equivlink]}
@@ -3617,11 +3596,5 @@
{Or}{[dc.Title],[exp.Title],[ex.Title],Untitled}
- <gsf:choose-metadata>
- <gsf:metadata name="dc.Title"/>
- <gsf:metadata name="exp.Title"/>
- <gsf:metadata name="ex.dc.Title"/>
- <gsf:metadata name="Title"/>
- <gsf:default>Untitled</gsf:default>
- </gsf:choose-metadata>
+ <xsl:call-template name="choose-title"/>
|