Changeset 29234

Timestamp:

2014-08-25T15:48:30+12:00 (10 years ago)

Author:

ak19

Message:

Dr Bainbridge fixed up a recent commit to the XSLT for gsf:link that had broken the assocfilepath links of src documents in those cases where the pageResponse had no document subelement but a classifier subelement. The result was that, when browsing, src document links were broken, having no assocfilepath. Now the XSLT handles both cases. If there's no document subelement, it behaves as before a recent commit.

File:

• main/trunk/greenstone3/web/interfaces/default/transform/config_format.xsl (modified) (1 diff)

main/trunk/greenstone3/web/interfaces/default/transform/config_format.xsl

@@ -201 +201 @@
             </xsl:when>
             <xsl:when test="@type='source'">
+                <xslt:variable name="thisAssocfilepath">                    
+                    <xslt:choose>
+                        <xslt:when test="/page/pageResponse/document">
+                            <xslt:value-of disable-output-escaping="yes" select="/page/pageResponse/document/metadataList/metadata[@name='assocfilepath']" />
+                        </xslt:when>
+                        <xslt:otherwise>
+                            <xslt:value-of disable-output-escaping="yes" select="(.//metadataList)[last()]/metadata[@name='assocfilepath']" />
+                        </xslt:otherwise>
+                    </xslt:choose>                      
+                </xslt:variable>
                 <a>
-                        <xsl:if test="@target">
+                    <xsl:if test="@target">
                       <xsl:attribute name='target'>
                         <xsl:value-of select='@target'/>
                       </xsl:attribute>   
                     </xsl:if>
-
                     <xslt:attribute name='href'>
                         <xslt:value-of 
                    disable-output-escaping="yes" select="/page/pageResponse/collection/metadataList/metadata[@name='httpPath']" />/index/assoc/<xslt:value-of 
-                   disable-output-escaping="yes" select="/page/pageResponse/document/metadataList/metadata[@name='assocfilepath']" />/<xslt:value-of 
+                   disable-output-escaping="yes" select="$thisAssocfilepath" />/<xslt:value-of 
                    disable-output-escaping="yes" select="(.//metadataList)[last()]/metadata[@name='srclinkFile']" />
                     </xslt:attribute>