Changeset 24227

Timestamp:

2011-07-04T20:46:06+12:00 (12 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:

• src/java/org/greenstone/gsdl3/action/Action.java (modified) (1 diff)
• web/interfaces/default/transform/config_format.xsl (modified) (1 diff)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/Action.java

@@ -115 +115 @@
         String type = elem.getAttribute("type");
         if (type.equals("source")) {
-        meta_names.add("assocfilepath");
-        } else if (type.equals("sourcelinkfile")) {
         meta_names.add("assocfilepath");
         meta_names.add("srclinkFile");

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

@@ -37 +37 @@
       </xsl:when>
       <xsl:when test="@type='source'">
-    <a><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="metadataList/metadata[@name='assocfilepath']" />/<xslt:value-of 
-       disable-output-escaping="yes" select="metadataList/metadata[@name='Source']" /></xslt:attribute>
-      <xsl:apply-templates/>
-    </a>
-      </xsl:when>
-    <xsl:when test="@type='sourcelinkfile'">
     <a><xslt:attribute name='href'><xslt:value-of 
        disable-output-escaping="yes" select="/page/pageResponse/collection/metadataList/metadata[@name='httpPath']" />/index/assoc/<xslt:value-of