Changeset 24227

Show
Ignore:
Timestamp:
04.07.2011 20:46:06 (8 years ago)
Author:
ak19
Message:

The sourcelinkfile subtype of gsf:link that was recently introduced is no longer necessary: it's been merged with the source subtype, which now uses the srclinkFile metadata instead of source and generates links to source documents with both image collections and DSpace collection.

Location:
main/trunk/greenstone3
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/Action.java

    r24224 r24227  
    115115        String type = elem.getAttribute("type"); 
    116116        if (type.equals("source")) { 
    117         meta_names.add("assocfilepath"); 
    118         } else if (type.equals("sourcelinkfile")) { 
    119117        meta_names.add("assocfilepath"); 
    120118        meta_names.add("srclinkFile"); 
  • main/trunk/greenstone3/web/interfaces/default/transform/config_format.xsl

    r24224 r24227  
    3737      </xsl:when> 
    3838      <xsl:when test="@type='source'"> 
    39     <a><xslt:attribute name='href'><xslt:value-of  
    40        disable-output-escaping="yes" select="/page/pageResponse/collection/metadataList/metadata[@name='httpPath']" />/index/assoc/<xslt:value-of  
    41        disable-output-escaping="yes" select="metadataList/metadata[@name='assocfilepath']" />/<xslt:value-of  
    42        disable-output-escaping="yes" select="metadataList/metadata[@name='Source']" /></xslt:attribute> 
    43       <xsl:apply-templates/> 
    44     </a> 
    45       </xsl:when> 
    46     <xsl:when test="@type='sourcelinkfile'"> 
    4739    <a><xslt:attribute name='href'><xslt:value-of  
    4840       disable-output-escaping="yes" select="/page/pageResponse/collection/metadataList/metadata[@name='httpPath']" />/index/assoc/<xslt:value-of